Laurent Destailleur
b740d79f8e
Fix v13
2020-12-17 22:52:42 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c
Ajax combo at a better place (after select)
2020-12-17 21:42:10 +01:00
Laurent Destailleur
c97fcaec87
Better fix select2 bug https://github.com/select2/select2/issues/5832
2020-12-17 21:41:39 +01:00
Laurent Destailleur
b5db5f7474
Better responsive
2020-12-17 21:11:44 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
eed14bd9af
Fix warnings
2020-12-17 17:04:42 +01:00
Laurent Destailleur
73dfa7d44a
Try a better fix for #15770
2020-12-17 14:37:02 +01:00
Laurent Destailleur
768e143188
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-17 14:10:57 +01:00
Laurent Destailleur
b04cc22350
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/prelevement.php
2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-12-17 14:07:24 +01:00
Laurent Destailleur
9cd211a79b
Fix syntax error
2020-12-17 14:06:54 +01:00
Laurent Destailleur
539afb88fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-17 14:06:12 +01:00
Laurent Destailleur
9c37b8b806
Merge branch 'develop' into fix/12.0_missing_project_overview_hook
2020-12-17 14:05:04 +01:00
Laurent Destailleur
842d6f695f
Update element.php
2020-12-17 14:01:42 +01:00
Laurent Destailleur
f6b280c9df
Update project.class.php
2020-12-17 13:57:12 +01:00
Laurent Destailleur
e41898280d
Merge pull request #15774 from aspangaro/13b3
...
Fix module intracommreport
2020-12-17 13:55:02 +01:00
Laurent Destailleur
27542ed8ed
Update prelevement.php
2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php
2020-12-17 13:52:03 +01:00
Laurent Destailleur
97ed5d1fe9
Merge pull request #15771 from frederic34/bookmark
...
Bookmark
2020-12-17 13:49:27 +01:00
Laurent Destailleur
c092c88dd7
Fix warning
2020-12-17 13:48:28 +01:00
Laurent Destailleur
4dbdcd1475
Fix missing the section with last event on a holiday record
2020-12-17 13:42:20 +01:00
Laurent Destailleur
663d52fef1
Fix warning
2020-12-17 12:31:53 +01:00
Laurent Destailleur
2e02f50993
css
2020-12-17 12:29:52 +01:00
Laurent Destailleur
075181a8d5
Look and feel v13
2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608
Fix look and feel v13
2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Haldarys
10ac74162e
Fix PRELEVEMENT_ADDDAYS check
...
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
2020-12-17 10:19:21 +01:00
Laurent Destailleur
36e0f07090
Remove warning
2020-12-17 08:52:39 +01:00
Alexandre SPANGARO
da439ca0c1
Fix module Intracomm - Structure XML
2020-12-17 06:09:42 +01:00
Alexandre SPANGARO
440c9e4840
Fix module Intracomm
2020-12-17 06:02:28 +01:00
Frédéric FRANCE
3b19151c18
bookmark
2020-12-16 20:15:48 +01:00
Frédéric FRANCE
2cc51c1aef
bookmark class doxygen
2020-12-16 20:13:11 +01:00
Laurent Destailleur
b7876f54cf
Fix warning
2020-12-16 19:10:37 +01:00
Laurent Destailleur
5681aeee0f
Fix look and feel v13
2020-12-16 19:05:27 +01:00
Laurent Destailleur
edb02ef05a
Fix ticket
2020-12-16 19:03:19 +01:00
Laurent Destailleur
9c759e91f0
Fix debug management of docs in ticket module
2020-12-16 19:01:26 +01:00
Laurent Destailleur
82710e54a8
Fix get custom odt templates
2020-12-16 18:10:40 +01:00
Laurent Destailleur
21c2fae00c
Fix setup of antivirus
2020-12-16 17:41:18 +01:00
Laurent Destailleur
e4c853b162
Enable module product batch
2020-12-16 17:00:14 +01:00
stickler-ci
e61b71bc93
Fixing style errors.
2020-12-16 15:40:38 +00:00
ATM john
1f29d4f5e8
Add missing hooks
2020-12-16 16:25:30 +01:00
Laurent Destailleur
40ae1808de
Look and fell v13
2020-12-16 16:06:33 +01:00
Laurent Destailleur
1f9c597f26
Fix default fields in list
2020-12-16 15:57:52 +01:00
Laurent Destailleur
e7dda7bb4f
Move help into tooltip help section
2020-12-16 15:46:54 +01:00
Laurent Destailleur
93b9061a71
Merge pull request #15698 from StephaneLesage/export-categories
...
FIX: missing imports/exports of categories
2020-12-16 15:30:00 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1
...
FIX: Accountancy - Quadra export format - Manage negative amount
2020-12-16 15:24:14 +01:00
Laurent Destailleur
ef70bdc307
Merge pull request #15764 from aspangaro/13b3
...
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger + CSS
2020-12-16 15:23:14 +01:00
Laurent Destailleur
eefc74eefc
Merge pull request #15763 from aspangaro/13b2
...
NEW: Accountancy - Introduce FEC "2" format to resolve conflict with some software
2020-12-16 15:21:29 +01:00
Laurent Destailleur
2d841d6b59
Merge pull request #15767 from ninichat/feat/hook_subscription_mail_send
...
New: Add sendMail hook in subscription
2020-12-16 15:18:49 +01:00
Laurent Destailleur
0a38f9e8aa
Fix add missing token
2020-12-16 15:16:23 +01:00
Laurent Destailleur
6f75e24fd7
Fix better error management in migration
2020-12-16 15:10:11 +01:00
Corentin Giroud-Argoud
4df0efa43d
[New] Add sendMail hook in subscription
...
Added sendMail hook in subscription, before a mail is sent to confirm a
subscription. It makes it more flexible for modules to interact with it.
2020-12-16 13:00:34 +01:00
Laurent Destailleur
d781d78c4e
Fix warning
2020-12-16 12:53:31 +01:00
Laurent Destailleur
371a460905
More PHPUnit for movements
2020-12-16 12:26:01 +01:00
Laurent Destailleur
5facd49a6c
Fix warnings
2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7
Fix warning
2020-12-16 11:21:48 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790
Fix warning
2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece
FIX Facture Situation Out : status condition
2020-12-16 10:54:32 +01:00
Laurent Destailleur
1b69b1c2fe
Fix phpcs
2020-12-16 10:39:10 +01:00
Alexandre SPANGARO
b01a9d6cc3
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger
2020-12-16 05:32:36 +01:00
Alexandre SPANGARO
ca40d5e52a
NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software
2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
a03de433be
FIX: Accountancy - Quadra export format - Manage negative amount
2020-12-16 05:03:37 +01:00
Alexandre SPANGARO
ca6b8176e9
Merge remote-tracking branch 'upstream/develop' into 13b1
2020-12-16 04:32:26 +01:00
Laurent Destailleur
69061e422b
Removed warning
2020-12-16 02:44:48 +01:00
Laurent Destailleur
834058a816
Debug api to create a document
2020-12-16 02:33:21 +01:00
Laurent Destailleur
7005c17569
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2020-12-16 00:32:18 +01:00
Laurent Destailleur
ff8831c936
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-16 00:29:10 +01:00
Laurent Destailleur
5fe8c599d2
Fix warning
2020-12-16 00:28:57 +01:00
Laurent Destailleur
17bd362d3c
Merge pull request #15760 from FHenry/fix_duplicate_customersupliercode
...
Fix duplicate customersupliercode
2020-12-16 00:24:16 +01:00
stickler-ci
9ca2e98a66
Fixing style errors.
2020-12-15 21:12:52 +00:00
Florian HENRY
b80bd8d1f8
FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed
2020-12-15 22:03:15 +01:00
Florian HENRY
7a93c11ae0
FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed
2020-12-15 22:01:33 +01:00
Stephane Lesage
7853e77d3f
Export/Import categories missing fields and clean
2020-12-15 19:53:47 +01:00
Laurent Destailleur
9d31780155
Merge pull request #15750 from frederic34/intracomm
...
Expérimental module intracom
2020-12-15 18:45:07 +01:00
Laurent Destailleur
37fe5bb3ef
Solve blocking feature. Can increase stock of a Kit without changing
...
subproduct stock.
2020-12-15 15:18:01 +01:00
Laurent Destailleur
1f6f4742d5
Trans
2020-12-15 14:01:25 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type
...
Direct edition of type of company in card
2020-12-15 13:54:06 +01:00
Laurent Destailleur
4856cdb45c
Merge pull request #15752 from davidNDU/develop
...
Module builder made module needs this fix
2020-12-15 13:47:36 +01:00
Laurent Destailleur
479e742d0c
FIX #15753
2020-12-15 13:46:13 +01:00
Laurent Destailleur
cee63335a2
FIX #15754 Mor complete PR
2020-12-15 13:38:21 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
ATM john
50b27239a7
Fix missing hook for project overview control
2020-12-15 11:34:04 +01:00
Laurent Destailleur
2ae1aac5a4
Fix setup
2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21
Fix setup was not clear
2020-12-15 11:10:35 +01:00
Laurent Destailleur
32741dd6f6
Fix warning
2020-12-15 10:51:35 +01:00
Laurent Destailleur
f2a4f880ca
Fix warning
2020-12-15 10:49:07 +01:00
Laurent Destailleur
1624b8636f
Show timeone
2020-12-15 10:43:19 +01:00
Alexandre SPANGARO
5ec7b01fb4
FIX: Link to subaccount ledger
2020-12-15 09:34:46 +01:00
zuiko
943f1022c0
Update fournisseurs.php
...
Product: purchase price tab, the supplier price table with its list of products is not "responsive", as a result, the right-clickable areas, including the "Add purchase price" button, disappear to the right of the screens that are not full HD which forces the user to drag his window with the mouse.
The solution is to change the CSS class of the table to adopt the CSS class of the equivalent table of the selling price tab, which is "responsive" to it.
We therefore replace :
print '<table class="centpercent list">';
by :
print '<table class="noborder centpercent">';
Knowing that the class is used in 24 files, there might be other places where this class poses the same ergonomic problem. I don't know enough Dolibarr to generalize the correction ...
2020-12-15 09:26:27 +01:00
Laurent Destailleur
506659a9d2
Update jsGant lib to 2.7.3
2020-12-15 03:56:08 +01:00
Laurent Destailleur
d3ba87b09a
Better gantt
2020-12-15 02:32:56 +01:00
Laurent Destailleur
de37c0bff0
Fix Warning
2020-12-15 01:59:18 +01:00
Laurent Destailleur
a64f30d23e
Fix message
2020-12-15 00:16:58 +01:00
Laurent Destailleur
55deccf364
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-14 23:20:21 +01:00
David Bensel
81d47d7460
action=confirm_deleteline ... method_exists has object as first parameter
2020-12-14 23:17:58 +03:00
Laurent Destailleur
66e4de628c
Fix permissions
2020-12-14 20:38:22 +01:00
Laurent Destailleur
098f51413f
Fix translation
2020-12-14 20:33:27 +01:00
Laurent Destailleur
2d343ab016
Fix
2020-12-14 20:01:17 +01:00
Laurent Destailleur
9595504b56
Fix graph
2020-12-14 19:57:59 +01:00
Laurent Destailleur
5f9b53004b
Fix warning
2020-12-14 17:40:40 +01:00
Laurent Destailleur
d9886044a6
Trans
2020-12-14 15:10:31 +01:00
Laurent Destailleur
8114e86cf9
Fix phpcs
2020-12-14 13:40:30 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
e612f53494
Fix warning
2020-12-14 13:01:25 +01:00
Laurent Destailleur
107e58403a
Fix position of captcha
2020-12-14 12:54:54 +01:00
Laurent Destailleur
43bb5554d7
Clean deprecated page
2020-12-14 12:19:24 +01:00
Laurent Destailleur
d4167fb06c
Fix link
2020-12-14 11:35:45 +01:00
Laurent Destailleur
e1e8d76eb9
Fix bad filter
2020-12-14 11:30:39 +01:00
Laurent Destailleur
07cf81be17
Fix search and navigation
2020-12-14 11:28:18 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
Laurent Destailleur
ae5da8d55c
Fix label
2020-12-14 10:25:31 +01:00
stickler-ci
d32d3060cc
Fixing style errors.
2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd
companycard-directedit-typent
2020-12-14 10:14:31 +01:00
Frédéric FRANCE
44d3bc2e64
add work
2020-12-14 08:39:08 +01:00
Laurent Destailleur
d739fa1951
Fix log
2020-12-13 18:32:55 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
56c32e3c81
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-13 15:07:33 +01:00
Laurent Destailleur
4f79fdb4ab
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-12-13 15:06:54 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Alexandre SPANGARO
35b3d4f40a
FIX: Export FEC - Force Carriage Return Line Feed
2020-12-13 14:11:04 +01:00
Laurent Destailleur
427fb16256
Fix warning
2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-13 13:02:59 +01:00
Laurent Destailleur
5778b1f022
Merge pull request #15744 from frederic34/mycompanysocialnetworks
...
my company social networks
2020-12-13 12:54:22 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels
...
Fix & sync import/export entity icons/labels translation
2020-12-13 12:50:30 +01:00
Laurent Destailleur
de2531929e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-13 12:39:16 +01:00
Laurent Destailleur
8a0d3e3f6f
Fix warning
2020-12-13 12:38:47 +01:00
Frédéric FRANCE
2a9d38575d
add work
2020-12-13 10:51:12 +01:00
Frédéric FRANCE
203fc77e9f
clean
2020-12-13 10:33:59 +01:00
Frédéric FRANCE
4c09e14c49
fix sql error
2020-12-13 10:32:23 +01:00
Frédéric FRANCE
346fe8ae85
clean
2020-12-12 22:35:51 +01:00
Frédéric FRANCE
6c3a9cbc40
clean
2020-12-12 21:27:56 +01:00
Frédéric FRANCE
1b75ac9ffe
add github
2020-12-12 21:17:18 +01:00
Frédéric FRANCE
8aaa1905a0
create url from socialid
2020-12-12 21:03:27 +01:00
Frédéric FRANCE
cd87ee8f92
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks
2020-12-12 20:43:33 +01:00
Juanjo Menent
4fc57d096e
Fix #15556
2020-12-12 20:37:00 +01:00
Laurent Destailleur
681dc88188
Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook
...
NEW add doAction hook in passwordforgotten page
2020-12-12 19:51:38 +01:00
Laurent Destailleur
3521a736fc
Fix warnings
2020-12-12 19:49:13 +01:00
Frédéric FRANCE
758763f489
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks
2020-12-12 19:25:15 +01:00
Frédéric FRANCE
6a4990d5bd
clean
2020-12-12 19:21:40 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks
...
Mycompany social networks separate tab
2020-12-12 19:21:29 +01:00
Laurent Destailleur
a5d2e04dea
Debug v13
2020-12-12 19:09:07 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8
...
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Laurent Destailleur
f56a38ab23
Merge pull request #15736 from frederic34/api_mos
...
Close #15683 fix mos api update
2020-12-12 18:43:07 +01:00
Laurent Destailleur
96c1429713
Merge pull request #15741 from frederic34/socialnetworkslink
...
Socialnetworkslink
2020-12-12 18:42:00 +01:00
Laurent Destailleur
fa05982a8b
Fix CSS v13
2020-12-12 18:37:51 +01:00
Frédéric FRANCE
818af46b86
clean
2020-12-12 18:37:09 +01:00
Frédéric FRANCE
b8a01b4d2d
my company social networks in a separate tab
2020-12-12 18:31:26 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab
2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96
ucfirst
2020-12-12 17:31:10 +01:00
Laurent Destailleur
2592344601
Fix missing price2num
2020-12-12 17:27:27 +01:00
Frédéric FRANCE
46bf871127
target
2020-12-12 17:23:42 +01:00
Frédéric FRANCE
d523ed9f85
socialnetworks links
2020-12-12 17:01:25 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
b452852b30
Fix phpcs
2020-12-12 16:35:30 +01:00
Laurent Destailleur
5f476e7e7e
Compatibility of nusoap with PHP8
2020-12-12 15:37:15 +01:00
Laurent Destailleur
7fdae69546
Fix warning
2020-12-12 14:11:50 +01:00
Laurent Destailleur
a3d302d91c
Debug v13
2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9
Enhance widget
2020-12-12 12:45:43 +01:00
Laurent Destailleur
bfa8383bed
Fix migration script
2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3
2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a
Merge pull request #15737 from frederic34/pdfBuildThirdpartyName
...
thirdparty need to be object
2020-12-12 12:16:31 +01:00
Laurent Destailleur
2046b3d042
Merge pull request #15740 from frederic34/pdfproforma
...
fix warning
2020-12-12 12:12:43 +01:00
Frédéric FRANCE
479d709a96
fix warning
2020-12-12 09:39:54 +01:00
Frédéric FRANCE
870f2073ad
fix warning
2020-12-11 22:13:30 +01:00
stickler-ci
87038f953a
Fixing style errors.
2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906
thirdparty need to be object
2020-12-11 20:57:02 +01:00
Frédéric FRANCE
5ac677e2ab
fix mos api update
2020-12-11 19:02:13 +01:00
Frédéric FRANCE
0b3a5dc796
fix style
2020-12-11 18:09:37 +01:00
Laurent Destailleur
9100e1410e
Fix translation, add comments and clean code, fix also a small
...
regression on colors for graph with lines
2020-12-11 17:59:18 +01:00
Frédéric FRANCE
e9288ce0da
fix translation
2020-12-11 17:58:43 +01:00
Frédéric FRANCE
8882759e7a
hide topmenu option in config/display
2020-12-11 17:55:08 +01:00
Laurent Destailleur
18efbebd02
css
2020-12-11 17:11:50 +01:00
Laurent Destailleur
4fa1248d15
Fix avoid duplicate rows after double migration
2020-12-11 16:53:03 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1
...
Close #15383 : New format for funnel of prospection
2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1
...
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
1f6f434a9c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
2020-12-11 15:56:19 +01:00
lmarcouiller
dea75e6158
Close #15729 : fix error on box name and format
2020-12-11 15:55:17 +01:00
Laurent Destailleur
b3d49c4dce
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-11 15:54:31 +01:00
lmarcouiller
54228ad256
Close #15729 : fix bug with nb jobs
2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025
Close #15729 : first push
2020-12-11 15:22:29 +01:00
Laurent Destailleur
4fcd3fe493
Fix disallow -- string into filename for security purpose. Vulnerability
...
reported by Yılmaz Değirmenci
2020-12-11 15:12:42 +01:00
Laurent Destailleur
6a24da54a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-11 14:49:02 +01:00
Laurent Destailleur
8151e4430b
Merge pull request #15728 from FHenry/dev_add_ecm_files_info_api_docuements
...
NEW : add ECM files table info into API document entry GET
2020-12-11 14:40:40 +01:00
Laurent Destailleur
aa8a6fde84
Merge pull request #15726 from FHenry/develop
...
fix: manage price min for PRODUIT_CUSTOMER_PRICES
2020-12-11 14:36:32 +01:00
Laurent Destailleur
2353ade957
Merge pull request #15732 from frederic34/patch-14
...
fix phpcs
2020-12-11 14:36:04 +01:00
Laurent Destailleur
f4b299e530
Fix generation of PDF
2020-12-11 14:35:13 +01:00
Laurent Destailleur
2adbd29b49
Debug generation of doc from modulebuilder
2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php
2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs
2020-12-11 13:43:03 +01:00
Regis Houssin
4d0ce326c4
NEW add doAction hook in passwordforgotten page
2020-12-11 13:31:50 +01:00
Florian HENRY
dca48e4fb6
NEW : add ECM files table info into API document entry GET
2020-12-11 10:21:10 +01:00
Laurent Destailleur
7ac3bb1b67
Debug v13
2020-12-11 02:40:48 +01:00
Laurent Destailleur
697ca3e4f5
Fix selection of duration type
2020-12-11 02:23:43 +01:00
Laurent Destailleur
4ec598d571
Debug v11
2020-12-11 02:12:39 +01:00
Laurent Destailleur
2f8ee92c51
Fix CSS
2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290
Debug v13
2020-12-11 01:20:40 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Laurent Destailleur
1f28590e5e
Fix style
2020-12-10 19:05:54 +01:00
Laurent Destailleur
6b1ce7c050
Fix management of photo of users
2020-12-10 18:58:11 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
Frédéric FRANCE
d9682df682
hide also topmenu if disabled
2020-12-10 17:37:44 +01:00
Florian HENRY
2653d173b9
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-12-10 17:16:07 +01:00
Laurent Destailleur
693a7590ef
Fix boxes
2020-12-10 17:09:25 +01:00
Laurent Destailleur
c2124479c7
Fix missing test on IMAP
2020-12-10 16:05:43 +01:00
Laurent Destailleur
c850f4c918
Fix fatal error
2020-12-10 16:01:06 +01:00
lmarcouiller
716bb433e8
ajout pictogramme graph dans info box head
2020-12-10 15:50:18 +01:00
Florian HENRY
3438d080f5
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-12-10 15:09:03 +01:00
Florian HENRY
2a2b372ba9
fix: manage price min for PRICE PER CUSTOMER
2020-12-10 15:08:36 +01:00
Stephane Lesage
bcf4f65cc9
Fix & sync import/export entity icons/labels translation
2020-12-10 14:15:33 +01:00
Laurent Destailleur
59938147b6
Prepare v13
2020-12-10 13:38:12 +01:00
stickler-ci
0a2f656137
Fixing style errors.
2020-12-10 12:19:43 +00:00
lmarcouiller
4f6923442a
fix merge and sql synthax
2020-12-10 13:19:10 +01:00
Ferran Marcet
7360fcd03e
FIX: Bad rigths to send contract
2020-12-10 13:11:55 +01:00
Laurent Destailleur
d040f53dc2
Update web templates
2020-12-10 13:02:51 +01:00
Laurent Destailleur
be163c684f
Fix phpcs
2020-12-10 12:54:13 +01:00
Laurent Destailleur
2c37fe13d6
Fix substitution var keys
2020-12-10 12:14:58 +01:00
Laurent Destailleur
155fa43dc6
Fix substitution var __AMOUNT_TEXT__
2020-12-10 12:01:22 +01:00
Hystepik
a57b01e9ba
Update box_funnel_of_prospection.php
2020-12-10 11:12:33 +01:00
stickler-ci
492715811c
Fixing style errors.
2020-12-10 10:10:12 +00:00
Hystepik
14358f022d
Merge branch 'develop' into develop#1
2020-12-10 11:09:42 +01:00
stickler-ci
38e03778dc
Fixing style errors.
2020-12-10 10:07:09 +00:00
lmarcouiller
ecd642e465
Close #15383 : New format for funnel of prospection
2020-12-10 10:58:07 +01:00
Laurent Destailleur
eedaca1476
Fix bad encoding of link
2020-12-10 00:43:51 +01:00
Laurent Destailleur
2c9eb5417a
Look and feel v13
2020-12-10 00:20:22 +01:00
Laurent Destailleur
3fcfcb3e88
Fix field declaration
2020-12-09 23:38:24 +01:00
Laurent Destailleur
abe8d25a9a
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs
...
FIX regenerate mycompany logos thumbs if not exists
2020-12-09 22:06:19 +01:00
Laurent Destailleur
44713825e6
Merge pull request #15713 from FHenry/fix_extrafield_chbx
...
NEW extrafield checkbox from table (#CrowdFunding_DarkJeff_2021)
2020-12-09 22:04:31 +01:00
Laurent Destailleur
b8b5d87a09
Merge pull request #15716 from JoolsMcFly/fix/document-api-implementation-notes
...
Fix wrong API parameter name in document/buildoc implementation notes
2020-12-09 22:00:08 +01:00
Laurent Destailleur
dca5b5b1d3
Merge pull request #15710 from hregis/fix_add_hook_for_security
...
FIX rename hook to be more explicit and $test = false
2020-12-09 21:58:47 +01:00
Laurent Destailleur
66ed76c97c
Merge pull request #15718 from frederic34/box_funnel
...
fix warnings
2020-12-09 21:57:43 +01:00
Laurent Destailleur
dac0267a38
Fix debug various payment module.
...
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
zuiko
b3ca58d2d0
Update html.form.class.php
...
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
2020-12-09 21:16:25 +01:00
Laurent Destailleur
10a0c98f94
Debug v13
2020-12-09 19:26:41 +01:00
Laurent Destailleur
a0d9d98402
Fix phpcs
2020-12-09 18:03:02 +01:00
Frédéric FRANCE
a256bfeb46
fix warnings
2020-12-09 17:50:21 +01:00
Laurent Destailleur
075cacb8cf
Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF
2020-12-09 17:40:28 +01:00
Laurent Destailleur
f56b46bd3e
Debug v13
2020-12-09 17:14:35 +01:00
Laurent Destailleur
51738e7e60
Fix links into translation strings
2020-12-09 17:02:26 +01:00
Jools
5ef73bf882
Change module_part to modulepart
2020-12-09 16:26:31 +01:00
lmarcouiller
83286d99be
funnel horizontal bar
2020-12-09 13:31:14 +01:00
Laurent Destailleur
d7434ce97a
Fix css
2020-12-09 12:42:21 +01:00
Laurent Destailleur
89828c18d1
CSS
2020-12-09 12:32:21 +01:00
Laurent Destailleur
7459607eb9
Look fix
2020-12-09 12:23:37 +01:00
Florian HENRY
29b682d810
fix extrafield checkbox from table (#CroudFounding_DarkJeff_2021)
2020-12-09 10:35:30 +01:00
Regis Houssin
c18e8ac317
FIX regenerate mycompany logos thumbs if not exists
2020-12-09 09:28:46 +01:00
