lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-23 19:25:13 +02:00
commit 0944e8b156
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/infobox.class.php
View File

@ -41,7 +41,7 @@ class InfoBox
{
return array(
0 => 'Home',
27 => 'Accountancy Home'
27 => 'AccountancyHome'
);
}
else
@ -74,7 +74,7 @@ class InfoBox
24 => 'expensereportindex',
25 => 'mailingindex',
26 => 'opensurveyindex',
27 => 'Accountancy Home'
27 => 'AccountancyHome'
);
}
}

10
htdocs/langs/en_US/admin.lang
View File

@ -839,9 +839,16 @@ Permission532=Create/modify services
Permission534=Delete services
Permission536=See/manage hidden services
Permission538=Export services
Permission561=Read payment orders by credit transfer
Permission562=Create/modify payment order by credit transfer
Permission563=Send/Transmit payment order by credit transfer
Permission564=Record Debits/Rejections of credit transfer
Permission650=Read Bills of Materials
Permission651=Create/Update Bills of Materials
Permission652=Delete Bills of Materials
Permission660=Read Manufacturing Order (MO)
Permission661=Create/Update Manufacturing Order (MO)
Permission662=Delete Manufacturing Order (MO)
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
@ -851,6 +858,8 @@ Permission773=Delete expense reports
Permission774=Read all expense reports (even for user not subordinates)
Permission775=Approve expense reports
Permission776=Pay expense reports
Permission777=Read expense reports of everybody
Permission778=Create/modify expense reports of everybody
Permission779=Export expense reports
Permission1001=Read stocks
Permission1002=Create/modify warehouses
@ -903,6 +912,7 @@ Permission2515=Setup documents directories
Permission2801=Use FTP client in read mode (browse and download only)
Permission2802=Use FTP client in write mode (delete or upload files)
Permission3200=Read archived events and fingerprints
Permission3301=Generate new modules
Permission4001=See employees
Permission4002=Create employees
Permission4003=Delete employees

2
htdocs/langs/en_US/boxes.lang
View File

@ -100,3 +100,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
BoxLastCustomerShipments=Last customer shipments
BoxTitleLastCustomerShipments=Latest %s customer shipments
NoRecordedShipments=No recorded customer shipment
# Pages
AccountancyHome=Accountancy

1
htdocs/langs/en_US/main.lang
View File

@ -1072,3 +1072,4 @@ NotUsedForThisCustomer=Not used for this customer
AmountMustBePositive=Amount must be positive
ByStatus=By status
InformationMessage=Information
Used=Used

2
htdocs/product/fournisseurs.php
View File

@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.cl
require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
if (!empty($conf->barcode->enabled)) dol_include_once('/core/class/html.formbarcode.class.php');
// Load translation files required by the page
$langs->loadLangs(array('products', 'suppliers', 'bills', 'margins'));
$langs->loadLangs(array('products', 'suppliers', 'bills', 'margins', 'stocks'));
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');

2
htdocs/societe/paymentmodes.php
View File

@ -1331,7 +1331,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
// List of Stripe payment modes
if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $object->fournisseur && !empty($stripesupplieracc))
{
print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
print '<table class="liste centpercent">'."\n";
print '<tr class="liste_titre">';