Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
41cdf0d5a0 remove stock data from getsupplierprice 
stock data can be retrieved with get
 2019-10-08 08:19:27 +02:00
Laurent De Coninck
091df082fc fix the access of the bank account of one user 
There are 3 ways to access this tab :
    1. If the module holiday is enabled
    2. If the module holidays is enabled
    3. If the module expense report is enabled

More over that, the application checks if the user can access the bank
account of the selected user. The application does that twice (logical
^^), first to know if the tab has to be displayed or not. Second time,
when you arrive on the page /user/bank.php to know if you have access
(eg. if you type the url directly).

In this second check, the check of the expense report module was missing
(added by this PR). This caused the following issue: the tab was visible
but when the user clicked on itn, he received an error as he cannot
access the page.
 2019-10-08 08:11:29 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
99da69fb69 NEW Can edit the price of predefined product during adding in documents 2019-10-07 21:01:52 +02:00
Laurent Destailleur
b7e6ee7eea css 2019-10-07 20:55:54 +02:00
Laurent Destailleur
51be0fad99 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5 Fix phpcs 2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
77389d818f Merge pull request #12059 from frederic34/boxfix 
use $this->db in box
 2019-10-07 20:38:29 +02:00
Laurent Destailleur
eba3d96293 Update card.php 
NEW Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
 2019-10-07 20:36:48 +02:00
Laurent Destailleur
da5890e584 Update adherent.class.php 2019-10-07 20:32:51 +02:00
Frédéric FRANCE
c68de09ba9 use $this->db in box 2019-10-07 20:27:51 +02:00
Laurent Destailleur
b847eb1b7e Merge pull request #12056 from atm-florianm/FIX_7.0_email_addresses_in_email_sending_error_message 
FIX 7.0: addresses not displayed in e-mail sending error messages
 2019-10-07 20:25:01 +02:00
Laurent Destailleur
7ed3561344 Merge pull request #12057 from laudeco/hotfix/12041-security-generate-password 
[Fix #12041] - validate the 0 as min value consecutive
 2019-10-07 20:23:30 +02:00
Laurent Destailleur
156eb7fa61 Merge branch '10.0' into hotfix/12041-security-generate-password 2019-10-07 20:22:19 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Laurent Destailleur
07d1a3fe8b css 2019-10-07 18:17:22 +02:00
Laurent De Coninck
2ba8506608 validate the 0 as min value consecutive; meaning not take that rule into account 2019-10-07 17:53:23 +02:00
Florian Mortgat
2aee62ea28 FIX: $from and $sendto variables are unescaped in the sending error message 
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
 2019-10-07 17:32:52 +02:00
Laurent Destailleur
16eeeecb9a Trans 2019-10-07 17:08:08 +02:00
Laurent Destailleur
297313e7de CSS 2019-10-07 16:01:36 +02:00
Laurent Destailleur
c83f40fc7e Debug contact by default 2019-10-07 15:42:37 +02:00
Laurent Destailleur
c6c498fd67 Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
3a15485e99 Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:23:30 +02:00
Laurent Destailleur
b9a92546b6 Update card.php 2019-10-07 15:20:52 +02:00
Laurent Destailleur
a9c844460b Debug use of widget on Accounting home page 2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711 Merge pull request #11951 from aspangaro/11.0_accountancy_portal 
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
 2019-10-07 14:24:22 +02:00
Laurent Destailleur
21ab307cd6 Merge pull request #12020 from frederic34/patch-13 
Update dav admin
 2019-10-07 14:21:30 +02:00
Laurent Destailleur
1a32a3b7f1 Update dav.php 2019-10-07 14:21:22 +02:00
Laurent Destailleur
f56da782ab Merge pull request #12038 from Ahuahuachi/develop 
NEW Add hidden options to send by email even for draft status
 2019-10-07 14:18:53 +02:00
Laurent Destailleur
839929f764 FIX #12026 2019-10-07 14:16:47 +02:00
Laurent Destailleur
0bd545e1ca Merge pull request #12026 from oscim/patch-6 
Fix error in triggers process
 2019-10-07 14:14:36 +02:00
Laurent Destailleur
00df21cf17 Trans 2019-10-07 13:48:09 +02:00
Laurent Destailleur
2bb55200f7 Clean user card 2019-10-07 13:46:13 +02:00
ptibogxiv
9aa7226d39 Update member.lib.php 2019-10-07 13:38:05 +02:00
ptibogxiv
ff992d996c Update type_translation.php 2019-10-07 13:37:35 +02:00
ptibogxiv
decbdaa5af Rename traduction.php to type_translation.php 2019-10-07 13:35:40 +02:00
Laurent Destailleur
76aef85ee4 Merge pull request #12015 from atm-maxime/new_validators 
NEW expense request and holiday validator fields
 2019-10-07 13:31:20 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Laurent Destailleur
12d243b8d4 FIX #12040 2019-10-07 13:13:46 +02:00
Laurent Destailleur
bb84e4a236 Merge pull request #12037 from frederic34/patch-14 
Fix list of expense report list for user when he has extrafields
 2019-10-07 13:10:02 +02:00
Laurent Destailleur
1060ac4608 Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
8de5e6898d Merge pull request #12032 from frederic34/ficheinter_rec 
duration of fichinter rec
 2019-10-07 13:04:34 +02:00
Laurent Destailleur
c2a7ae23bc Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2 Fix can set min repeat to 0 for password 2019-10-07 12:57:24 +02:00
Laurent Destailleur
a604fb9afb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:54:57 +02:00
Laurent Destailleur
022c67ee68 Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password 
[fix #12041] - Generate password mode perso
 2019-10-07 12:54:45 +02:00