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
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
Florian HENRY
009fa41762
add checkbox to ask detail on line desc
2021-08-31 09:10:57 +02:00
Florian HENRY
0ae4e721c4
merge
2021-08-30 23:50:33 +02:00
Florian HENRY
ff1ba623c1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_projtask_changefilterdate
2021-08-30 23:46:34 +02:00
Laurent Destailleur
b29fc5552d
Fix id in link
2021-08-30 22:10:26 +02:00
Laurent Destailleur
60832c6e87
css
2021-08-30 21:48:46 +02:00
Laurent Destailleur
426894f6a6
Fix not null column
2021-08-30 21:44:09 +02:00
Laurent Destailleur
8639956b79
Fix position of information on lines of documents
2021-08-30 21:22:00 +02:00
Laurent Destailleur
3e443e9146
Fix partnership module
2021-08-30 19:47:44 +02:00
Laurent Destailleur
5549186e3a
Fix link
2021-08-30 19:28:49 +02:00
Laurent Destailleur
7c9909ee12
Fix label of list of members
2021-08-30 19:21:52 +02:00
Laurent Destailleur
d9bfd72c29
Fix missing login in tooltip
2021-08-30 19:13:02 +02:00
Laurent Destailleur
d1ef4bdbd1
Fix missing login in tooltip
2021-08-30 19:10:43 +02:00
Laurent Destailleur
18e7a5efa9
Trans
2021-08-30 19:00:15 +02:00
Laurent Destailleur
3c029d0ccf
Fix sort on company on member list.
2021-08-30 18:57:41 +02:00
Laurent Destailleur
b78771f8c4
Fix select empty value for thirdparties select combo
2021-08-30 18:56:52 +02:00
Laurent Destailleur
9db5f85d4e
Fix responsive
2021-08-30 18:42:41 +02:00
Laurent Destailleur
9c3ba22b02
Fix label of company of a thirdparty
2021-08-30 18:38:31 +02:00
Adrien Raze
58845082b1
FIX : Travis
2021-08-30 17:20:50 +02:00
Adrien Raze
f44ae62eb3
FIX : Travis
2021-08-30 16:59:09 +02:00
Laurent Destailleur
d2f3d134df
Code comment. Better _checkFilters
2021-08-30 16:54:45 +02:00
Adrien Raze
fb183f4f5d
FIX : Travis
2021-08-30 16:13:51 +02:00
Adrien Raze
08364d2492
FIX : Travis
2021-08-30 16:08:07 +02:00
Adrien Raze
7794a01a0b
FIX : Stickler-ci
2021-08-30 15:51:59 +02:00
Adrien Raze
b1ada26f55
Merge branch 'NEW_develop_virtual_product_DragAndDrop' of github.com:atm-adrien/dolibarr into NEW_develop_virtual_product_DragAndDrop
2021-08-30 15:49:52 +02:00
Adrien Raze
317876eb0c
NEW : Update SQL : install and migration
2021-08-30 15:48:22 +02:00
stickler-ci
73b4f0df51
Fixing style errors.
2021-08-30 13:38:55 +00:00
Adrien Raze
709a297563
NEW : Allow drag and drop on kits
2021-08-30 14:45:42 +02:00
lmarcouiller
31abb98a91
Fix : KnowledgeManagement menu permission
2021-08-30 14:38:36 +02:00
Alexandre SPANGARO
0132788266
NEW Invoice list - Use complete country select field with EEC or not
2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php
2021-08-30 15:34:59 +08:00
henrynopo
7bf6daaca7
Update card.php
2021-08-30 15:33:26 +08:00
stickler-ci
01a44760a8
Fixing style errors.
2021-08-29 20:14:19 +00:00
4381f67a64
FIX #18544 Shipment REST API: load thirdparty object into the shipment before validating.
2021-08-30 00:08:43 +04:00
359dae6af8
FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user.
2021-08-29 23:13:41 +04:00
Laurent Destailleur
74ad0586a9
Fix disabled
2021-08-29 20:42:14 +02:00
Laurent Destailleur
47b96e07b7
Fix init
2021-08-29 20:36:54 +02:00
Laurent Destailleur
daf32e9f14
Fix modules disabled in demo must remains disabled
2021-08-29 20:36:08 +02:00
Laurent Destailleur
581efd0847
Fix the cancel action (good practices recommended by modulebuilder).
2021-08-29 19:40:04 +02:00
Laurent Destailleur
92defbc449
Fix warning
2021-08-29 19:39:37 +02:00
Laurent Destailleur
fbdee1316a
Code comment
2021-08-29 19:36:11 +02:00
stickler-ci
6417d3ddf7
Fixing style errors.
2021-08-29 14:48:25 +00:00
GurvanKervern
b242387c43
Fix undef4-2
...
PHP8 warnings
2021-08-29 22:46:39 +08:00
GurvanKervern
ebd1b49d2a
Fix undef 4-1
...
PHP8 warnings
2021-08-29 22:41:22 +08:00
Gurvan Kervern
66d1e5c74d
Update eldy.lib.php
2021-08-29 18:15:09 +08:00
henrynopo
c9db6bfdf6
Update remx.php
2021-08-29 08:51:02 +08:00
henrynopo
71f6b472e3
Update stocks.lang
2021-08-29 07:51:29 +08:00
Laurent Destailleur
3336b5c405
Fixed implementation for #18373
2021-08-28 21:19:04 +02:00
Laurent Destailleur
c188ef0438
Fixed implementation for #18373
2021-08-28 21:09:52 +02:00
Laurent Destailleur
20e681d025
Revert "[NEW] PDF Document ref in title option"
2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5
Merge pull request #18373 from bb2a/PDF_Ref_In_Title
...
[NEW] PDF Document ref in title option
2021-08-28 20:41:55 +02:00
Christian Foellmann
38a225a035
fix product nature on create
2021-08-28 20:28:09 +02:00
Laurent Destailleur
bd67b46138
Fix duplicate code
2021-08-28 20:18:26 +02:00
Laurent Destailleur
81a8efd856
Restore error message
2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level
...
FIX invoice fetch not found syslog debug level instead of error
2021-08-28 20:12:45 +02:00
Laurent Destailleur
feb2e71f0c
Fix regression
2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e
Fix 0 insert instead of null
2021-08-28 18:56:48 +02:00
Laurent Destailleur
e2eaa9b46e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:54:48 +02:00
Laurent Destailleur
5f08ed84f8
Fix 0 insert instead of null
2021-08-28 18:53:57 +02:00
Laurent Destailleur
97ee69e88f
Fix 0 insert instead of null
2021-08-28 18:52:43 +02:00
Gurvan Kervern
39fcc53fa7
Update peruser.php
2021-08-29 00:51:01 +08:00
Gurvan Kervern
5fd0e6ac28
Update eldy.lib.php
2021-08-29 00:50:00 +08:00
Laurent Destailleur
de44dcb691
Fix var init
2021-08-28 18:48:24 +02:00
Laurent Destailleur
e71ff148ba
Fix phpcs
2021-08-28 18:42:26 +02:00
Laurent Destailleur
a8f4eef0f6
Merge pull request #18445 from erikvanberkum/develop
...
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
2021-08-28 18:40:54 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
...
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021
...
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
2021-08-28 18:35:40 +02:00
Laurent Destailleur
79bd3e0b24
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:31:40 +02:00
Laurent Destailleur
c1d3ddf10b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:31:06 +02:00
Laurent Destailleur
6afe9c88f6
Merge pull request #18491 from daraelmin/patch-3
...
Fix : conditiion always wrong when on following link
2021-08-28 18:21:37 +02:00
Laurent Destailleur
1c1caaccde
Update member.php
2021-08-28 18:21:23 +02:00
Laurent Destailleur
3ce5674b76
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-28 18:01:06 +02:00
Laurent Destailleur
978511e127
Update fournisseur.facture.class.php
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2021-08-28 17:59:45 +02:00
Laurent Destailleur
5ec286fdb7
Merge pull request #18500 from francisbesset/fix-fk_unit
...
Fix bad comparison for fk_unit to avoid always null value for all case
2021-08-28 17:57:26 +02:00
Laurent Destailleur
97064f1550
Update fournisseur.facture.class.php
2021-08-28 17:55:49 +02:00
Laurent Destailleur
fa2a4e4713
Merge pull request #18504 from vincentjdc/reception-list-printFieldListFrom-hook
...
Add hook printFieldListFrom to reception/list.php to allow add joins
2021-08-28 17:44:53 +02:00
LVSInformatique
4f45228e7b
Update list.php
2021-08-28 17:44:26 +02:00
Laurent Destailleur
ceea5cb76f
Merge pull request #18502 from plevray/patch-1
...
Update list.php
2021-08-28 17:43:52 +02:00
Laurent Destailleur
86af3ff3d7
Merge pull request #18492 from aspangaro/15a5
...
NEW Task - Add From/to input on search date
2021-08-28 17:43:15 +02:00
Laurent Destailleur
a5bb833a0a
Update peruser.php
2021-08-28 17:39:23 +02:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2
2021-08-28 17:37:54 +02:00
Laurent Destailleur
373db3a623
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 17:36:17 +02:00
Laurent Destailleur
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5
...
Customer Invoice - Multicurrency Remaining to Pay (updated)
2021-08-28 17:36:01 +02:00
Laurent Destailleur
0a468e4ba9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 17:36:00 +02:00
Laurent Destailleur
4ba6b0059d
Fix travis
2021-08-28 17:35:42 +02:00
Laurent Destailleur
881d176996
css
2021-08-28 17:30:53 +02:00
Laurent Destailleur
bb94ea7334
Fix debug car reception: Fill/reset link, colspan, translation
2021-08-28 17:24:05 +02:00
stickler-ci
63427638d8
Fixing style errors.
2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php
2021-08-28 22:52:06 +08:00
henrynopo
11497d4bf0
Update card.php
2021-08-28 22:38:17 +08:00
Laurent Destailleur
4c39816ce6
Merge pull request #18510 from henrynopo/patch-9
...
Fix - edit shipment Qty both predefined product while batch and stock are not enabled
2021-08-28 16:36:05 +02:00
stickler-ci
e60cf96c8e
Fixing style errors.
2021-08-28 14:35:01 +00:00
Laurent Destailleur
31ca781236
Update card.php
2021-08-28 16:34:38 +02:00
stickler-ci
2ddebc123a
Fixing style errors.
2021-08-28 14:32:44 +00:00
Laurent Destailleur
faf1d52d91
Update card.php
2021-08-28 16:32:22 +02:00
Laurent Destailleur
27f7ef5270
Merge pull request #18515 from mbinformatique68/develop
...
NEW Added address field into contacts list
2021-08-28 16:14:35 +02:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
...
change links for thirdparty to target the type customer|supplier tab
2021-08-28 15:27:13 +02:00
Laurent Destailleur
fae0b3c8be
Update card.php
2021-08-28 15:26:36 +02:00
Laurent Destailleur
6b8f6acf32
Update card.php
2021-08-28 15:26:06 +02:00
Laurent Destailleur
28752ddca4
Fix concat
2021-08-28 15:19:54 +02:00
Laurent Destailleur
82eb118583
Merge pull request #18530 from FHenry/dev_more_inv_task_comment
...
add hidden option to display date and duration in invoice generation from task time spent
2021-08-28 15:15:21 +02:00
lmarcouiller
c509e3bc43
FIx error 500 on restler api PHP 8.0
2021-08-28 14:53:59 +02:00
Laurent Destailleur
5e94b1f1f9
Merge pull request #18512 from Hystepik/develop#1
...
FIx error 500 on restler api PHP 8.0
2021-08-28 14:53:11 +02:00
Laurent Destailleur
0e38e1e2c4
NEW Add hook hookGetEntity.
...
Change name and param of hook
2021-08-28 14:51:49 +02:00
Laurent Destailleur
9bed2557f5
Merge pull request #18514 from cfoellmann/PR/hook-functionGetEntity
...
add hook 'functionGetEntity'
2021-08-28 14:46:32 +02:00
Laurent Destailleur
2aa3eb3857
Merge pull request #18521 from Hystepik/develop#2
...
Close #18074 : REST API New /order/{id}/shipment get & post
2021-08-28 14:44:31 +02:00
Laurent Destailleur
049992aed4
Update api_orders.class.php
2021-08-28 14:44:13 +02:00
Laurent Destailleur
3585259b55
Update api_orders.class.php
2021-08-28 14:43:17 +02:00
Laurent Destailleur
d98390e675
Update api_orders.class.php
2021-08-28 14:42:31 +02:00
Laurent Destailleur
b6f6cd382d
Merge pull request #18523 from Hystepik/develop#4
...
NEW : api for knowledgemanagement
2021-08-28 14:35:29 +02:00
Laurent Destailleur
7d2ff42cd7
Merge pull request #18532 from defrance/patch-172
...
Clean code (line in double)
2021-08-28 14:34:20 +02:00
Laurent Destailleur
daf270c492
Merge pull request #18528 from elsp1991/feature/emailcollector_link_events_to_objects
...
Close #18527 - Email collector link emails received to more objects
2021-08-28 14:33:48 +02:00
Laurent Destailleur
f359bfaaf2
Update emailcollector.class.php
2021-08-28 14:31:56 +02:00
Laurent Destailleur
45515fa8b2
fix css
2021-08-28 14:28:50 +02:00
BENKE Charlene
afb8a86aff
Clean code (line in double)
2021-08-28 14:14:48 +02:00
Laurent Destailleur
20d0b0c564
Fix link in some tooltips
2021-08-28 13:56:59 +02:00
Laurent Destailleur
1fec53e7f2
Fix generate the phpunit file from modulebuilder
2021-08-28 13:37:35 +02:00
Laurent Destailleur
b2791c3103
Fix generate the phpunit file from modulebuilder
2021-08-28 13:36:47 +02:00
Laurent Destailleur
f825d3fda4
Trans
2021-08-28 13:27:55 +02:00
stickler-ci
3598e0a246
Fixing style errors.
2021-08-28 07:32:07 +00:00
henrynopo
4ae29c53aa
Update pdf_espadon.modules.php
2021-08-28 15:30:05 +08:00
stickler-ci
74ed754fcc
Fixing style errors.
2021-08-28 07:22:25 +00:00
henrynopo
c219b8f576
Update card.php
2021-08-28 15:19:45 +08:00
Laurent Destailleur
7001388159
Fix warning event late on tab Resources
2021-08-28 05:40:14 +02:00
Laurent Destailleur
64c4e25c02
Fix warning
2021-08-28 05:40:07 +02:00
Laurent Destailleur
aab6281ba6
Clean code
2021-08-28 05:38:40 +02:00
Laurent Destailleur
99b1a59a1e
Fix warning event late on tab Resources
2021-08-28 05:38:12 +02:00
Laurent Destailleur
1b859fe723
Fix warning
2021-08-28 05:24:53 +02:00
Laurent Destailleur
c932ea0710
Fix syntax error
2021-08-28 05:06:14 +02:00
Laurent Destailleur
c02fb6b9a8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 03:15:47 +02:00
Laurent Destailleur
acf0386a9b
Fix css
2021-08-28 03:14:48 +02:00
Laurent Destailleur
3d72a21396
Clean code
2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb
Clean code
2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f
Clean code
2021-08-28 00:56:37 +02:00
Laurent Destailleur
11096a5453
Add hook checkSecureAccess.
...
It replaces mymodule_SUBPERMCATEGORY_FOR_DOCUMENTS and
mymodule_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS
2021-08-28 00:54:57 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6
Clean code
2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Florian HENRY
b492d49908
add hidden option to display date and duration in invoice generation from task time spent
2021-08-27 17:27:05 +02:00
Laurent Destailleur
2f225ee7e5
Clean code by adding cast int.
2021-08-27 16:33:03 +02:00
stickler-ci
2263c66754
Fixing style errors.
2021-08-27 13:43:06 +00:00
Ilias Patsiaouras
53b230a968
wip
2021-08-27 15:38:15 +02:00
Christian Foellmann
9752501ef6
change links for thirdparty to target the type customer|supplier tab
2021-08-27 15:32:53 +02:00
lmarcouiller
1bdfad9c29
fix permissions api for knowledgemanagement
2021-08-27 12:19:28 +02:00
lmarcouiller
4547de8d4a
New : api for knowledgemanagement
2021-08-27 12:16:59 +02:00
lmarcouiller
ce7a301896
Fix #18519 : Modulebuilder api permission
2021-08-27 11:48:56 +02:00
lmarcouiller
b9039eea14
FIx warehouse limit testing
2021-08-27 10:45:04 +02:00
lmarcouiller
eb48566798
Close #18074 : New /order/{id}/shipment get & post
2021-08-27 10:40:33 +02:00
stickler-ci
b48566eed8
Fixing style errors.
2021-08-27 08:27:04 +00:00
Christian Foellmann
9914ebe90b
add missing actions to admin page
2021-08-27 10:21:02 +02:00
henrynopo
2c7a788678
Update shipment.php
2021-08-27 11:09:10 +08:00
Laurent Destailleur
c6c87cd813
Fix duplicated code and missing declaration
2021-08-26 21:37:00 +02:00
Laurent Destailleur
a6ed743af3
Fix duplicated code and missing declaration
2021-08-26 21:35:31 +02:00
Anthony Berton
afccd0b565
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_with_picture
2021-08-26 17:09:08 +02:00
lmarcouiller
c70813d718
New : rest api POST orders shipment
2021-08-26 17:03:00 +02:00
Anthony Berton
4880973ec5
Merge branch 'develop' into Edit_in_propal
2021-08-26 16:11:41 +02:00
Christian Foellmann
ac7f0f8a4e
add hook 'functionGetEntity' to manipulate entities for queries on the fly
2021-08-26 15:04:59 +02:00
mbinformatique68
ac803f7247
NEW Added address field into contacts list
2021-08-26 14:36:12 +02:00
Erik van Berkum
5a9d241882
Merge branch 'Dolibarr:develop' into develop
2021-08-26 21:06:58 +09:00
Laurent Destailleur
ac55a052b2
Fix warning abuot external users shown only if appropriate
2021-08-26 12:41:37 +02:00
lmarcouiller
f482be84bf
New : rest api GET orders shipements
2021-08-26 12:35:31 +02:00
Laurent Destailleur
931f712c5f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:53:57 +02:00
lmarcouiller
7dc7b746cb
FIx error 500 on restler api PHP 8.0
2021-08-26 10:32:29 +02:00
Adrien Raze
05444078bd
FIX : stickler
2021-08-26 09:43:50 +02:00
Adrien Raze
0222df7ecc
FIX : Expected 1 space after closing brace; newline found
2021-08-26 09:34:30 +02:00
Adrien Raze
4d96c5d345
Merge branch 'NEW_develop_sub_BOM' of github.com:atm-adrien/dolibarr into NEW_develop_sub_BOM
2021-08-26 09:28:05 +02:00
Adrien Raze
0463846df1
FIX : Stickler
2021-08-26 09:27:03 +02:00
henrynopo
a0c9cf2d8d
Update card.php
2021-08-26 12:31:20 +08:00
Alexandre SPANGARO
006481cdff
Update dashboard tab
2021-08-26 06:01:51 +02:00
henrynopo
a25580f97c
Update bills.lang
2021-08-26 10:38:53 +08:00
henrynopo
a79abfd4e0
Update card.php
2021-08-26 10:37:03 +08:00
stickler-ci
bafe22ff77
Fixing style errors.
2021-08-26 02:29:45 +00:00
henrynopo
f6daad4480
Update card.php
2021-08-26 10:25:32 +08:00
henrynopo
daa34032ff
Update bills.lang
2021-08-26 09:43:02 +08:00
henrynopo
054b466e0a
Update card.php
2021-08-26 09:40:44 +08:00
Vincent Dieltiens
1aedcc54b5
Add hook to reception/list.php to allow add joins
2021-08-25 17:28:14 +02:00
stickler-ci
3a7d062d7d
Fixing style errors.
2021-08-25 15:24:03 +00:00
Adrien Raze
5bf8685f72
NEW : Add comments
2021-08-25 16:58:22 +02:00
LVSInformatique
873a982fb0
Update list.php
2021-08-25 16:09:09 +02:00
Laurent Destailleur
65629711d0
FIX #18484
2021-08-25 14:53:14 +02:00
Laurent Destailleur
6c71c6f5e5
Fix trans
2021-08-25 14:18:52 +02:00
Francis Besset
22ec43f4a3
Fix bad comparison for fk_unit to avoid always null value for all case
2021-08-25 13:46:18 +02:00
stickler-ci
9512861913
Fixing style errors.
2021-08-25 11:43:32 +00:00
henrynopo
236554948c
Add files via upload
2021-08-25 19:40:58 +08:00
stickler-ci
601cc865fb
Fixing style errors.
2021-08-25 10:54:09 +00:00
GurvanKervern
15445e9bba
Fix undef vars 7
...
To remove PHP8 warnings
2021-08-25 18:50:05 +08:00
Florian HENRY
5e795e74d7
NEW: date filter on project list and task list From->To
2021-08-25 12:48:32 +02:00
Florian HENRY
03b04bea08
NEW: date filter on project list and task list From->To
2021-08-25 12:46:56 +02:00
GurvanKervern
7161b1ba59
Fix undef vars 6
...
To remove PHP8 warnings
2021-08-25 18:45:40 +08:00
GurvanKervern
8c99291638
Fix undef vars 5
...
To remove PHP8 warnings
2021-08-25 18:28:32 +08:00
Laurent Destailleur
d022b3b0a1
FIx #18481
2021-08-25 12:24:13 +02:00
GurvanKervern
628bfc9963
Fix undef vars 4
...
To remove PHP8 warnings
2021-08-25 18:15:32 +08:00
GurvanKervern
d34e44e55c
Fix undef vars 3
...
To remove PHP8 warnings
2021-08-25 18:02:57 +08:00
GurvanKervern
07dd9d90f5
Fix undef vars
...
To remove PHP8 warnings
2021-08-25 17:29:29 +08:00
Adrien Raze
2ecc448bc0
FIX : Set total_cost for parent line by additionning total_cost of the children lines
2021-08-25 11:21:54 +02:00
Alexandre SPANGARO
01a6d8296e
NEW Task - Add From/to input on search date
2021-08-25 09:30:52 +02:00
daraelmin
701b43d917
Add MEMBER_ALLOW_CHANGE_OF_TYPE in admin panel
2021-08-25 09:01:30 +02:00
daraelmin
29f98041e6
conditiion always wrong when on following link
2021-08-25 08:48:42 +02:00
Laurent Destailleur
e4cbc2140e
Fix doc and token renewal with NOSESSION
2021-08-24 21:48:38 +02:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +02:00
Philippe Grand
ff47bf5226
Update card.php
2021-08-24 16:46:21 +02:00
Philippe Grand
0286a2e75d
Update card.php
2021-08-24 16:42:04 +02:00
Laurent Destailleur
07053d8605
Fix sql injection
2021-08-24 16:38:39 +02:00
Laurent Destailleur
90c12ae340
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
5b7fb9a4bb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-24 16:36:39 +02:00
Laurent Destailleur
ba594b20e0
Fix phpcs
2021-08-24 16:36:27 +02:00
lvessiller
a4a44faa7f
FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done)
2021-08-24 16:21:55 +02:00
Erik van Berkum
a0dc6ca394
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. Adjusted visible to -2
2021-08-24 23:12:04 +09:00
Christian Foellmann
227f61a711
replace remaining SubmitCancel buttons
2021-08-24 16:10:20 +02:00
Erik van Berkum
79903470fc
Merge branch 'Dolibarr:develop' into develop
2021-08-24 22:58:03 +09:00
Laurent Destailleur
9752819fe3
Merge pull request #18342 from atm-gauthier/NEW_shpping_method_and_trackingurl_on_shipping_list
...
NEW : display shipping method and tracking url on shipment list
2021-08-24 15:54:21 +02:00
Laurent Destailleur
76c3f10842
Merge pull request #18438 from aspangaro/15a4
...
NEW Supplier order - Add From/to input on search date
2021-08-24 15:53:15 +02:00
Laurent Destailleur
02a0e44f07
Merge pull request #18440 from aspangaro/15a5
...
NEW Contract - Add From/to input on search date
2021-08-24 15:52:47 +02:00
Laurent Destailleur
1c665c34cd
Merge pull request #18485 from fappels/14_fix_supplier_order_card
...
Fix warning on supplier order card when reception enabled.
2021-08-24 15:31:05 +02:00
Laurent Destailleur
96fed159ec
Merge pull request #18450 from frederic34/patch-8
...
make public url more readable
2021-08-24 15:30:08 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15
...
FIX #18353 Invoice list translation issue
2021-08-24 15:29:32 +02:00
Laurent Destailleur
e0fd8b5eb8
Simplify code
2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
2d870d0f81
Merge branch '14.0' into 14p10
2021-08-24 15:15:38 +02:00
henrynopo
73c0471ead
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-24 15:12:15 +02:00
Laurent Destailleur
c3fe1bfdc0
Merge pull request #18459 from henrynopo/patch-9
...
Fix error of supplier invoice (variable amount)
2021-08-24 15:09:53 +02:00
Laurent Destailleur
15da97f1da
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
67baa48c16
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/fourn/facture/list.php
2021-08-24 14:56:13 +02:00
Laurent Destailleur
6fa5930e8d
Fix label must not be translated
2021-08-24 14:54:46 +02:00
Laurent Destailleur
b10f75932f
Merge pull request #18466 from aspangaro/14p16
...
FIX Supplier invoice list - Wrong language key used
2021-08-24 14:51:46 +02:00
Laurent Destailleur
169282c82b
Merge pull request #18458 from andreubisquerra/develop
...
NEW Split Sale in TakePOS
2021-08-24 14:51:08 +02:00
Laurent Destailleur
1a56fdad22
Fix type
2021-08-24 14:48:53 +02:00
Laurent Destailleur
b6d74be5cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-24 14:48:08 +02:00
Laurent Destailleur
465c9bf287
NEW Introduce method hasRight
2021-08-24 14:47:50 +02:00
Laurent Destailleur
8b2c82dd23
Fix position of fields
2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899
FIX Field already present in SQL request
2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14
...
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:20:57 +02:00
Laurent Destailleur
f93e899c0f
Merge pull request #18472 from FHenry/dev_php8
...
fix: php 8 warning
2021-08-24 14:18:29 +02:00
Laurent Destailleur
9816dff00a
Merge pull request #18480 from henrynopo/patch-11
...
Fix - Supplier deposit invoice - auto convert to discount (error)
2021-08-24 14:09:39 +02:00
Laurent Destailleur
c6774505d8
FIX #18465
2021-08-24 14:05:02 +02:00
Laurent Destailleur
1cfe165613
Better name for field
2021-08-24 13:34:10 +02:00
Laurent Destailleur
366fa13fc0
NEW Add property "copytoclipboard" in modulebuilder
2021-08-24 13:19:53 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php
2021-08-24 18:34:34 +08:00
Francis Appels
edeaa6009f
Fix warning on supplier order card when reception enabled.
2021-08-24 10:48:26 +02:00
lvessiller
4efe2a0e09
FIX invoice fetch not found syslog debug level instead of error
2021-08-24 08:20:40 +02:00
Laurent Destailleur
56c314c671
Fix translation
2021-08-24 00:32:20 +02:00
Laurent Destailleur
a6ddc90d5b
Fix responsive
2021-08-23 23:53:58 +02:00
Laurent Destailleur
3419e43a2c
Fix phpunit
2021-08-23 21:02:07 +02:00
Laurent Destailleur
dc006b0ebb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
7af023665f
Clean var not defined
2021-08-23 19:37:11 +02:00
Laurent Destailleur
8485fee5f9
Cast numeric into on sql request
2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637
Cast numeric into on sql request
2021-08-23 18:56:46 +02:00
Florian HENRY
4dc542acad
fix: php 8 warning
2021-08-23 18:29:04 +02:00
Laurent Destailleur
6d5329bbf8
Fix phpunit
2021-08-23 17:45:16 +02:00
Laurent Destailleur
d4b5ee6c85
Fix cast into variable into sql request.
2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-23 16:04:16 +02:00
Laurent Destailleur
edb239837c
FIX #yogosha6944 Protection against traversal path.
2021-08-23 16:03:34 +02:00
Laurent Destailleur
d46dfd017a
FIX #yogosha6944 Protection against traversal path.
2021-08-23 16:00:03 +02:00
Laurent Destailleur
21852bd16b
Show link to invoices on member record
2021-08-23 15:25:41 +02:00
Alexandre SPANGARO
a0378549b8
FIX Accountancy - Some problems of length with general & subledger account
2021-08-23 15:19:27 +02:00
Adrien Raze
7474d2eef5
FIX : Add BOM column for create view
2021-08-23 15:08:32 +02:00
Laurent Destailleur
5f16de8150
Code comment
2021-08-23 15:08:29 +02:00
Laurent Destailleur
a25346e302
FIX Date of payment of subscription must not be set to 1970-01-01.
...
Fix look and feel v14
2021-08-23 15:00:29 +02:00
Adrien Raze
e282feb397
NEW : Delete conf
2021-08-23 14:43:17 +02:00
Laurent Destailleur
983d7e5177
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:26:16 +02:00
Laurent Destailleur
041784876d
Fix option $nolog
2021-08-23 12:25:59 +02:00
Laurent Destailleur
227f01b000
Fix can add a redirection into the executeCLI method.
2021-08-23 12:25:48 +02:00
Laurent Destailleur
fdffc0c13a
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 12:25:29 +02:00
Laurent Destailleur
b0817e132f
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:19:16 +02:00
Laurent Destailleur
8c017b9406
Sanitize $ and ; for filesystem path (like files).
2021-08-23 12:18:04 +02:00
Adrien Raze
6cd92ca829
NEW : Trad + Comments + Adding tooltips for conf
2021-08-23 12:15:09 +02:00
Adrien Raze
2343ff2ed4
NEW : ShowAll/HideAll Options
2021-08-23 11:58:15 +02:00
Laurent Destailleur
cced15e50a
Fix option $nolog
2021-08-23 11:58:14 +02:00
Laurent Destailleur
eec5fba333
Fix can add a redirection into the executeCLI method.
2021-08-23 11:51:08 +02:00
Adrien Raze
093cec316d
NEW : Hide/Show sub-BOM on clisk on the +/- + Multiply qty & total price of sub-BOM by qty of parent_line
2021-08-23 11:43:42 +02:00
Laurent Destailleur
34c1991730
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 11:32:25 +02:00
Philippe GRAND
7c2d19ffaf
FIX : indentation
2021-08-23 10:20:22 +02:00
Laurent Destailleur
0325b68bfb
Fix missing autoselect
2021-08-23 10:17:36 +02:00
Philippe GRAND
f88fdbe71d
FIX : for php8 compliance
2021-08-23 10:12:28 +02:00
Philippe GRAND
7baf98dbfa
fix : Undefined property: Conf:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\html.form.class.php on line 7957
2021-08-22 23:15:36 +02:00
Alexandre SPANGARO
b5a4c58106
FIX Supplier invoice list - Wrong language key used
2021-08-22 22:42:40 +02:00
Philippe GRAND
ba9ede39bf
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265
2021-08-22 22:28:53 +02:00
Philippe GRAND
e439e0f14d
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 251
2021-08-22 21:55:00 +02:00
Philippe GRAND
16f2a53fb8
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 236
2021-08-22 21:52:57 +02:00
Philippe GRAND
538b2e2a5f
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705
2021-08-22 19:47:06 +02:00
Laurent Destailleur
d3de81fecb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/holiday/card.php
htdocs/holiday/class/holiday.class.php
2021-08-22 19:34:13 +02:00
Laurent Destailleur
53a6e0cfaf
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-08-22 19:23:56 +02:00
Laurent Destailleur
fe17c13a5f
FIX an approved holiday can be canceled by an admin.
2021-08-22 19:22:47 +02:00
Alexandre SPANGARO
56c23b79e0
FIX Invoice list - Wrong name for column total_tva
2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc
FIX Field already present in SQL request
2021-08-22 14:01:29 +02:00
Philippe GRAND
2e3b9fce49
fix : Undefined array key 4 in C:\wamp64\www\dolibarr-140\htdocs\core\class\extrafields.class.php on line 1721
2021-08-22 12:18:26 +02:00
Philippe GRAND
6619099be9
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\actions_builddoc.inc.php on line 69
2021-08-22 12:05:30 +02:00
Philippe GRAND
665dfb48e4
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 125
2021-08-22 11:40:32 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-22 13:26:46 +08:00
Alexandre SPANGARO
a1d3e21e77
NEW IHM - Include new options to manage dashboard
2021-08-22 05:25:13 +02:00
Laurent Destailleur
ff3f85b214
Fix case sensitive
2021-08-22 01:44:52 +02:00
Laurent Destailleur
58fa0740c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/errors.lang
2021-08-22 01:41:18 +02:00
Laurent Destailleur
e6fa070c84
Fix phpcs
2021-08-22 01:21:31 +02:00
Laurent Destailleur
4cd5a53b63
FIX Recommended session.cookie_samesite must be 'Lax' not 'Strict'.
2021-08-22 00:44:51 +02:00
andreubisquerra
a6bdff59c9
Update lang
2021-08-21 22:31:54 +02:00
andreubisquerra
c4075605da
CSS
2021-08-21 22:31:03 +02:00
andreubisquerra
fc06c557c2
New split.php
2021-08-21 22:30:13 +02:00
andreubisquerra
f020a7dba2
Update index.php
2021-08-21 22:29:18 +02:00
Christian Foellmann
3f895f7dc5
correct codestyle
2021-08-21 19:57:52 +02:00
Christian Foellmann
7ca490088a
fix codestyle issues
2021-08-21 19:51:31 +02:00
Laurent Destailleur
49f6a634d0
Fix output of error message. br is no more encoded
2021-08-21 15:00:47 +02:00
Laurent Destailleur
ac5b16fd01
Fix lang
2021-08-21 13:41:04 +02:00
Laurent Destailleur
04a922b5f4
Implement the noescapetags into dol_escape_htmltag
2021-08-21 13:27:33 +02:00
Laurent Destailleur
17213ae65d
More error messages on paypal payment.
2021-08-21 12:37:28 +02:00
Laurent Destailleur
68d24661db
Try to fix the ' that show ' on PDF
2021-08-21 12:19:50 +02:00
Laurent Destailleur
bdf8c3ddc6
Fix test
2021-08-20 23:26:56 +02:00
Alexandre SPANGARO
af843ed82c
Merge branch '14.0' into 14p10
2021-08-20 22:11:42 +02:00
Alexandre SPANGARO
53af4b0076
FIX #18375 SQL Error on tasks statistics
2021-08-20 22:11:26 +02:00
Alexandre SPANGARO
8bdf58b942
FIX #18353 Invoice list translation issue
2021-08-20 21:42:43 +02:00
Laurent Destailleur
35e48f3a27
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-08-20 21:12:22 +02:00
Laurent Destailleur
9d285ea232
Fix: Can delete a price when date is in future to fix corrupted data
2021-08-20 21:11:20 +02:00
Frédéric FRANCE
e93dbcd0c0
make public url more readable
2021-08-20 14:47:51 +02:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
jpb
a3bae451d5
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:43 +02:00
jpb
ed65bca666
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:13 +02:00
jpb
d9a07acfa3
remove duplicate code
2021-08-20 14:05:22 +02:00
henrynopo
0933b6c39f
Update html.form.class.php
2021-08-20 20:04:53 +08:00
Adrien Raze
6de7d9b0af
NEW : Add sub-BOM lines on BOM card
2021-08-20 13:37:28 +02:00
Laurent Destailleur
335e1ff405
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca
Fix escape error message
2021-08-20 12:40:49 +02:00
henrynopo
b2252106c3
Added function - using list of location_incoterms
...
Added function to call for list of location_incoterms from the existing order records or table of location_incoterms.
Accordingly, an dditional ajex file namely "locationincoterms.php" and a database table namely c_location_incoterms are required.
2021-08-20 10:43:34 +08:00
Anthony Berton
019241e3d4
Merge branch 'PDF_Ref_In_Title' of https://github.com/bb2a/dolibarr into PDF_Ref_In_Title
2021-08-19 18:17:10 +02:00
Anthony Berton
f50842cdef
cop
2021-08-19 18:16:58 +02:00
stickler-ci
c750c5f7cf
Fixing style errors.
2021-08-19 14:45:55 +00:00
Anthony Berton
58b50d02c7
default ref in title 2
2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a
default ref in title
2021-08-19 16:13:41 +02:00
Laurent Destailleur
03d2d24244
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-19 16:12:26 +02:00
Laurent Destailleur
e1dc5b5188
css
2021-08-19 16:12:13 +02:00
Adrien Raze
f4d4733b15
NEW : Select for BOM workable + JS to fill it according to the product selected
2021-08-19 15:37:32 +02:00
Anthony Berton
1e0373ed50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_width_picture
2021-08-19 15:22:23 +02:00
Laurent Destailleur
91792e3c0e
Merge pull request #18441 from KlaasOl/patch-4
...
Update main.lang
2021-08-19 13:48:12 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined
2021-08-19 13:43:32 +02:00
stickler-ci
172b672437
Fixing style errors.
2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php
2021-08-19 18:16:47 +08:00
Erik van Berkum
e570c22398
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
2021-08-19 17:09:18 +09:00
Florian HENRY
223637317b
fix: missing tocken CRCSF
2021-08-19 09:51:09 +02:00
Klaas Oldenburger
0d4badb50b
Update main.lang
...
Change date format to Dutch standards
2021-08-19 08:26:37 +02:00
Alexandre SPANGARO
954676b04b
NEW Contract - Add From/to input on search date
2021-08-19 04:47:08 +02:00
Laurent Destailleur
eb70cb2ecc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-19 02:49:24 +02:00
Alexandre SPANGARO
797372cac2
NEW Supplier order - Add From/to input on search date
2021-08-18 22:30:33 +02:00
Gurvan Kervern
4d20ba2e4e
Update services_list.php
2021-08-19 04:29:09 +08:00
Laurent Destailleur
e0f8a87129
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-18 22:15:39 +02:00
Laurent Destailleur
60c9a882f1
Code comment
2021-08-18 22:15:20 +02:00
Laurent Destailleur
7af265db8a
Update card.php
2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php
2021-08-18 22:01:53 +02:00
Laurent Destailleur
c9128fa59c
Merge pull request #18436 from aspangaro/15a3
...
NEW Supplier proposal - Add From/to input on search date
2021-08-18 22:00:23 +02:00
Alexandre SPANGARO
c03b71dff3
NEW Supplier proposal - Add From/to input on search date
2021-08-18 21:41:11 +02:00
Laurent Destailleur
399a44ea20
Update objectline_create.tpl.php
2021-08-18 21:40:49 +02:00
Laurent Destailleur
79f9b30f29
Merge pull request #18409 from vincentjdc/product-generate-ref-after-form
...
NEW : Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
2021-08-18 21:32:35 +02:00
Laurent Destailleur
fa3ba05a23
Update card.php
2021-08-18 21:31:54 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2
...
NEW Ihm admin - Add tabs
2021-08-18 21:30:41 +02:00
Laurent Destailleur
c2bfc87c34
Merge pull request #18435 from henrynopo/patch-2
...
Added China into the list of country using State / province in address
2021-08-18 21:28:16 +02:00
Laurent Destailleur
13e64d2f79
Fix replace file_get_contents with getURLContent
2021-08-18 19:46:37 +02:00
Laurent Destailleur
ee6a2f73db
css install
2021-08-18 19:32:07 +02:00
Laurent Destailleur
e4aafcf91e
Code comment
2021-08-18 18:43:33 +02:00
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address
2021-08-18 22:30:28 +08:00
stickler-ci
88b0408e42
Fixing style errors.
2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php
2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php
2021-08-18 17:52:21 +08:00
Gurvan Kervern
3cde9a27ab
Update list.php
2021-08-18 17:50:10 +08:00
Gurvan Kervern
66495f3a9d
Update services_list.php
2021-08-18 17:47:59 +08:00
Gurvan Kervern
9253034007
Update list.php
2021-08-18 17:43:45 +08:00
jpb
fcd485f614
merge conflict
2021-08-18 09:16:28 +02:00
stickler-ci
b51ac49f90
Fixing style errors.
2021-08-18 07:15:05 +00:00
vincentjdc
dc037083ae
Merge branch 'develop' into product-generate-ref-after-form
2021-08-18 09:13:01 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-18 08:43:20 +02:00
stickler-ci
062e665874
Fixing style errors.
2021-08-18 02:45:29 +00:00
Alexandre SPANGARO
73dc98ed82
NEW Ihm admin - Add tabs
2021-08-18 04:36:37 +02:00
Laurent Destailleur
ae3a0fce71
Fix phpcs
2021-08-18 02:16:30 +02:00
Laurent Destailleur
b95b233c4b
Position of fields
2021-08-18 02:07:48 +02:00
Laurent Destailleur
82db3ae1a9
NEW Use lang selector when using a field key 'lang' in modulebuilder
2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1
2021-08-18 00:37:23 +02:00
Laurent Destailleur
04ce50c6f3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-18 00:15:05 +02:00
Laurent Destailleur
4d9fc36ff2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-18 00:14:55 +02:00
Laurent Destailleur
57c9649b50
FIX bad approver shown on holiday once approved
2021-08-18 00:12:25 +02:00
Laurent Destailleur
33b9787ea1
Clean code
2021-08-18 00:10:48 +02:00
Laurent Destailleur
da3fb82868
Merge pull request #18175 from defrance/patch-170
...
FIX : "disabled" field missing on definition
2021-08-17 23:34:34 +02:00
Laurent Destailleur
c001fb9555
Clean code
2021-08-17 23:23:15 +02:00
Laurent Destailleur
bbcea38793
Fix phpcs
2021-08-17 21:58:06 +02:00
Alexandre SPANGARO
a7cb9b2143
NEW Ihm admin - Add tabs
2021-08-17 21:29:15 +02:00
Laurent Destailleur
1ff6c33276
Merge pull request #17537 from kastoras/create_share_on_file_upload_with_other_setup
...
New Add option MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE to share file on any file upload
2021-08-17 20:11:54 +02:00
stickler-ci
5d0318c98f
Fixing style errors.
2021-08-17 18:11:12 +00:00
Laurent Destailleur
659f24efa9
Update files.lib.php
2021-08-17 20:10:47 +02:00
Laurent Destailleur
9521a9e77f
Clean code
2021-08-17 20:02:19 +02:00
Laurent Destailleur
aee291d079
Merge pull request #17865 from ATM-Consulting/NEW_develop_autocomplete_accounting_account_groups
...
New develop autocomplete accounting account groups
2021-08-17 19:46:46 +02:00
Laurent Destailleur
dafb3b5029
Update global.inc.php
2021-08-17 19:41:42 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object
2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169
2021-08-17 19:31:30 +02:00
Laurent Destailleur
2a19c02f19
Merge pull request #18178 from defrance/patch-171
...
PHP V8 warning error, use of not declared array
2021-08-17 19:29:49 +02:00
Laurent Destailleur
f0f8210918
Update DolibarrModules.class.php
2021-08-17 19:28:26 +02:00
Laurent Destailleur
35ebaf7b79
Merge pull request #18282 from aspangaro/12p18
...
FIX: Manage credit note on situation invoice for calculate margin
2021-08-17 19:26:16 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2
...
Close #18302 : Mass action leave requests aproval
2021-08-17 19:23:30 +02:00
Laurent Destailleur
cbdf121215
Merge branch 'develop' into dev_2
2021-08-17 19:20:42 +02:00
Laurent Destailleur
4f29a01da4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 19:12:21 +02:00
Laurent Destailleur
e264163ab6
Fix phpcs
2021-08-17 19:11:48 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php
2021-08-17 19:08:55 +02:00
Laurent Destailleur
f38b9eb1c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 19:02:29 +02:00
Laurent Destailleur
47b4fd3769
Complete migration
2021-08-17 19:02:16 +02:00
Laurent Destailleur
b96dd7a796
Merge branch 'develop' into patch-422
2021-08-17 19:00:46 +02:00
Laurent Destailleur
0858487119
Fix #18343
2021-08-17 18:52:33 +02:00
Laurent Destailleur
a19f8cd87d
Merge pull request #18337 from atm-maxime/fix_holidays_users
...
Fix : we only want employee users for holidays
2021-08-17 18:37:38 +02:00
Laurent Destailleur
ec2df3b282
Update pdf.php
2021-08-17 18:33:10 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-17 18:30:37 +02:00
Laurent Destailleur
16c290f735
Merge pull request #18383 from marc-dll/12.0_FIX_invoice_tiny_negative_vat
...
FIX: invoice validation: when checking if any VAT rate has a negative amount, prevent false positives with -1.0E-14 amounts
2021-08-17 18:24:33 +02:00
Laurent Destailleur
d09c2de6a8
Better position of options
2021-08-17 18:18:08 +02:00
Laurent Destailleur
33697cec1c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 18:11:08 +02:00
Laurent Destailleur
ae28dad72e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/reassortlot.php
htdocs/product/stock/product.php
htdocs/product/stock/productlot_card.php
htdocs/reception/card.php
2021-08-17 18:07:10 +02:00
Laurent Destailleur
ceaaff0186
Sellby always before Eatby #18361
2021-08-17 18:05:34 +02:00
Laurent Destailleur
c0a086fad8
Sellby always before Eatby #18361
2021-08-17 17:55:00 +02:00
Laurent Destailleur
d1858e02b5
Update card.php
2021-08-17 17:03:41 +02:00
Laurent Destailleur
d4c35edef4
Update pdf.php
2021-08-17 16:55:56 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name
2021-08-17 16:41:19 +02:00
Laurent Destailleur
6e7c8677eb
Update admin.lang
2021-08-17 16:40:31 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute
...
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php
2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute
...
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
...
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update
...
NEW hook after rank update
2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php
2021-08-17 16:12:45 +02:00
Laurent Destailleur
59479a4c6e
Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists
...
NEW : printFieldListFrom hook call on several lists
2021-08-17 15:58:28 +02:00
Laurent Destailleur
23e8b513c1
Merge pull request #18410 from ATM-Consulting/FIX_14.0_dolibarr_user_account_creation_from_recruitment_applicant_card
...
FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card
2021-08-17 15:56:20 +02:00
Laurent Destailleur
46ca3ffd5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 15:50:46 +02:00
Laurent Destailleur
1a8ad5abfa
Propagate $outputlangs to getExtrafieldContent method.
2021-08-17 15:50:28 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1
...
Customer Invoice - Multicurrency Remaining to Pay
2021-08-17 15:26:36 +02:00
Laurent Destailleur
e2424bda1e
Merge pull request #18419 from henrynopo/patch-2
...
Supplier Invoice - Multicurrency remainder to pay
2021-08-17 15:26:16 +02:00
Laurent Destailleur
8c093cfb31
Link to doc
2021-08-17 14:44:26 +02:00
Laurent Destailleur
f18f970b08
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462
FIX #yogosha6907
2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf
NEW hook after rank update
2021-08-17 09:33:50 +02:00
Laurent Destailleur
558c716931
Trans
2021-08-17 05:10:30 +02:00
Laurent Destailleur
88ccaeb13f
Help setup
2021-08-17 05:08:15 +02:00
Laurent Destailleur
92d6ad9597
Removed old simple POS module ('cashdesk' module)
2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39
Doc
2021-08-17 04:41:33 +02:00
Laurent Destailleur
30c40afeb3
Debug notification setup
2021-08-17 04:28:16 +02:00
Laurent Destailleur
a3d04163b6
Debug notification setup
2021-08-17 04:14:28 +02:00
Laurent Destailleur
7a3649b6e5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038
Debug notification module
2021-08-17 03:20:57 +02:00
Laurent Destailleur
cffa58a206
Merge pull request #18400 from lainwir3d/fix_notif_shipping_validate_email_template
...
FIX #18399 Fix shipment validation email template override.
2021-08-17 03:06:47 +02:00
Laurent Destailleur
cfbe2bf995
Merge pull request #18422 from aspangaro/14p13
...
FIX Accountancy - SQL error on select journal on journal
2021-08-17 02:41:56 +02:00
Laurent Destailleur
7207ae2cae
Fix warning
2021-08-17 02:33:58 +02:00
Laurent Destailleur
ed250bb6a4
Merge pull request #18408 from atm-maxime/fix_suppinv_clone_lines
...
Fix supplier invoice clone : missing data on lines (#18055 )
2021-08-17 02:18:36 +02:00
Laurent Destailleur
4b89a45ade
Trans
2021-08-17 02:16:25 +02:00
Laurent Destailleur
352b413a17
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 02:12:22 +02:00
Laurent Destailleur
8927eeff50
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-17 02:11:36 +02:00
Laurent Destailleur
eba87ab295
FIX filter on status Draft in modulebuilder
2021-08-17 02:09:38 +02:00
Laurent Destailleur
15020c99e7
Update accountancyexport.class.php
2021-08-17 01:08:18 +02:00
Laurent Destailleur
9b43327af0
Update accountancyexport.class.php
2021-08-17 01:06:26 +02:00
Laurent Destailleur
091166baa7
Update accountancyexport.class.php
2021-08-17 01:03:07 +02:00
Laurent Destailleur
4efc96f67b
Merge pull request #18426 from aspangaro/14p14
...
FIX Accountancy - SQL error when insert a manuel transaction
2021-08-17 00:32:59 +02:00
Laurent Destailleur
7784c4fcc9
Update bookkeeping.class.php
2021-08-17 00:32:33 +02:00
Laurent Destailleur
9aab49e5c7
Fix bad closing tr
2021-08-16 23:03:33 +02:00
Laurent Destailleur
ecb673f15c
Debug default BOM on product
2021-08-16 23:02:55 +02:00
Laurent Destailleur
baec6aa169
Optimize memory and perf for list of stock movements
2021-08-16 22:45:27 +02:00
Laurent Destailleur
23083427e8
NEW Can use the result_mode of mysqli driver. Save memory for list count
2021-08-16 22:36:30 +02:00
Laurent Destailleur
a5df1d28d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-16 22:09:34 +02:00
Laurent Destailleur
06a0d922cc
NEW Can use the result_mode of mysqli driver. Save memory for list count
2021-08-16 22:01:58 +02:00
Alexandre SPANGARO
4b615e541b
FIX Accountancy - SQL error when insert a manuel transaction
2021-08-16 21:29:28 +02:00
Laurent Destailleur
94fbcbdad1
CSS For support page
2021-08-16 20:22:50 +02:00
stickler-ci
af1f29bb16
Fixing style errors.
2021-08-16 11:22:49 +00:00
Gurvan Kervern
9f1ced1fd0
fix warnings 6
...
Removing PHP8 warnings
2021-08-16 19:06:38 +08:00
Gurvan Kervern
031e13d438
fix warnings 5
...
Removing PHP8 warnings
2021-08-16 18:55:49 +08:00
Gurvan Kervern
1bd7b4a439
fix warnings 4
...
Fixing PHP8 warnings
2021-08-16 18:52:44 +08:00
Gurvan Kervern
f9c4ea8f6a
fix warnings3
...
Fixing PHP8 warnings
2021-08-16 18:37:39 +08:00
Gurvan Kervern
d2e2dcf27e
fix warnings 2
...
Fixing PHP8 warnings
2021-08-16 18:10:04 +08:00
Gurvan Kervern
b0ea9fed0a
fix warnings 1
...
Removing all PHP8 warnings from error logs
2021-08-16 18:05:29 +08:00
Alexandre SPANGARO
1bfc0004b1
Better fix
2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3
FIX Accountancy - SQL error on select journal on journal
2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
b8da594c31
Better fix
2021-08-16 05:47:25 +02:00
stickler-ci
b92fe38bc0
Fixing style errors.
2021-08-16 01:47:49 +00:00
stickler-ci
ee65860b27
Fixing style errors.
2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay
...
Added multicurrency remainder to be paid.
2021-08-16 09:44:09 +08:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay
...
Added the remainder to be paid in multicurrency mode.
2021-08-16 09:39:09 +08:00
Alexandre SPANGARO
abc94a397a
FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice
2021-08-15 11:12:14 +02:00
Alexandre SPANGARO
f88abb9a6f
Add parenthesis
2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd
Merge branch '12.0' into 12p18
2021-08-15 07:19:33 +02:00
atm-florian
1932bc308d
FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card
2021-08-13 13:26:11 +02:00
Vincent Dieltiens
2aef13c3b4
Adds global variable 'PRODUCT_GENERATE_REF_AFTER_FORM' to allow product ref generation after the form validation
2021-08-13 11:38:48 +02:00
Maxime Kohlhaas
96a820476c
Fix supplier invoice clone : missing data on lines ( #18055 )
2021-08-13 10:45:43 +02:00
Gauthier PC portable 024
b2dad4d2ce
Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists
2021-08-12 15:44:20 +02:00
Gauthier PC portable 024
22eda3fd63
NEW : add missing printFieldListFrom hook call on several lists
2021-08-12 15:39:52 +02:00
2125bc9aa5
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
2021-08-12 17:15:57 +04:00
84b8717693
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
...
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
2021-08-12 17:05:00 +04:00
cd60d09d9e
FIX #18399 Fix shipment validation email template override.
...
Object type name for shipment was apparently wrong.
2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00
Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines.
2021-08-12 13:56:41 +02:00
stickler-ci
73998ac927
Fixing style errors.
2021-08-12 08:36:38 +00:00
Anthony Berton
7d143c5575
Merge branch 'add_option_pdf_global_with_picture' of https://github.com/bb2a/dolibarr into add_option_pdf_global_width_picture
2021-08-12 10:33:55 +02:00
Anthony Berton
fdd85845ce
erreur save const
2021-08-12 10:27:19 +02:00
Anthony Berton
67bc64d687
save no ajax
2021-08-12 10:19:55 +02:00
stickler-ci
14ad317acc
Fixing style errors.
2021-08-12 08:18:44 +00:00
Anthony Berton
9c811f9051
Merge branch 'develop' into add_option_pdf_global_with_picture
2021-08-12 10:16:26 +02:00
Anthony Berton
52a255e0cb
move at bottom of pdf_other.php page
2021-08-12 10:10:57 +02:00
jpb
b1cba14718
merge conflict
2021-08-12 09:36:34 +02:00
Laurent Destailleur
896cdf4845
Update list.php
2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist
2021-08-11 22:22:26 +02:00
Laurent Destailleur
0d07135027
Update list.php
2021-08-11 22:19:53 +02:00
Laurent Destailleur
d7317025e9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf_other.php
2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 22:07:13 +02:00
Laurent Destailleur
745af0f025
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-11 21:54:35 +02:00
Laurent Destailleur
d66df5cb60
Complete #15548
2021-08-11 21:53:21 +02:00
Laurent Destailleur
0d2e3ece1a
Update card.php
2021-08-11 21:50:28 +02:00
Laurent Destailleur
3af8e18b3c
Create card.php
2021-08-11 21:47:28 +02:00
stickler-ci
3c0601d1f9
Fixing style errors.
2021-08-11 19:46:39 +00:00
Laurent Destailleur
5b30cf3e77
Update card.php
2021-08-11 21:44:18 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163
2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae
Fixing style errors.
2021-08-11 19:36:18 +00:00
Laurent Destailleur
3befe8f383
Update 12.0.0-13.0.0.sql
2021-08-11 21:34:11 +02:00
Laurent Destailleur
80673e0efc
Update card.php
2021-08-11 21:32:39 +02:00
Laurent Destailleur
9e54dc0dcb
typo
2021-08-11 21:31:14 +02:00
Laurent Destailleur
0cf2164260
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2021-08-11 21:06:33 +02:00
Laurent Destailleur
bf72143823
Fix phpcs
2021-08-11 21:04:03 +02:00
Laurent Destailleur
911f8daec6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-11 21:03:04 +02:00
Laurent Destailleur
06b50051f1
Merge pull request #18356 from altairisfr/iban
...
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
2021-08-11 21:02:51 +02:00
Laurent Destailleur
012eee7e06
Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE
...
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
2021-08-11 21:00:53 +02:00
lmarcouiller
51a28a4ac4
Fix lang error on hrm/index.php
2021-08-11 20:48:22 +02:00
Laurent Destailleur
bfedd4a04c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-11 20:47:51 +02:00
Laurent Destailleur
ec4a1d4cb7
Merge pull request #18344 from Hystepik/develop#4
...
Fix lang error on hrm/index.php
2021-08-11 20:47:35 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
...
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
ab3874a203
Merge pull request #18349 from cfoellmann/fix-stdvalue-target
...
add GETPOST to 'target' value on new bookmarks
2021-08-11 20:05:36 +02:00
Laurent Destailleur
687eb536ae
Update card.php
2021-08-11 20:05:03 +02:00
Laurent Destailleur
8e9d0a567a
Merge pull request #18360 from andreubisquerra/develop
...
NEW Customer Display with TakePOS
2021-08-11 20:00:36 +02:00
Laurent Destailleur
366332a6f5
Merge pull request #18347 from erikvanberkum/develop
...
Fix: Change French word to English in English array.
2021-08-11 19:59:21 +02:00
Laurent Destailleur
dad251493a
Merge pull request #18355 from marc-dll/12.0_FIX_holiday_card_hooks
...
FIX: holiday card: hooks uninitialized
2021-08-11 19:58:50 +02:00
Laurent Destailleur
5a0adfc80b
Merge pull request #18362 from fappels/15_update_actioncomm
...
Update actioncomm.class
2021-08-11 19:58:25 +02:00
Laurent Destailleur
34b53592b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b
Fix help
2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name
2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13
CHANGE_CONST_ADD_DOC
2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473
add_doc
2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf
add_doc
2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8
add_espadon_doc
2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e
add_sponge_doc
2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901
add_cyan_doc
2021-08-11 17:32:09 +02:00
Anthony Berton
8d1a53ce98
add eratosthene doc
2021-08-11 16:28:13 +02:00
Anthony Berton
5938f131c8
erreur cut past logo height mouve
2021-08-11 16:24:11 +02:00
Anthony Berton
3b356fc366
params is duplicate
2021-08-11 16:20:41 +02:00
Anthony Berton
c5e8302ba2
Const
2021-08-11 16:18:16 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine
...
Remove strange check on hook printOriginObjectLine.
2021-08-11 15:55:55 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php
2021-08-11 15:44:48 +02:00
Laurent Destailleur
dd5f2dd3a2
Merge pull request #18370 from cfoellmann/fix-link-supplier
...
fix link to supplier card of thirdparty on supplier_order list
2021-08-11 15:44:00 +02:00
Laurent Destailleur
3964bd28db
Merge pull request #18385 from marc-dll/12.0_FIX_workflow_shipment_validate_trigger
...
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
2021-08-11 15:28:12 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment
2021-08-11 15:24:10 +02:00
stickler-ci
775164f84a
Fixing style errors.
2021-08-11 15:21:14 +02:00
Anthony Berton
c12905f0f3
ok
2021-08-11 15:21:08 +02:00
Laurent Destailleur
094a11fae6
Merge pull request #18390 from bb2a/save__pdf_option_other
...
[FIX] PDF other options save Yes/No
2021-08-11 15:19:38 +02:00
Laurent Destailleur
6fbd93999f
css
2021-08-11 13:33:51 +02:00
stickler-ci
3e2b4b45c1
Fixing style errors.
2021-08-11 11:00:11 +00:00
Anthony Berton
40329b9181
other_doc
2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307
other_frame
2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3
other_doc
2021-08-11 12:39:24 +02:00
stickler-ci
b7441aaf45
Fixing style errors.
2021-08-11 10:37:06 +00:00
Anthony Berton
b45a57060f
const_and_other_doc
2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283
other_docs
2021-08-11 12:28:44 +02:00
stickler-ci
120ac51495
Fixing style errors.
2021-08-11 06:52:10 +00:00
stickler-ci
8f8ff50d35
Fixing style errors.
2021-08-11 06:50:50 +00:00
Laurent Destailleur
f48a9aa3ad
Optimize size of html
2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84
Fix crlf
2021-08-10 19:28:06 +02:00
Anthony Berton
7acc5e22d0
Merge branch 'PDF_show_sender_name' of https://github.com/bb2a/dolibarr into PDF_show_sender_name
2021-08-10 18:08:00 +02:00
Anthony Berton
be016197b4
Trans
2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef
trans
2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3
Trans
2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655
ok
2021-08-10 18:04:59 +02:00
Anthony Berton
005e25375a
ok
2021-08-10 17:51:39 +02:00
Gauthier PC portable 024
087e269103
FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref)
2021-08-10 17:34:47 +02:00
stickler-ci
1d9d90036d
Fixing style errors.
2021-08-10 15:14:41 +00:00
Erik van Berkum
c05b1f5e29
Merge branch 'Dolibarr:develop' into develop
2021-08-10 23:59:50 +09:00
Laurent Destailleur
5e0aaeb6e4
Fix warning
2021-08-10 16:40:33 +02:00
Laurent Destailleur
2860c5e3ab
Fix missing dir
2021-08-10 16:36:54 +02:00
Laurent Destailleur
bef0989b15
Missing declaration
2021-08-10 13:34:21 +02:00
Anthony Berton
fb81db9426
yes/no save
2021-08-10 13:34:12 +02:00
Anthony Berton
21d6b9834a
yes/no save
2021-08-10 13:31:25 +02:00
Anthony Berton
133bb0e699
yes/no save
2021-08-10 13:28:36 +02:00
Anthony Berton
a5accb8c3c
yes/no
2021-08-10 13:18:07 +02:00
Laurent Destailleur
31d6aaf6b4
FIX avoid to have link to create bookmar on page to create bookmark
2021-08-10 13:06:57 +02:00
Anthony Berton
6a41edd3c2
ok
2021-08-10 13:02:37 +02:00
Laurent Destailleur
6ece5f6931
FIX avoid to have link to create bookmar on page to create bookmark
2021-08-10 13:01:57 +02:00
Laurent Destailleur
93fb6bce71
css
2021-08-10 12:26:41 +02:00
Laurent Destailleur
3b73abed7c
css
2021-08-10 11:40:25 +02:00
Marc de Lima Lucio
b610cc1c6c
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
2021-08-10 11:18:25 +02:00
Marc de Lima Lucio
08f21e3fc4
FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts
2021-08-10 10:23:56 +02:00
Anthony Berton
366625f300
const
2021-08-10 09:50:14 +02:00
stickler-ci
fcd174f3ad
Fixing style errors.
2021-08-10 07:45:47 +00:00
Anthony Berton
f8df845442
Const and Com
2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f
const
2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152
CONST
2021-08-10 09:38:07 +02:00
Laurent Destailleur
f3dbe81df4
FIX Can't set cost price when product is not on purchase
2021-08-09 20:02:24 +02:00
Laurent Destailleur
6a9217474d
FIX Can't set cost price when product is not on purchase
2021-08-09 20:01:06 +02:00
Laurent Destailleur
3f58e7c5db
Debug status of partnership
2021-08-09 18:31:34 +02:00
Anthony Berton
0bead55836
ok
2021-08-09 18:11:36 +02:00
stickler-ci
adc6f883e2
Fixing style errors.
2021-08-09 16:03:13 +00:00
Anthony Berton
6b3b6fd508
ok
2021-08-09 18:01:43 +02:00
Laurent Destailleur
b5b53e382e
Fix missing template
2021-08-09 18:01:41 +02:00
Laurent Destailleur
2c5e0a595b
Fix init data missing
2021-08-09 17:58:08 +02:00
Laurent Destailleur
e91c5fc1c5
Clean code
2021-08-09 17:55:26 +02:00
Laurent Destailleur
0876cb4cd9
Fix button cancel
2021-08-09 17:46:36 +02:00
stickler-ci
190ae8377e
Fixing style errors.
2021-08-09 15:42:38 +00:00
Anthony Berton
41457d2adb
ok
2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-09 16:49:16 +02:00
Laurent Destailleur
6e4fb8dd8b
Fix debited instead of credited for bank transfer sepa status
2021-08-09 16:48:36 +02:00
Laurent Destailleur
739d8e1c6b
Fix data structure
2021-08-09 16:19:23 +02:00
Laurent Destailleur
305314c04e
Fix data structure
2021-08-09 16:18:33 +02:00
Laurent Destailleur
2de728c074
Fix trans
2021-08-09 16:12:20 +02:00
Christian Foellmann
e4cb1e023a
fix link to supplier card of thirdparty on supplier_order list
2021-08-09 15:39:04 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb
FIX postgre filter select search extrafield
2021-08-09 15:14:25 +02:00
Francis Appels
91ef2a44fd
Remove strange check on hook printOriginObjectLine.
...
Now need reshook.
2021-08-09 11:17:11 +02:00
andreubisquerra
ea531a4c88
Customer display settings
2021-08-08 19:16:11 +02:00
andreubisquerra
8a513ea468
Customer display on addline
2021-08-08 19:15:18 +02:00
andreubisquerra
bae5b39706
Customer display on click product
2021-08-08 19:14:28 +02:00
andreubisquerra
49b53e04f4
Customer Display total on pay
2021-08-08 19:13:31 +02:00
andreubisquerra
091f5ab23b
Customer Display Lang
2021-08-08 19:12:45 +02:00
Laurent Destailleur
6b1fc48bd0
Fix var not initialized
2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d
Fix var not defined
2021-08-08 12:57:00 +02:00
Laurent Destailleur
029da815b2
Code comment
2021-08-08 12:35:52 +02:00
Laurent Destailleur
47d57b1ed2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:23:44 +02:00
Laurent Destailleur
78e993c9f3
Fix permission to read reports
2021-08-08 12:23:14 +02:00
Laurent Destailleur
7247b99170
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:15:25 +02:00
Laurent Destailleur
28ff7c894b
Fix missing permission
2021-08-08 12:14:40 +02:00
Laurent Destailleur
227f1605f6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/group/perms.php
2021-08-08 12:10:21 +02:00
Laurent Destailleur
c377e5ea3d
Fix undefined method
2021-08-08 12:09:18 +02:00
Laurent Destailleur
7365d61dfc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:05:45 +02:00
Laurent Destailleur
3f0a5cc689
Fix permission info on permissions group
2021-08-08 12:04:21 +02:00
Laurent Destailleur
948663deb4
Fix deprecated var
2021-08-07 13:59:07 +02:00
Laurent Destailleur
1435172405
Better help
2021-08-06 18:55:41 +02:00
Laurent Destailleur
354d88df23
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-06 18:50:39 +02:00
Laurent Destailleur
d437d382d8
Fix trans
2021-08-06 18:48:05 +02:00
Francis Appels
68482c637b
Update actioncomm.class
...
Property contactid should be contact_id
2021-08-06 18:45:25 +02:00
Laurent Destailleur
a7fa238b71
Position of option
2021-08-06 18:35:16 +02:00
Laurent Destailleur
e26eda3f5f
Position of option
2021-08-06 18:34:35 +02:00
Laurent Destailleur
458f773baf
Fix security options
2021-08-06 18:32:40 +02:00
Christophe Battarel
cbc7589559
NEW: add constant MAIN_IBAN_NOT_MANDATORY
2021-08-06 16:35:49 +02:00
Marc de Lima Lucio
864a8b4b3e
FIX: holiday card: hooks uninitialized
2021-08-06 16:22:19 +02:00
Laurent Destailleur
fec5a22c65
Fix filter to find files of a ref.
2021-08-06 13:26:01 +02:00
Laurent Destailleur
4c3c613568
Fix filter to find files of a ref.
2021-08-06 13:24:40 +02:00
Laurent Destailleur
cf74af4401
css
2021-08-06 13:07:07 +02:00
Laurent Destailleur
c0c46fb704
FIX Link of download main doc on vat list
2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756
FIX Link of download main doc on vat list
2021-08-06 12:18:51 +02:00
Laurent Destailleur
470eec7f50
Remove (hide) not used field "deductible" on social contributions.
2021-08-06 11:32:39 +02:00
Christian Foellmann
80c63cae5e
add GETPOST to 'target' value on new bookmarks -> allows to set default value
2021-08-06 08:32:40 +02:00
Erik van Berkum
d249ffd5ad
Fix: Change French word to English in English array.
2021-08-06 13:40:19 +09:00
lmarcouiller
6b20b32f07
Fix lang error on hrm/index.php
2021-08-05 16:31:21 +02:00
Laurent Destailleur
591b8acd51
FIX show info of company into user dropdown
2021-08-05 15:57:51 +02:00
Laurent Destailleur
c603dfb5ea
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-05 15:16:04 +02:00
Laurent Destailleur
fca3980dce
FIX Can't remove a permission of a group
2021-08-05 15:15:03 +02:00
Laurent Destailleur
047bbbb298
NEW Can set/unset the usual working day of the week
2021-08-05 14:42:28 +02:00
Laurent Destailleur
5d717113be
Add language key
2021-08-05 11:20:43 +02:00
jpb
04d406bd39
remove useless boolean statment
2021-08-05 09:09:11 +02:00
Laurent Destailleur
0a31f3dc1a
FIX #18341 lang not loaded
2021-08-04 23:11:59 +02:00
Laurent Destailleur
965bdbb342
Trans
2021-08-04 23:08:57 +02:00
Laurent Destailleur
f6abeca246
Fix example
2021-08-04 20:18:14 +02:00
Laurent Destailleur
76038e692d
NEW Use an ajax call for the clicktodial feature instead of href link.
2021-08-04 20:07:12 +02:00
stickler-ci
ee55a7de5a
Fixing style errors.
2021-08-04 15:50:59 +00:00
Gauthier PC portable 024
7b702d19d4
NEW : display shipping method and tracking url on shipemnt list
2021-08-04 17:47:40 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Hystepik
e02d93c401
Merge branch 'develop' into develop#1
2021-08-04 16:15:50 +02:00
Laurent Destailleur
a5d11a1ccf
Fix warning
2021-08-04 15:46:00 +02:00
Laurent Destailleur
0de10cea39
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 15:21:31 +02:00
Laurent Destailleur
ba403dd33f
Add missing security info
2021-08-04 15:21:01 +02:00
Laurent Destailleur
c60927da61
Add missing security info
2021-08-04 15:16:51 +02:00
lmarcouiller
8c8a542127
fix error with lang search
2021-08-04 15:06:08 +02:00
Maxime Kohlhaas
803722e323
Fix : we only want employee users for holidays
2021-08-04 14:48:10 +02:00
Laurent Destailleur
841176fdfd
Fix set cookie with tag "secure" when https is forced.
2021-08-04 14:38:05 +02:00
Laurent Destailleur
58ca982e55
Fix trans
2021-08-04 14:01:57 +02:00
Laurent Destailleur
a9ced1098d
Fix lang loaded
2021-08-04 13:51:54 +02:00
Laurent Destailleur
928a2154b3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 13:22:55 +02:00
Laurent Destailleur
23ea8d2907
Fix link into message
2021-08-04 13:22:24 +02:00
Laurent Destailleur
354b8aab01
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 13:18:33 +02:00
Laurent Destailleur
de228c5687
Fix bad link. Can't delete SEPA bank transfer request
2021-08-04 13:18:03 +02:00
Laurent Destailleur
6a31d4657b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739
Fix translation ICS
2021-08-04 13:12:07 +02:00
Laurent Destailleur
2f3105d884
Add CSRF protection
2021-08-04 13:05:07 +02:00
Laurent Destailleur
a84c994368
Fix no tooltip on link in error message
2021-08-04 12:43:36 +02:00
Laurent Destailleur
bf49309d58
Fix css
2021-08-04 12:41:27 +02:00
Laurent Destailleur
ce0d9f3b17
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324
Fix css
2021-08-04 12:38:28 +02:00
Laurent Destailleur
6dc8024d87
Fix title
2021-08-04 12:30:48 +02:00
Laurent Destailleur
d1af127c81
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 12:29:11 +02:00
Laurent Destailleur
4dfc8bab93
Fix bad title
2021-08-04 12:28:13 +02:00
Laurent Destailleur
4958015e93
Fix token
2021-08-04 12:26:38 +02:00
lmarcouiller
8cbbcc01a9
Update to make lan field common
2021-08-04 11:25:23 +02:00
Laurent Destailleur
6c19524fd7
code comment
2021-08-04 00:12:49 +02:00
Laurent Destailleur
7245fcec11
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 00:09:51 +02:00
Laurent Destailleur
5f5734e9af
css
2021-08-04 00:09:33 +02:00
Laurent Destailleur
a571fab177
css
2021-08-03 23:54:36 +02:00
Laurent Destailleur
ea6cfeb0e8
NEW Increase size of params of action for emailcollector
2021-08-03 19:21:18 +02:00
Laurent Destailleur
5ec3245119
Migration
2021-08-03 17:15:55 +02:00
Laurent Destailleur
d3515253b2
Update 13.0.0-14.0.0.sql
2021-08-03 17:15:13 +02:00
Laurent Destailleur
78358d4ea1
Merge pull request #18190 from frederic34/migration_cat_tickets
...
add categories tickets migration
2021-08-03 17:13:06 +02:00
Laurent Destailleur
5becf13f2b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
Laurent Destailleur
d3fa85cdb4
Merge pull request #18324 from Hystepik/develop#4
...
Close #18043 : fk_user_assign in create ticket
2021-08-03 17:06:55 +02:00
Laurent Destailleur
892ec3a661
Update card.php
2021-08-03 17:06:07 +02:00
Laurent Destailleur
1c981ccb9d
Fix look and feel v14
2021-08-03 17:03:34 +02:00
Laurent Destailleur
1a0eeaf701
Fix phpcs
2021-08-03 16:35:47 +02:00
stickler-ci
1da9829d61
Fixing style errors.
2021-08-03 14:08:23 +00:00
lmarcouiller
6e68bf10ef
Update of card.php to change status
2021-08-03 16:06:08 +02:00
4873a91afc
CLOSE #18326 Workflow: Close order on shipment closing.
...
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
9ceab9b86b
Doc
2021-08-03 15:47:00 +02:00
Christophe Battarel
f00694470f
rename constant to PROPOSAL_ARE_NOT_BILLABLE
2021-08-03 15:40:01 +02:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5
...
FIX #18181
2021-08-03 15:35:20 +02:00
Laurent Destailleur
070fc26dcb
Merge pull request #18309 from grandoc/new_branch_02_08_2021
...
New branch 02 08 2021
2021-08-03 15:31:25 +02:00
Florian HENRY
19f17ed114
fix: bad setEventMessages input
2021-08-03 15:30:36 +02:00
Laurent Destailleur
c40cc3a51e
Merge pull request #18194 from FHenry/fix_bad_eoordisplay
...
fix: bad setEventMessages input
2021-08-03 15:23:22 +02:00
Laurent Destailleur
29715c2f2e
Merge pull request #18318 from altairisfr/PROPAL_REOPEN_UNSIGNED_ONLY
...
NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY
2021-08-03 15:09:31 +02:00
Laurent Destailleur
115b0e6831
Update api_shipments.class.php
2021-08-03 15:07:16 +02:00
lmarcouiller
c8fd7ccbb6
Close #18043 : fk_user_assign in create ticket
2021-08-03 15:06:53 +02:00
Laurent Destailleur
8b746b64a0
Prepare 14.0.1
2021-08-03 15:04:29 +02:00
Laurent Destailleur
ce5acda635
Fix phpcs
2021-08-03 15:03:41 +02:00
Laurent Destailleur
5543d68e5a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-03 15:02:24 +02:00
Laurent Destailleur
d0c57dac34
FIx #18217 - Salary - link 'salary' of bank_url not managed
2021-08-03 15:02:09 +02:00
d1f9762ca9
CLOSE #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
...
Allow "closing" a shipment through the REST API.
2021-08-03 13:37:28 +04:00
stickler-ci
9d2552e77b
Fixing style errors.
2021-08-03 09:29:25 +00:00
Quentin VIAL-GOUTEYRON
2fab637b92
add dol_concatdesc
2021-08-03 11:26:57 +02:00
Christophe Battarel
7a7287489d
NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY
2021-08-03 11:24:21 +02:00
Quentin VIAL-GOUTEYRON
f22a02a7ef
fix br
2021-08-03 11:21:47 +02:00
Christophe Battarel
2998c94884
NEW : add constant PROPAL_NOT_BILLABLE
2021-08-03 11:12:19 +02:00
Laurent Destailleur
cad39cc75d
Merge pull request #18307 from dolibit-ut/patch-366
...
Update llx_c_actioncomm.sql
2021-08-02 20:21:34 +02:00
Laurent Destailleur
000c32c137
FIx #18313
2021-08-02 20:20:52 +02:00
Laurent Destailleur
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +02:00
atm-florian
fc33d46c77
FIX: using Tulip, deposit mask doesn't get saved
2021-08-02 18:56:45 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
61e3a57de7
Fix label
2021-08-02 18:23:05 +02:00
Laurent Destailleur
efda27000e
Fix set of date of rum signature
2021-08-02 18:13:35 +02:00
Laurent Destailleur
8077fae42e
Code comment
2021-08-02 17:56:58 +02:00
Laurent Destailleur
04fc2c0ce7
css
2021-08-02 17:49:27 +02:00
lmarcouiller
1cef6d31e8
Close #18302 : Mass action leave requests
2021-08-02 15:45:55 +02:00
Philippe GRAND
3c05cd0757
fix typo and translation
2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0
backward
2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3
fix typo and translation
2021-08-02 12:35:46 +02:00
UT from dolibit
b801188801
Update llx_c_actioncomm.sql
2021-08-02 12:12:57 +02:00
Frédéric FRANCE
099164c043
Merge remote-tracking branch 'upstream/develop' into migration_cat_tickets
2021-08-02 09:01:27 +02:00
Laurent Destailleur
c6233e4a39
Merge pull request #18165 from trekmorris/patch-3
...
Update opensurvey.lang manually
2021-08-02 00:03:38 +02:00
Laurent Destailleur
a4843f7d10
Merge pull request #18176 from ATM-Consulting/FIX_13.0_dispatch_cloned_datepicker_not_working
...
FIX: datepickers cloned using jquery are not working
2021-08-01 23:51:57 +02:00
Laurent Destailleur
7ab129d489
Merge pull request #18179 from joseplluis/patch-8
...
Add missing line product variables
2021-08-01 23:47:56 +02:00
Laurent Destailleur
b725dd0309
Merge pull request #18186 from frederic34/patch-8
...
fix variable
2021-08-01 23:46:42 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11
...
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0
Merge pull request #18196 from FHenry/develop_addexport
...
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify
...
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
e8d385ae42
Merge pull request #18224 from aspangaro/14p9
...
FIX: Missing column Date validation in ledger & subledger
2021-08-01 23:26:25 +02:00
Laurent Destailleur
7f28ad325b
Merge pull request #18208 from dolibit-ut/patch-364
...
Update llx_00_c_country.sql
2021-08-01 14:55:29 +02:00
Laurent Destailleur
a983dc7506
Merge pull request #18214 from FHenry/12_fix_css_form_confirmlist
...
fix: since commit be62c2f7
2021-08-01 14:53:08 +02:00
Laurent Destailleur
5256d6e046
css
2021-07-31 17:34:41 +02:00
Laurent Destailleur
b67487b2ca
Fix reposition
2021-07-31 17:28:43 +02:00
Laurent Destailleur
7eb8232b75
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268
Debug v14
2021-07-31 17:20:48 +02:00
Laurent Destailleur
b332d02d20
Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel
...
NEW add agenda auto creation on supplier_order cancellation
2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615
Merge pull request #18288 from FHenry/14_deveventorg
...
NEW: EventOrganization Module #FoundationFunding
2021-07-31 16:57:07 +02:00
Laurent Destailleur
530a773eaa
Merge pull request #18300 from cfoellmann/fix-tomail-field
...
fix `tomail` param in mail form usage
2021-07-31 16:55:01 +02:00
Laurent Destailleur
af95169d1d
Update actions_sendmails.inc.php
2021-07-31 16:54:18 +02:00
Laurent Destailleur
6f449cfd6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 16:33:38 +02:00
Laurent Destailleur
f73394435e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/expensereport/card.php
htdocs/societe/list.php
2021-07-31 16:32:24 +02:00
Laurent Destailleur
9811569b2b
FIX #18289 #18294
2021-07-31 16:22:50 +02:00
Laurent Destailleur
0c024ca96b
Merge pull request #18297 from cfoellmann/hook-menu
...
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
1e8f27975d
Merge pull request #18207 from dolibit-ut/patch-363
...
Update llx_20_c_departements.sql
2021-07-31 13:30:53 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2
...
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
58fa6ac4ab
Merge pull request #18215 from netdrag/order_supplier_email_sender-patch-1
...
Order Supplier Email Sender Extension
2021-07-31 12:29:49 +02:00
Laurent Destailleur
04911bde25
Merge pull request #18277 from atm-florianm/FIX_forum_post_37369_wrong_conf_used
...
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-31 12:20:18 +02:00
Laurent Destailleur
b77ec22590
Merge pull request #18278 from aspangaro/12p17
...
FIX: Invoice - Missing button to reopen an abandoned situation invoice
2021-07-31 12:19:26 +02:00
Laurent Destailleur
6f5e412bd5
Merge pull request #18299 from Hystepik/develop_v14#3
...
Fix error in website module -> sitemap v14
2021-07-31 12:15:42 +02:00
Florian HENRY
26551909a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta
2021-07-30 20:27:29 +02:00
Laurent Destailleur
9dc61adcc7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-30 18:44:15 +02:00
Laurent Destailleur
9c626bede4
Fix dol_hash for sha256
2021-07-30 18:43:35 +02:00
Christian Foellmann
f830a0f5e2
fix tomail param in mail form usage
2021-07-30 15:20:41 +02:00
Laurent Destailleur
5995e01bd1
Merge pull request #18280 from ptibogxiv/patch-439
...
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6
fix hook name
2021-07-30 15:19:05 +02:00
lmarcouiller
0d70c81897
ix error in website module -> sitemap
2021-07-30 15:16:38 +02:00
Laurent Destailleur
a9f5fd497a
Merge pull request #18291 from FHenry/14_fix_add_missing_hook_translationproductpage
...
fix: add hook management into product translation tab
2021-07-30 15:07:01 +02:00
atm-florian
63898426d2
FIX: on admin/pdf.php (with javascript enabled) if you set some boolean confs then click on "save", all boolean values are reset
2021-07-30 13:36:54 +02:00
stickler-ci
3ceb451734
Fixing style errors.
2021-07-30 11:19:18 +00:00
Christian Foellmann
0102e73306
add hook 'menu_LeftMenuArray' to filter the leftmenu items
2021-07-30 13:15:01 +02:00
jpb
15578c2ec2
merge conflict
2021-07-30 10:57:04 +02:00
Florian HENRY
8ea6fc3174
fix: add hook management into product translation tab
2021-07-30 09:38:29 +02:00
Florian HENRY
510cf36bbd
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-30 09:26:55 +02:00
Laurent Destailleur
57d637ac71
Fix set status of a ticket
2021-07-30 01:49:43 +02:00
Laurent Destailleur
047c575d61
Fix some errors on ticket module
2021-07-30 01:42:52 +02:00
Laurent Destailleur
593e84906b
FIX bad closing div on error message
2021-07-30 01:16:04 +02:00
Laurent Destailleur
0c3bf536f2
Fix field resolution
2021-07-30 01:10:15 +02:00
Laurent Destailleur
9954a0e4bb
Fix status of tickets
2021-07-30 00:40:06 +02:00
Laurent Destailleur
26a7130376
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-29 23:48:28 +02:00
Laurent Destailleur
f02dee2e21
Fix test on missing install.lock
2021-07-29 23:47:59 +02:00
Florian HENRY
6f3080c67c
send mail from ConfOrBooth list to attendees or santd company
2021-07-29 19:24:12 +02:00
Maxime Kohlhaas
12b2ba64eb
Fix right check on thirdparty set on ticket card
2021-07-29 17:49:37 +02:00
Florian HENRY
78646d10bb
tpl object linked
2021-07-29 17:26:17 +02:00
Florian HENRY
ae5bb956ac
fix invoice in stand registration pb
2021-07-29 17:18:05 +02:00
Alexandre SPANGARO
ca6dd8850a
FIX: Manage credit note on situation invoice for calculate margin
2021-07-29 15:24:08 +02:00
Christian Foellmann
b5c30126cb
extend the hook getElementList to make $ids in the hooked function
2021-07-29 14:49:41 +02:00
ptibogxiv
da482018d2
Fix for php 8
2021-07-29 10:51:51 +02:00
lmarcouiller
b0133224d8
Update of var_dumper package 3.0 -> 3.2
2021-07-29 10:20:01 +02:00
Christian Foellmann
8d87bdcf7e
add sql data for fresh install
2021-07-29 08:18:55 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel
2021-07-29 08:14:02 +02:00
Alexandre SPANGARO
262dd1600b
FIX: Invoice - Missing button to reopen an abandoned situation invoice
2021-07-29 06:23:12 +02:00
atm-florian
fdd0ab8461
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-28 23:56:44 +02:00
Laurent Destailleur
583f1ccc1a
Merge pull request #18243 from Robin-Yann/13-hook
...
13 - add hook product part
2021-07-28 22:46:20 +02:00
Francis Appels
f6d03fe28e
Fix update product lot
2021-07-28 21:45:11 +02:00
Laurent Destailleur
9734fced56
Merge pull request #18221 from aspangaro/14p8
...
FIX: Accountancy - Search date on journal
2021-07-28 19:48:38 +02:00
Josep Lluís
e7af8e9d5e
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 19:40:33 +02:00
Frédéric FRANCE
ae5d17815f
Update dolreceiptprinter.class.php
2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947
Merge pull request #18245 from frederic34/patch-12
...
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
Laurent Destailleur
e406d80338
Merge pull request #18233 from ptibogxiv/patch-431
...
fix for php8
2021-07-28 19:37:00 +02:00
Laurent Destailleur
d2311bcdeb
Merge pull request #18234 from ptibogxiv/patch-432
...
fix for php 8
2021-07-28 19:36:13 +02:00
Laurent Destailleur
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf
...
fix: expense report line, on update qty must/can be decimal
2021-07-28 19:31:16 +02:00
Laurent Destailleur
07c4c36520
Merge pull request #18271 from Hystepik/develop_v14#2
...
Fix a bug in ecm for v14
2021-07-28 19:16:33 +02:00
Laurent Destailleur
20217806c6
Merge pull request #18227 from Hystepik/develop_v13#1
...
Fix #18185 : Filter fk_stcomm fixed
2021-07-28 19:11:04 +02:00
Laurent Destailleur
fea4210570
Merge pull request #18272 from laurantines/patch-3
...
Fix opp status required even if PROJECT_USE_OPPORTUNITIES off
2021-07-28 18:57:03 +02:00
Laurent Destailleur
c9a46ab0cc
Merge pull request #18273 from aspangaro/12p17
...
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
2021-07-28 18:55:47 +02:00
ptibogxiv
99e256a417
Update functions.lib.php
2021-07-28 18:22:26 +02:00
Josep Lluís
20add7d3fc
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 18:02:55 +02:00
Laurent Destailleur
57b18a6bed
Merge pull request #18218 from aspangaro/14p6
...
Security
2021-07-28 17:55:54 +02:00
Laurent Destailleur
512b2477ef
Merge pull request #18225 from aspangaro/14p10
...
FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger
2021-07-28 17:43:49 +02:00
Laurent Destailleur
bd731d9213
Merge pull request #18226 from FHenry/fix_addtimespend
...
FIX: cannot add time spend when column ref is not displayed
2021-07-28 17:38:04 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429
...
Fix for php 8
2021-07-28 17:37:07 +02:00
Laurent Destailleur
fe2d229ba9
Merge pull request #18235 from ptibogxiv/patch-433
...
Fix for php8
2021-07-28 17:35:01 +02:00
Laurent Destailleur
686c10e5be
Merge pull request #18236 from ptibogxiv/patch-434
...
Fix for php8
2021-07-28 17:31:45 +02:00
Laurent Destailleur
29a61164fe
Merge pull request #18237 from ptibogxiv/patch-435
...
Fix subscription list
2021-07-28 17:30:42 +02:00
Laurent Destailleur
0476b36c6c
Merge pull request #18238 from ptibogxiv/patch-436
...
Fix for php8
2021-07-28 17:29:54 +02:00
Laurent Destailleur
8e16396d51
Merge pull request #18239 from ptibogxiv/patch-437
...
fix for php8
2021-07-28 17:29:32 +02:00
Laurent Destailleur
12a0029fb7
Merge pull request #18240 from ptibogxiv/patch-438
...
Fix for php 8
2021-07-28 17:28:49 +02:00
Alexandre SPANGARO
cd63ede35a
Correctif date
2021-07-28 16:46:57 +02:00
laurantines
f8563ace0d
Fix opp statusbrequires even if PROJECT_USE_OPPORTUNITIES off
...
If I modify a project and do not have PROJECT_USE_OPPORTUNITIES enabled, I cannot change the project budget. I get the error message that ErrorOppStatusRequiredIfAmount. However, I do not have the opportunities enabled and it does not make sense for that message to appear when I have not added any opportunities.
2021-07-28 16:14:38 +02:00
Laurent Destailleur
212f157c0f
Merge pull request #18246 from FHenry/fix_ref_fourn_size
...
new: ref fourn and ref customer same size as ref product
2021-07-28 16:00:45 +02:00
lmarcouiller
df8f099857
Fix a bug in ecm for v14
2021-07-28 15:57:12 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder
...
Improve makeorder
2021-07-28 15:41:09 +02:00
Laurent Destailleur
ae2866ccd7
Merge pull request #18269 from ksar-ksar/patch-6
...
FIX #18267
2021-07-28 15:38:17 +02:00
Laurent Destailleur
ededf43565
Merge pull request #18252 from cfoellmann/improve-receive
...
NEW add cancel button to `classifyreception` form on supplier_orders
2021-07-28 15:37:14 +02:00
Laurent Destailleur
8dca7d2b35
Merge pull request #18260 from FHenry/fix_addhook_addmoractionbutton_productprice
...
fix: add hook addMoreActionButton product price
2021-07-28 15:30:37 +02:00
Laurent Destailleur
7c86a4766e
Merge pull request #18261 from fmarcet/14.0
...
Fix: Price level on company list not filtering
2021-07-28 15:29:15 +02:00
ksar
2054cca6e5
FIX #18267
2021-07-28 15:14:18 +02:00
Alexandre SPANGARO
7acebd28ca
Add information
2021-07-28 14:08:53 +02:00
kamel
b4ccb1b355
Corrections stickler-ci
2021-07-28 12:29:17 +02:00
kamel
2cd7513936
NEW: add link to a element by ref
2021-07-28 12:18:35 +02:00
kamel
95ecbb8940
FIX: add include missing file '/core/actions_dellink.inc.php' in project card
2021-07-28 12:05:46 +02:00
Alexandre SPANGARO
712f0b897d
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
2021-07-28 12:02:45 +02:00
Ferran Marcet
ea1c23b562
Merge branch '14.0up' into 14.0
2021-07-28 11:50:40 +02:00
Ferran Marcet
aae64eee1e
Fix: Not correct redirect link on lots
2021-07-28 11:48:38 +02:00
Laurent Destailleur
a635e82406
Merge pull request #18254 from leninrivas/patch-2
...
Add filter select company
2021-07-28 11:22:16 +02:00
Ferran Marcet
2980cd9ab2
Fix: Price level on company list not filtering
2021-07-28 11:19:21 +02:00
Laurent Destailleur
3e9e47d4bd
Merge pull request #18255 from ksar-ksar/patch-6
...
FIX of #18212 : Add url field
2021-07-28 11:17:18 +02:00
Florian HENRY
84d221988f
fix: add hook addMoreActionButton product price
2021-07-28 11:17:07 +02:00
Christian Foellmann
0cd8527c35
longer field for project ref on create and edit
2021-07-28 11:01:38 +02:00
Ferran Marcet
67cc580797
Fix: Bad rights on inventory module
2021-07-28 10:45:47 +02:00
Frédéric FRANCE
42252abc07
remove debug
2021-07-28 10:14:57 +02:00
ksar
3e3751e161
Add url field
...
#18212
2021-07-27 22:13:19 +02:00
Lenin Rivas
6038ef6bba
Add filter select company
...
Add filter with name alias and tva intra
2021-07-27 12:28:18 -05:00
Christian Foellmann
51cfeddaaf
add cancel button to classifyreception form on supplier_orders
2021-07-27 16:51:14 +02:00
Christian Foellmann
d9529f2600
save makeorder comment to agenda item
2021-07-27 16:37:34 +02:00
Christian Foellmann
cefbcf03f6
fix cancel on makeorder (supplier_order)
2021-07-27 16:18:06 +02:00
Christian Foellmann
8b118670c3
fix agenda item refuse
2021-07-27 15:11:13 +02:00
Christian Foellmann
faf50a5aaa
add agenda auto creation on supplier_order cancellation
2021-07-27 15:06:28 +02:00
Florian HENRY
f4fd4d8e7d
new: ref fourn and ref customer same size as ref product
2021-07-27 12:09:04 +02:00
Frédéric FRANCE
bc8be62809
Update dolreceiptprinter.class.php
2021-07-27 10:26:51 +02:00
lmarcouiller
7836651f84
Fix debug bar for php 8.0
2021-07-27 09:51:38 +02:00
Robin
d2dc2bfde2
add hook product composition
2021-07-27 09:13:50 +02:00
Robin
a386cf5e89
add hook product stat
2021-07-27 09:09:42 +02:00
Florian HENRY
a7f55f4778
fix: Expense report line, on update qty can be decimal
2021-07-26 15:43:57 +02:00
ptibogxiv
54c151916d
Fix for php 8
2021-07-26 15:42:43 +02:00
ptibogxiv
053d72c306
fix for php8
2021-07-26 15:37:36 +02:00
ptibogxiv
3cb56d3ec6
Fix for php8
2021-07-26 15:35:31 +02:00
ptibogxiv
76f0bac703
Fix subscription list
2021-07-26 15:29:46 +02:00
ptibogxiv
f83f02e4e2
Fix for php8
2021-07-26 15:24:58 +02:00
ptibogxiv
36ba5c6a71
Fix for php8
2021-07-26 15:22:50 +02:00
ptibogxiv
dc30052d3e
fix for php 8
2021-07-26 15:07:52 +02:00
stickler-ci
986dc9c857
Fixing style errors.
2021-07-26 13:06:42 +00:00
ptibogxiv
4fa72f7dfe
fix for php8
2021-07-26 15:04:43 +02:00
ptibogxiv
b0e2ef4a6c
Update extrafields_edit.tpl.php
2021-07-26 14:53:18 +02:00
ptibogxiv
026e61f1ec
Update extrafields_edit.tpl.php
2021-07-26 14:53:06 +02:00
ptibogxiv
d443485939
Update extrafields_edit.tpl.php
2021-07-26 14:52:24 +02:00
ptibogxiv
a181469ff8
Update type.php
2021-07-26 14:34:45 +02:00
ptibogxiv
cfdcad0077
Update type.php
2021-07-26 14:30:38 +02:00
ptibogxiv
a08b63d561
Fix for php 8
2021-07-26 14:29:42 +02:00
lmarcouiller
b5dde982d5
Fix #18185 : for v13
2021-07-26 10:32:51 +02:00
Florian HENRY
a7cef1aa15
FIX: cannot add time spend when column ref is not displayed
2021-07-26 10:20:11 +02:00
jpb
b4199d8945
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-26 09:15:49 +02:00
jpb
8dc316797f
move info to the left
2021-07-26 09:15:23 +02:00
Alexandre SPANGARO
35862cebfa
Fix card presentation
2021-07-26 04:49:56 +02:00
Alexandre SPANGARO
183d413b45
FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger
2021-07-26 04:42:35 +02:00
Alexandre SPANGARO
bbd84fd13e
FIX: Missing column Date validation in ledger & subledger
2021-07-26 04:08:05 +02:00
Laurent Destailleur
079b014b14
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e
Fix #yogosha6704
2021-07-26 00:37:47 +02:00
Alexandre SPANGARO
84e5773de8
FIX: Accountancy - Search date on journal
2021-07-25 22:37:20 +02:00
Alexandre SPANGARO
5453e3b3b2
Security
2021-07-25 08:35:03 +02:00
stickler-ci
5524320fbc
Fixing style errors.
2021-07-23 17:46:44 +00:00
Florian HENRY
e93a362a0d
fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm
2021-07-23 18:33:18 +02:00
UT from dolibit
8920590e28
Update llx_00_c_country.sql
...
Singapour --> Singapore
Iles Aland --> Åland Island
Samoa américaines --> American Samoa
Antarctique --> Antarctica
Antigua-et-Barbuda --> Antigua and Barbuda
Azerbaïdjan --> Azerbaijan
2021-07-23 12:48:25 +02:00
UT from dolibit
38b34b1f19
Update llx_20_c_departements.sql
...
Panama
2021-07-23 12:25:59 +02:00
Laurent Destailleur
4c505619e3
FIX look and field v14
2021-07-23 00:02:14 +02:00
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension
...
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
2021-07-22 18:38:22 +02:00
Frédéric FRANCE
44fa70c7c7
notify class indent
2021-07-22 09:24:14 +02:00
Frédéric FRANCE
5e6c942caf
notify class indent
2021-07-22 09:22:42 +02:00
Florian HENRY
8eafbf9101
add column into export invoice
2021-07-21 17:00:57 +02:00
Florian HENRY
ee1e6c2780
fix: bad setEventMessages input
2021-07-21 14:52:37 +02:00
stickler-ci
252765303e
Fixing style errors.
2021-07-21 07:48:57 +00:00
jpb
0396573b91
fix focusout on mandatoryPeriod only
2021-07-21 09:46:38 +02:00
jpb
2189af1f2a
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-21 08:57:09 +02:00
jpb
62d007e232
add focusout constraint
2021-07-21 08:56:40 +02:00
Frédéric FRANCE
f2dc3be051
add categories tickets migration
2021-07-21 08:40:07 +02:00
stickler-ci
c93e2cda0d
Fixing style errors.
2021-07-21 06:31:07 +00:00
jpb
7f6e4886fc
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-21 08:28:49 +02:00
jpb
32f9b1a556
fix cmd fourn no msg
2021-07-21 08:26:41 +02:00
Laurent Destailleur
062c39c40d
Fix html entities when we should not
2021-07-21 01:40:45 +02:00
Laurent Destailleur
afa6ced6c9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2021-07-21 01:29:22 +02:00
Laurent Destailleur
23f708c0d4
Fix phpcs
2021-07-21 01:27:14 +02:00
Laurent Destailleur
dbed6bc0da
Fix #yogosha6678
2021-07-21 01:18:48 +02:00
Laurent Destailleur
e02fbadcd7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2021-07-21 00:41:40 +02:00
Laurent Destailleur
e4bb5ed008
Fix phpcs
2021-07-21 00:35:08 +02:00
Laurent Destailleur
c2f1781fae
Fix #huntr5bb5a52-3b1c-40ad-9c64-61735f886736
2021-07-21 00:14:03 +02:00
Laurent Destailleur
219a2a860b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/main.inc.php
2021-07-20 23:59:33 +02:00
Laurent Destailleur
dc7ff07517
Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037
2021-07-20 23:54:22 +02:00
Laurent Destailleur
08e06f9789
Fix #hunter2c606116-f212-49e0-967c-11f8666be43b
2021-07-20 23:28:57 +02:00
Laurent Destailleur
2383fd02c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-20 23:20:22 +02:00
Laurent Destailleur
0e18bd4be1
Fix #hunter2cd3fc73-65a1-4615-9143-9e7febd81a15
2021-07-20 23:15:31 +02:00
Laurent Destailleur
e25171b9f5
Fix phpcs
2021-07-20 23:03:19 +02:00
Laurent Destailleur
b57eb8284e
Fix Improper Authorization Check reported by Ahsan Aziz.
2021-07-20 22:42:23 +02:00
stickler-ci
191163c7e7
Fixing style errors.
2021-07-20 20:41:49 +00:00
jpb
d61b831737
add field in create product
2021-07-20 22:39:30 +02:00
Laurent Destailleur
cea35bd208
Fix pass was lost on error
2021-07-20 22:14:11 +02:00
Frédéric FRANCE
828e65c724
Update html.form.class.php
2021-07-20 20:56:01 +02:00
Frédéric FRANCE
71b95f3511
fix php8 warnings
2021-07-20 20:54:27 +02:00
Givriz
3df4cd8857
Compatibility phpv8
2021-07-20 20:28:04 +02:00
Frédéric FRANCE
922354f366
Update projects.php
2021-07-20 18:19:27 +02:00
jpb
875167d593
add escape to sql
2021-07-20 16:17:17 +02:00
ksar
4d6b63dbed
FIX #18181
...
FIX #18181
2021-07-20 16:14:47 +02:00
jpb
953e311509
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-20 16:04:54 +02:00
jpb
f16eba1811
quick fix create product
2021-07-20 16:04:12 +02:00
stickler-ci
2f0ba41a53
Fixing style errors.
2021-07-20 13:35:10 +00:00
jpb
dc90a62d90
add tooltips helper on product card
2021-07-20 15:18:14 +02:00
lmarcouiller
60f0eeaea2
update inventory to be jquerry
2021-07-20 15:06:33 +02:00
jpb
1237c5ba55
add msg to formconfirm on propal invoice and commande
2021-07-20 14:46:56 +02:00
lmarcouiller
dd9eb28230
Barcode scanner tool update
2021-07-20 14:43:36 +02:00
jpb
367e839239
change class css and behavior js
2021-07-20 13:56:30 +02:00
jpb
e11afb7da0
add color on date dield and warning on line
2021-07-20 11:23:35 +02:00
Josep Lluís
20f347cd4c
Add missing line product variables
...
Add missing line product variables: product_tobatch and product_barcode
2021-07-20 07:07:01 +02:00
BENKE Charlene
98a2c35ab5
PHP V8 warning error, use of not declared array
2021-07-19 17:51:06 +02:00
atm-florian
8fdd9deb16
FIX: datepickers cloned using jquery are not working
2021-07-19 14:06:56 +02:00
jpb
97287af987
add field to object product, add sql
2021-07-19 14:03:03 +02:00
BENKE Charlene
acdac32845
FIX : "disabled" field missing on definition
2021-07-19 13:46:50 +02:00
lmarcouiller
b309af0ab8
First push new scan quanty inventory
2021-07-19 13:43:48 +02:00
BENKE Charlene
09954a3047
Update html.formcompany.class.php
2021-07-19 11:01:06 +02:00
BENKE Charlene
49a74c2b3b
Update index.php
2021-07-19 10:42:11 +02:00
BENKE Charlene
29bdbe02f2
Update index.php
2021-07-19 10:21:18 +02:00
BENKE Charlene
1a23cfc6f9
Update list.php
2021-07-19 10:01:11 +02:00
BENKE Charlene
4eeaac5ee7
warning error on PHP 8
2021-07-19 09:45:47 +02:00
trekmorris
284627b693
Update opensurvey.lang manually
...
This file is not auto sync from transifex . So update it manually .
2021-07-16 23:55:29 +08:00
lmarcouiller
1fb99a3185
Update to match eldy changes
2021-07-16 15:47:17 +02:00
Laurent Destailleur
c0d54fe608
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:03:52 +02:00
Laurent Destailleur
0ccc2d9033
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:01:11 +02:00
Laurent Destailleur
af1c43c70d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/modBarcode.class.php
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
2021-07-16 14:05:42 +02:00
Laurent Destailleur
2fc8a80070
Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
...
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Laurent Destailleur
f7ed6c8a0b
Merge pull request #18129 from evarisk-theo/add-ticket-categories-views
...
NEW: ticket categories views
2021-07-16 12:46:14 +02:00
Laurent Destailleur
501bc853af
Fix default value
2021-07-16 12:44:15 +02:00
Laurent Destailleur
34c31492cf
Merge pull request #18161 from FHenry/13_fix_barecode_externaluser
...
fix: print barcode sould not be available for external user #18160
2021-07-16 12:38:32 +02:00
Marc de Lima Lucio
4d6372dda1
FIX: holiday balances: revert part of commit 1e7df0ba9 to still increment on page visit
2021-07-16 12:10:25 +02:00
Florian HENRY
c928de89c6
fix: print barcode sould not be available for external user
2021-07-16 10:41:06 +02:00
stickler-ci
2fd520cadc
Fixing style errors.
2021-07-16 08:15:36 +00:00
lmarcouiller
cad84b1e0b
Update language support knowledge record
2021-07-16 10:10:59 +02:00
Florian Mortgat
180527d23a
FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE
2021-07-16 10:10:57 +02:00
lmarcouiller
f68f98cbdd
New : language support for knowledgemanagement module
2021-07-16 09:59:15 +02:00
Laurent Destailleur
ce27feda84
Debug v14
...
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
1e93a3f8f4
More log on imap card
2021-07-15 22:32:29 +02:00
Laurent Destailleur
0aeeb62628
More log on imap card
2021-07-15 22:29:03 +02:00
Laurent Destailleur
9aad07f20c
Remove log
2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7
Fix css
2021-07-15 16:35:06 +02:00
Laurent Destailleur
83d931f3c7
FIX #18143
2021-07-14 17:40:36 +02:00
Laurent Destailleur
901a158238
Fix backward compatibility
2021-07-14 17:19:43 +02:00
Laurent Destailleur
fb8ecf10d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-14 14:49:30 +02:00
Laurent Destailleur
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
a773652c04
Fix phpcs
2021-07-14 14:37:07 +02:00
Laurent Destailleur
b552c6b4fe
Fix status color
2021-07-14 14:32:05 +02:00
Laurent Destailleur
ddf067e9de
Merge pull request #17801 from nicolas-eoxia/fix_process_payment_with_online_link_order
...
NEW : Auto create invoice for payment done on an order with online payment link of order
2021-07-14 14:05:13 +02:00
Laurent Destailleur
b2425c2a9d
Update paymentok.php
2021-07-14 14:04:44 +02:00
Laurent Destailleur
c818e39374
Merge pull request #18149 from defrance/patch-168
...
add interventional drafts on commercial index
2021-07-14 13:59:07 +02:00
Laurent Destailleur
0fd980b005
Update index.php
2021-07-14 13:57:17 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio
...
fix showInputField checkbox and radio type
2021-07-14 13:55:53 +02:00
Laurent Destailleur
a88ab8e443
Merge pull request #18147 from atm-john/fix_dialog_btn
...
Fix : dialog BTN and add doc
2021-07-14 13:53:41 +02:00
Laurent Destailleur
21f295565a
Merge pull request #18144 from Hystepik/develop#1
...
Fix : remove of a button which was forgotten
2021-07-14 13:50:42 +02:00
BENKE Charlene
7406f2cc85
a interventional drafts on commercial index
2021-07-14 12:55:33 +02:00
Alexis LAURIER
cd5e1d603e
fix showInputField checkbox and radio type
2021-07-14 12:02:03 +02:00
ATM john
87c26ae0e2
Add php doc
2021-07-14 10:07:03 +02:00
Laurent Destailleur
724d00fc6c
Fix phpcs
2021-07-14 02:20:15 +02:00
ATM john
1a330e0b88
Fix dialog BTN and add doc
2021-07-14 00:02:55 +02:00
Gauthier PC portable 024
0fe46b53d8
FIX : method_exists needs object at first param
2021-07-13 15:18:40 +02:00
lmarcouiller
9a12b5e424
Fix : remove of a button which was forgotten
2021-07-13 15:17:01 +02:00
Laurent Destailleur
ba8d60f4d4
FIX amount of payment deleted in unalterable log (for old record must
...
look the log of creation to know amount).
2021-07-13 14:48:05 +02:00
Laurent Destailleur
b12aae4a99
FIX amount of payment deleted in unalterable log (for old record must
...
look the log of creation to know amount).
2021-07-13 14:26:32 +02:00
Laurent Destailleur
0d9cf07035
Show ref of invoice into tooltip
2021-07-13 14:07:35 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-13 14:04:14 +02:00
Théo David
66f38d0012
fix: rename select_tickets_list into selectTicketsList
2021-07-13 14:00:16 +02:00
Laurent Destailleur
af99cab839
CSS
2021-07-13 13:46:20 +02:00
Laurent Destailleur
e755d68b06
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe
Fix #18142
2021-07-13 13:10:19 +02:00
Laurent Destailleur
4c29a3ad99
Fix migration
2021-07-13 13:06:28 +02:00
Laurent Destailleur
bbce0f9c1b
Update html.form.class.php
2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1
...
Fix #18110 : update of formticket.class.php
2021-07-13 11:48:36 +02:00
Laurent Destailleur
df3d88570c
Fix missing column in migration
2021-07-13 11:39:08 +02:00
stickler-ci
85adefe721
Fixing style errors.
2021-07-13 08:08:01 +00:00
lmarcouiller
35b29481c7
Close #18131 : new massaction for thirdparty
2021-07-13 10:05:38 +02:00
Laurent Destailleur
f9d60b15d9
Fix phpcs
2021-07-12 23:56:42 +02:00
Laurent Destailleur
202ee8340a
FIX #18091
2021-07-12 23:01:34 +02:00
Christophe Battarel
a15d895b4b
fix badge status bgcolor
2021-07-12 17:00:42 +02:00
Laurent Destailleur
d3f324c2d4
Try a better fix for #18105
2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c
Fixing style errors.
2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c
Fix #18110 : update of formticket.class.php
2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4
fix: remove phpcs:enable tag
2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34
fix: rename select_tickets into selectTickets
2021-07-12 14:17:30 +02:00
Théo David
d8db447112
fix: rename select_tickets into selectTickets
2021-07-12 14:12:20 +02:00
Christophe Battarel
91d27a556c
fix badge status bgcolor
2021-07-12 14:09:16 +02:00
Laurent Destailleur
6f4090f567
Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model
...
add: ticket categories data model
2021-07-12 13:19:47 +02:00
John BOTELLA
deb9a374f3
Fix ui event badge status
2021-07-12 12:28:21 +02:00
Laurent Destailleur
7533c9e3a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
Laurent Destailleur
0cde1cfc38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-12 11:56:13 +02:00
Laurent Destailleur
977600e3a5
v15
2021-07-12 11:55:30 +02:00
Laurent Destailleur
ac1999f59d
FIX #18130
2021-07-12 11:08:32 +02:00
Laurent Destailleur
5319e1d266
Fix help
2021-07-12 10:56:01 +02:00
Laurent Destailleur
e989284f14
Fix setup help
2021-07-12 10:50:37 +02:00
Laurent Destailleur
aa8fc6ba83
css
2021-07-12 10:45:18 +02:00
Laurent Destailleur
aece3844c6
Fix better error message if password is empty
2021-07-12 10:35:25 +02:00
David
642d84a844
fix: code syntax
2021-07-12 09:26:18 +02:00
stickler-ci
ce9bd51cb2
Fixing style errors.
2021-07-12 07:17:08 +00:00
evarisk-theo
3bc2dec696
Merge branch 'Dolibarr:develop' into add-ticket-categories-views
2021-07-12 09:10:25 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-12 09:10:15 +02:00
evarisk-theo
8496c9e57f
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model
2021-07-12 09:09:53 +02:00
Laurent Destailleur
4b2bbd0364
Sync transifex
2021-07-11 20:27:03 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
...
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
Laurent Destailleur
c9242d83ab
Clean code
2021-07-11 20:16:47 +02:00
Laurent Destailleur
fb13746644
Merge pull request #18019 from ATM-Consulting/NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
...
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
2021-07-11 20:15:29 +02:00
Laurent Destailleur
aeeb480f26
Fix v14
2021-07-11 20:04:16 +02:00
Laurent Destailleur
41016039b6
Fix missing very old table
2021-07-11 19:39:18 +02:00
Laurent Destailleur
ab030936c3
Fix missing commit on tables
2021-07-11 19:15:16 +02:00
Laurent Destailleur
032b44996c
Debug v14
2021-07-11 19:09:51 +02:00
Laurent Destailleur
802ac58f9a
Clean v14
2021-07-11 18:56:15 +02:00
ATM john
7ad1738944
Fix setError
2021-07-11 15:58:34 +02:00
ATM john
19ab5ce420
Fix comments
2021-07-11 14:13:24 +02:00
ATM john
dc3f960ce8
Add validate to module builder
2021-07-11 14:05:26 +02:00
ATM john
a9a7315ce1
WIP - create validation method for common object
2021-07-11 13:30:30 +02:00
stickler-ci
986e86e6ae
Fixing style errors.
2021-07-11 07:57:19 +00:00
fr69400
4d12c6eff6
Update recruitmentjobposition_note.php
2021-07-11 09:57:04 +02:00
stickler-ci
9ec1e7d50e
Fixing style errors.
2021-07-11 07:55:48 +00:00
fr69400
e43da11ac8
Update workstation_note.php
2021-07-11 09:55:33 +02:00
fr69400
931d939d74
Update note.php
2021-07-11 09:55:18 +02:00
stickler-ci
8d75d37cad
Fixing style errors.
2021-07-11 07:54:50 +00:00
fr69400
d5c8243a12
Update note.php
2021-07-11 09:54:35 +02:00
stickler-ci
b5606e3181
Fixing style errors.
2021-07-11 07:54:28 +00:00
fr69400
7e4cf44ed3
Update note.php
2021-07-11 09:54:13 +02:00
stickler-ci
8bf504d7f3
Fixing style errors.
2021-07-11 07:54:10 +00:00
fr69400
d35719b939
Update recruitmentcandidature_note.php
2021-07-11 09:53:57 +02:00
stickler-ci
e617f9ca38
Fixing style errors.
2021-07-11 07:53:53 +00:00
fr69400
f3ebbbbbc0
Update note.php
2021-07-11 09:53:38 +02:00
stickler-ci
b227a85d31
Fixing style errors.
2021-07-11 07:53:28 +00:00
fr69400
209fe70da0
Update note.php
2021-07-11 09:53:13 +02:00
stickler-ci
2d6efd2d4c
Fixing style errors.
2021-07-11 07:53:01 +00:00
fr69400
eb6284e152
Update mo_note.php
2021-07-11 09:52:46 +02:00
stickler-ci
21e5d067e2
Fixing style errors.
2021-07-11 07:52:16 +00:00
fr69400
9a6cafb3c5
Update note.php
2021-07-11 09:52:01 +02:00
stickler-ci
2a1eb97b7d
Fixing style errors.
2021-07-11 07:50:57 +00:00
fr69400
2e4b45488f
Update note.php
2021-07-11 09:50:42 +02:00
stickler-ci
c6fb975d51
Fixing style errors.
2021-07-11 07:50:38 +00:00
fr69400
1b2f0fc155
Update note.php
2021-07-11 09:50:24 +02:00
stickler-ci
6810391a6a
Fixing style errors.
2021-07-11 07:50:20 +00:00
fr69400
aeba1dd2b2
Update partnership_note.php
2021-07-11 09:50:06 +02:00
stickler-ci
21e213507f
Fixing style errors.
2021-07-11 07:49:56 +00:00
fr69400
35c0008fa0
Update myobject_note.php
2021-07-11 09:49:42 +02:00
stickler-ci
efbf9db105
Fixing style errors.
2021-07-11 07:49:39 +00:00
fr69400
29e0ce787f
Update note.php
2021-07-11 09:49:24 +02:00
stickler-ci
789cea9a85
Fixing style errors.
2021-07-11 07:49:05 +00:00
fr69400
7f18bdf85b
Update knowledgerecord_note.php
2021-07-11 09:48:50 +02:00
fr69400
ce4cab04d4
Update note.php
2021-07-11 09:48:33 +02:00
stickler-ci
48846888cc
Fixing style errors.
2021-07-11 07:48:30 +00:00
fr69400
beaee09c98
Update note.php
2021-07-11 09:48:15 +02:00
fr69400
b91f5ad500
Update note.php
2021-07-11 09:47:58 +02:00
stickler-ci
d22ed4be82
Fixing style errors.
2021-07-11 07:47:50 +00:00
fr69400
ce9cf63c36
Update note.php
2021-07-11 09:47:36 +02:00
stickler-ci
84493fb55d
Fixing style errors.
2021-07-11 07:47:32 +00:00
fr69400
cd55445905
Update note.php
2021-07-11 09:47:17 +02:00
stickler-ci
fdaf29fd65
Fixing style errors.
2021-07-11 07:47:08 +00:00
fr69400
2eb10c40b2
Update conferenceorboothattendee_note.php
2021-07-11 09:46:52 +02:00
stickler-ci
a8752bf097
Fixing style errors.
2021-07-11 07:46:34 +00:00
fr69400
556c2c7e5a
Update note.php
2021-07-11 09:46:15 +02:00
fr69400
d485d9d2fd
Update note.php
2021-07-11 09:45:59 +02:00
fr69400
c7ad0a59c9
Update note.php
2021-07-11 09:45:38 +02:00
fr69400
a27b0cd797
Update note.php
2021-07-11 09:45:22 +02:00
stickler-ci
cc4defd212
Fixing style errors.
2021-07-11 07:44:41 +00:00
fr69400
bf03a30a9f
Update note.php
2021-07-11 09:44:18 +02:00
fr69400
dafd0fb4b0
Update bom_note.php
2021-07-11 09:44:01 +02:00
stickler-ci
698f6db72e
Fixing style errors.
2021-07-11 07:43:34 +00:00
fr69400
b8fd4394a1
Update note.php
2021-07-11 09:43:08 +02:00
stickler-ci
c7e6f66823
Fixing style errors.
2021-07-11 07:43:02 +00:00
fr69400
5ec903723d
Update note.php
2021-07-11 09:42:35 +02:00
Laurent Destailleur
e1e410ce91
Fix error message if file corrupted
2021-07-11 03:04:06 +02:00
Laurent Destailleur
93083e39c7
Fix using zip for integrity file
2021-07-11 02:58:18 +02:00
Laurent Destailleur
25d6f1a7c8
More complete exemple.
2021-07-11 01:58:37 +02:00
Laurent Destailleur
f18269bee1
Comment
2021-07-11 01:42:07 +02:00
Laurent Destailleur
bffbf4ae63
Merge pull request #18123 from OPEN-DSI/fix_00011
...
FIX get categories linked to another object type
2021-07-11 01:37:37 +02:00
Laurent Destailleur
070a23f455
Merge pull request #18121 from OPEN-DSI/fix_00010
...
Fix hook constructCategory when several new categories is added by several modules
2021-07-11 01:22:14 +02:00
Laurent Destailleur
e7b3280c17
Debug v14 with nojs
2021-07-11 01:12:52 +02:00
Laurent Destailleur
2091120d77
FIX #18122
2021-07-11 00:50:57 +02:00
Laurent Destailleur
97ac547fe2
Fix/debug the numbering module to autocalculate a new lot.
2021-07-11 00:44:36 +02:00
Laurent Destailleur
64bd4ef784
Fix component to select ticket groups
2021-07-10 20:09:51 +02:00
Laurent Destailleur
339fa6fbe3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-10 09:44:22 +02:00
Laurent Destailleur
f65aa6024f
Add replace into forbidden sql in read-only mode
2021-07-10 09:42:20 +02:00
Laurent Destailleur
3fadd5cda5
NEW Add $dolibarr_main_db_readonly in conf.php for readonly access.
2021-07-09 19:37:12 +02:00
Laurent Destailleur
9e9af8548d
Responsive
2021-07-09 18:47:34 +02:00
stickler-ci
4272f93aa4
Fixing style errors.
2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d
NEW add hookmanager on note pages
2021-07-09 18:36:21 +02:00
kamel
073ace3a9e
FIX get categories linked to another object type
2021-07-09 16:23:46 +02:00
kamel
ec6fadf196
Fix hook constructCategory when several new categories is added by several modules
2021-07-09 15:29:39 +02:00
Laurent Destailleur
af8c973050
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef
Fix date for planned entries
2021-07-09 13:33:37 +02:00
Laurent Destailleur
2bef8a27c8
Trans
2021-07-09 12:34:51 +02:00
Laurent Destailleur
823d360202
Fix reposition
2021-07-09 12:15:43 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option
...
New : Add js confirm modal option to BTN created with dolGetButtonAction
2021-07-09 10:09:08 +02:00
Florian Mortgat
924cff44f3
FIX PR feedback: in addFileIntoDatabaseIndex, return error if $object is set with an ID but without a table_element
2021-07-09 09:16:27 +02:00
Florian Mortgat
407f314498
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-07-09 09:11:11 +02:00
Laurent Destailleur
d9475b8b2b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 23:46:35 +02:00
Laurent Destailleur
05953d61e4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-08 23:45:50 +02:00
Laurent Destailleur
463fadb776
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Laurent Destailleur
5b6358d938
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-08 23:43:19 +02:00
Laurent Destailleur
fb9d16a84a
Merge pull request #18109 from altairisfr/lot_sn_masks
...
FIX : don't display custom masks if they are not used
2021-07-08 23:42:48 +02:00
Laurent Destailleur
2314c5dda2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-08 23:41:16 +02:00
Laurent Destailleur
aa9d98a336
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:19:43 +02:00
ATM john
c2ce8e3c9d
Fix comment
2021-07-08 22:29:41 +02:00
Laurent Destailleur
7d6b70f679
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 22:26:58 +02:00
Laurent Destailleur
4e69afb253
Merge pull request #18119 from aspangaro/14p4
...
Update product/card.php
2021-07-08 22:26:18 +02:00
Alexandre SPANGARO
f4005cd7a7
Update product/card.php
2021-07-08 22:24:20 +02:00
Laurent Destailleur
9512865896
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 22:18:11 +02:00
Laurent Destailleur
a916f668f9
Fix param of include js
2021-07-08 22:16:47 +02:00
Alexandre SPANGARO
be62c2f7f4
FIX Problem of z-index with popup and top menu
2021-07-08 22:11:41 +02:00
Laurent Destailleur
8f534b2c20
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 22:01:25 +02:00
Laurent Destailleur
6539961d58
Update card.php
2021-07-08 21:59:20 +02:00
Laurent Destailleur
5c8ac0cb9d
Update card.php
2021-07-08 21:59:12 +02:00
Alexandre SPANGARO
d6be380816
FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY
2021-07-08 21:58:54 +02:00
Alexandre SPANGARO
cd215cda17
FIX Accountancy - if we define a date start, automatic binding try to solve old binding
2021-07-08 21:49:53 +02:00
Laurent Destailleur
12b1f5b23b
Fix sql
2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 20:59:48 +02:00
Laurent Destailleur
ddc37ef38c
Fix missing lang param
2021-07-08 20:58:19 +02:00
Laurent Destailleur
ec4533142a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-08 18:16:02 +02:00
Laurent Destailleur
1209253d57
Sanitize data
2021-07-08 18:12:15 +02:00
Laurent Destailleur
c3bf4f4b7f
Merge pull request #18113 from aspangaro/13p10
...
Fix: formconfim if type radio must be :checked to get correct value
2021-07-08 17:35:27 +02:00
Laurent Destailleur
b01468e47a
Merge pull request #18115 from ATM-Consulting/FIX_14.0_version_checker
...
FIX: in kanban view, Dolibarr says "no updates available" even if upd…
2021-07-08 17:34:47 +02:00
Laurent Destailleur
a44d646946
Fix to allow html content
2021-07-08 17:31:41 +02:00
Laurent Destailleur
e83df92359
Trans
2021-07-08 17:25:14 +02:00
Laurent Destailleur
ec09d95dc6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 17:24:39 +02:00
Laurent Destailleur
08adb73c6e
Trans
2021-07-08 17:24:05 +02:00
altairis-noe
9983163e7a
a few more getDolGlobalString
2021-07-08 17:21:36 +02:00
Florian Mortgat
38fac48c30
FIX: in kanban view, Dolibarr says "no updates available" even if updates are available
2021-07-08 17:18:47 +02:00
Alexandre SPANGARO
eaa6987e8b
Fix: formconfim if type radio must be :checked to get correct value
2021-07-08 17:15:03 +02:00
altairis-noe
66590ba810
getDolGlobalString instead of $conf->global
2021-07-08 17:10:03 +02:00
Laurent Destailleur
310ebfbe2e
Merge pull request #18089 from atm-jpb/NEW_CMD_LIST_Add_Filter
...
add filter
2021-07-08 16:55:04 +02:00
altairis-noe
68442a2d13
stickler corrections
2021-07-08 16:49:13 +02:00
stickler-ci
327481dc78
Fixing style errors.
2021-07-08 14:47:38 +00:00
jpb
4df29292ab
update comment
2021-07-08 16:44:24 +02:00
jpb
2e44acbc81
update comment
2021-07-08 16:43:05 +02:00
altairis-noe
cbd8fa3572
better element id
2021-07-08 16:42:54 +02:00
Laurent Destailleur
2e33d85b29
Merge pull request #18106 from EpixFr/develop
...
NEW : Adding accounting export model for iSuite Expert
2021-07-08 16:37:11 +02:00
Laurent Destailleur
fe20217bfe
Update accountancyexport.class.php
2021-07-08 16:36:53 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra
...
FIX display of extrafields on shipping lines
2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4
...
14 fix php8 warning on user page
2021-07-08 16:31:25 +02:00
Laurent Destailleur
7870336f2a
Update card.php
2021-07-08 16:31:01 +02:00
Laurent Destailleur
a521a61f6b
Merge pull request #18108 from fappels/14_patch_product_class
...
Remove duplicate code in product class
2021-07-08 16:29:21 +02:00
altairis-noe
4e77a0d16a
don't display custom masks if they are not used
2021-07-08 15:55:07 +02:00
Laurent Destailleur
752b55ac98
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d
Fix type of param
...
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
2021-07-08 13:59:04 +02:00
Francis Appels
d6c327ed85
Remove duplicate code
2021-07-08 13:17:07 +02:00
Laurent Destailleur
1380344fdb
Fix PHP 8
2021-07-08 12:17:32 +02:00
Laurent Destailleur
16ee47b12c
Fix warning.
...
Reduce memory need for getmin/max on large graphs.
2021-07-08 11:13:15 +02:00
Laurent Destailleur
470f683d41
Clean code
2021-07-08 10:38:36 +02:00
Laurent Destailleur
34c7295cbc
Make code more jquery compliant
2021-07-07 21:01:30 +02:00
Laurent Destailleur
4ada220083
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
2021-07-07 19:18:32 +02:00
Laurent Destailleur
2acbdc2c80
Fix avoid error message
2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca
Fix css for field pos/position in dictionary.
...
Conflicts:
htdocs/admin/dict.php
2021-07-07 18:46:11 +02:00
Laurent Destailleur
6cfb3c0e16
Fix css for field pos/position in dictionary.
2021-07-07 18:41:37 +02:00
Laurent Destailleur
9d3f7c5cdd
Support fk_parent into dictionary of ticket categories
2021-07-07 18:30:10 +02:00
stickler-ci
335c3029dc
Fixing style errors.
2021-07-07 15:55:07 +00:00
EpixFr
edfd40719b
Gestion des longueurs des comptes variables
2021-07-07 17:53:10 +02:00
EpixFr
45d36d9134
Ajout export compta iSuite Expert
2021-07-07 17:32:48 +02:00
Francis Appels
a942183127
better fix for optioncss
2021-07-07 15:02:00 +02:00
Francis Appels
0e2c57fe65
Fix php 8 warning on user page
2021-07-07 14:50:10 +02:00
Laurent Destailleur
01e272fb8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-07 14:40:55 +02:00
Laurent Destailleur
2f25079981
Fix CSRF token generation must be fast, can have low entropy.
2021-07-07 14:40:47 +02:00
Laurent Destailleur
d97a95aa2a
Fix CSRF token generation must be fast, can have low entropy.
2021-07-07 14:38:52 +02:00
Christophe Battarel
7e174412b7
FIX display of extrafields on shipping lines
2021-07-07 10:30:01 +02:00
stickler-ci
89ffa85290
Fixing style errors.
2021-07-07 06:40:12 +00:00
jpb
73bfeee4e7
fix comment
2021-07-07 08:37:49 +02:00
jpb
1a919c9f2b
change comment
2021-07-07 08:35:31 +02:00
Laurent Destailleur
34f1cfe575
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/index.php
2021-07-07 02:09:53 +02:00
Laurent Destailleur
3bc896be57
Debug v14
2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911
Fix navigation links
2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7
Fix GETPOST with restricthtml
2021-07-07 01:45:31 +02:00
Laurent Destailleur
9d010f6d10
Look and feel v14
2021-07-07 01:24:40 +02:00
Laurent Destailleur
f050a38c6b
Fix migration
2021-07-07 01:18:28 +02:00
Laurent Destailleur
f286017cab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03
Fix phpcs
2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3
...
Fix php8 warning
2021-07-06 18:52:05 +02:00
Laurent Destailleur
70fa742939
Fix upgrade
2021-07-06 18:40:54 +02:00
Florian Mortgat
9f7be989c2
FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter()
2021-07-06 17:38:37 +02:00
Francis Appels
874bf8ed44
backtopageforcancel can be set but empty
2021-07-06 16:39:58 +02:00
Laurent Destailleur
5444d45e68
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8
Fix phpunit
2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877
Fix function not found
2021-07-06 15:55:43 +02:00
Laurent Destailleur
c23f46af9b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/holiday/class/holiday.class.php
Fix case of newByMonth
2021-07-06 15:35:17 +02:00
Laurent Destailleur
4dd29af555
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-06 15:24:37 +02:00
Laurent Destailleur
a345d38320
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-06 15:24:01 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg
...
new: working on conference or booth object and event type #FoundationFunding
2021-07-06 15:05:09 +02:00
Lenin Rivas
a2288b9039
Update unicode and name of currency
2021-07-06 15:00:19 +02:00
damien clochard
4c5bb786ba
FIX #18085 : Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos
2021-07-06 14:51:53 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1
...
FIX Accountancy - Link from admin
2021-07-06 14:48:26 +02:00
Laurent Destailleur
ab14a07064
Trans
2021-07-06 11:58:05 +02:00
Laurent Destailleur
b4b939e1a9
Fix add migration of export/import profile when field name changes
2021-07-06 11:54:32 +02:00
Laurent Destailleur
7dab4ef571
Debug v14
2021-07-06 11:18:09 +02:00
Laurent Destailleur
9a3d2f13a6
Fix graph per type of expense report
2021-07-06 10:55:23 +02:00
Laurent Destailleur
555f1c719b
Debug v14
2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608
Fix set discount on line in TakePos
2021-07-06 03:53:42 +02:00
Laurent Destailleur
407ad4d84d
Fix bad value
2021-07-06 02:15:52 +02:00
Laurent Destailleur
c901e518a7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4
Debug security page
2021-07-06 02:07:58 +02:00
Laurent Destailleur
3dff7e29cc
Fix #yogosha6567
2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc
Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML
2021-07-06 00:47:43 +02:00
Laurent Destailleur
0b7b9aae79
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2
Merge
2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb
Code comment
2021-07-05 22:52:37 +02:00
Laurent Destailleur
f8eadf6fe1
Fix #yogosha6561
2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085
Code comment
2021-07-05 20:32:05 +02:00
Laurent Destailleur
6a6216898e
Fix unit price of expense report
2021-07-05 19:57:11 +02:00
Laurent Destailleur
8e7508dd9f
Clean code
2021-07-05 19:50:16 +02:00
Laurent Destailleur
a04ed363c7
Look and feel v14
2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146
css
2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 18:47:24 +02:00
Laurent Destailleur
abb1ad6bf0
Fix sql injection
2021-07-05 18:46:27 +02:00
Laurent Destailleur
3ac72fe73c
Fix
2021-07-05 18:19:02 +02:00
Laurent Destailleur
38d272e31a
Better position of fields
2021-07-05 18:16:52 +02:00
Laurent Destailleur
a14c68e996
Fix Hide sensitive key on info page
2021-07-05 18:14:52 +02:00
Laurent Destailleur
65adb16191
Fix increase entrophy of default password generation.
2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839
Fix phpcs
2021-07-05 17:34:25 +02:00
Laurent Destailleur
87f9530272
Fix report by Ahsan Aziz (can reset the password of another user that
...
did not request password reset).
2021-07-05 17:29:10 +02:00
Laurent Destailleur
c0118c7de2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572
Fix phpcs
2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 17:04:38 +02:00
Marc de Lima Lucio
eea90cef56
FIX: holiday: balances not updated correctly with pgsql because of case sensitivity
2021-07-05 16:31:33 +02:00
Laurent Destailleur
8b07e99e05
Fix for ' inserted by CKEditor instead of '
2021-07-05 16:08:47 +02:00
Laurent Destailleur
22c45fe7cc
Trans
2021-07-05 15:44:11 +02:00
Florian HENRY
03f8557aaf
fix template email
2021-07-05 15:36:41 +02:00
Florian HENRY
ca53abcef2
fix email template type
2021-07-05 15:35:05 +02:00
Florian HENRY
dd3c0ac5ab
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b
on goign
2021-07-05 15:17:21 +02:00
Francis Appels
1333ca3660
Fix php 8 warning on not set field keys
2021-07-05 14:51:34 +02:00
Francis Appels
df5878b3d6
Fix php 8 warning in inventory module
2021-07-05 14:45:00 +02:00
Laurent Destailleur
87241c94a3
Code comment
2021-07-05 14:41:40 +02:00
Laurent Destailleur
383c678200
Trans
2021-07-05 14:09:01 +02:00
Francis Appels
5d824899e5
Fix php 8 warning on home page
2021-07-05 13:44:05 +02:00
Laurent Destailleur
d43e043b48
Fix regression when adding a product with multicompany
2021-07-05 12:49:10 +02:00
Laurent Destailleur
2eddc02deb
Fix selection of Autofill description
2021-07-05 11:59:30 +02:00
Laurent Destailleur
b7c86f3aec
Fix ldap
2021-07-05 11:41:55 +02:00
Laurent Destailleur
dfee489e7e
Fix sanitizing entity
2021-07-05 11:33:32 +02:00
stickler-ci
bcb06d5c90
Fixing style errors.
2021-07-05 07:40:44 +00:00
jpb
ad62062cd5
add filter
2021-07-05 08:55:03 +02:00
Alexandre SPANGARO
8bde61c2c6
FIX Accountancy - Link from admin
2021-07-05 06:58:10 +02:00
ATM john
752fe22c68
Add simple auto mode
2021-07-04 23:24:38 +02:00
ATM john
a709cc583f
Add modal option to btn
2021-07-04 22:59:53 +02:00
Laurent Destailleur
f37a62b1d4
CSS v14
2021-07-04 21:40:30 +02:00
Laurent Destailleur
5779a56ae0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e
Look and feel v14
2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee
Fix phpcs v14
2021-07-04 19:23:04 +02:00
