Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2

Browse Source
This commit is contained in:
lmarcouiller
2022-09-07 10:50:55 +02:00
parent c6349ce51a ff2fe35592
commit f08e8ba2b3
7 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/modules/modUser.class.php
View File

@@ -225,7 +225,7 @@ class modUser extends DolibarrModules
'u.accountancy_code'=>"UserAccountancyCode",
'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
'u.email'=>"Email", 'u.note_public'=>"NotePublic", 'u.note_private'=>"NotePrivate", 'u.signature'=>'Signature',
'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
'u.birth'=>'DateOfBirth',
@@ -242,7 +242,7 @@ class modUser extends DolibarrModules
'u.accountancy_code'=>'Text',
'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.signature'=>"Text", 'u.datelastlogin'=>'Date',
'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note_public'=>"Text", 'u.note_private'=>"Text", 'u.signature'=>"Text", 'u.datelastlogin'=>'Date',
'u.fk_user'=>"FormSelect:select_dolusers",
'u.birth'=>'Date',
'u.datepreviouslogin'=>'Date',
@@ -261,7 +261,7 @@ class modUser extends DolibarrModules
'u.accountancy_code'=>'user',
'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
'u.email'=>'user', 'u.note_public'=>"user", 'u.note_private'=>"user", 'u.signature'=>'user',
'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
'u.dateemployment'=>'user', 'u.dateemploymentend'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
'u.birth'=>'user',
@@ -303,7 +303,7 @@ class modUser extends DolibarrModules
'u.pass_crypted'=>"Password", 'u.admin'=>"Administrator", 'u.fk_soc'=>"Company*", 'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
'u.fk_state'=>"StateId", 'u.fk_country'=>"CountryCode",
'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
'u.email'=>"Email", 'u.note_public'=>"NotePublic", 'u.note_private'=>"NotePrivate", 'u.signature'=>'Signature',
'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
'u.birth'=>'DateOfBirth',
@@ -339,7 +339,7 @@ class modUser extends DolibarrModules
'u.pass_crypted'=>'Encrypted password',
'u.fk_soc'=>'0 (internal user) or company name (external user)', 'u.datec'=>dol_print_date(dol_now(), '%Y-%m-%d'), 'u.address'=>"61 jump street",
'u.zip'=>"123456", 'u.town'=>"Big town", 'u.fk_country'=>'US, FR, DE...', 'u.office_phone'=>"0101010101", 'u.office_fax'=>"0101010102",
'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note'=>"This is an example of note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note_public'=>"This is an example of public note for record", 'u.note_private'=>"This is an example of private note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
'u.statut'=>"0 (closed) or 1 (active)",
);
$this->import_updatekeys_array[$r] = array('u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>'Login');

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

@@ -118,7 +118,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
SepaMandate=SEPA Direct Debit Mandate
SepaMandateShort=SEPA Mandate
PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
CreditorIdentifier=Creditor Identifier
CreditorName=Creditor Name
SEPAFillForm=(B) Please complete all the fields marked *

24
htdocs/product/stock/stockatdate.php
View File

@@ -476,6 +476,8 @@ print $hookmanager->resPrint;
print "</tr>\n";
$totalbuyingprice = 0;
$totalcurrentstock = 0;
$totalvirtualstock = 0;
$i = 0;
while ($i < ($limit ? min($num, $limit) : $num)) {
@@ -546,6 +548,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
if ($mode == 'future') {
// Current stock
print '<td class="right">'.$currentstock.'</td>';
$totalcurrentstock += $currentstock;
print '<td class="right"></td>';
@@ -554,6 +557,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Final virtual stock
print '<td class="right">'.$virtualstock.'</td>';
$totalvirtualstock += $virtualstock;
} else {
// Stock at date
print '<td class="right">'.($stock ? $stock : '<span class="opacitymedium">'.$stock.'</span>').'</td>';
@@ -587,6 +591,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Current stock
print '<td class="right">'.($currentstock ? $currentstock : '<span class="opacitymedium">0</span>').'</td>';
$totalcurrentstock += $currentstock;
}
// Action
@@ -615,8 +620,23 @@ if ($mode == 'future') {
if (empty($date) || !$dateIsValid) {
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EnterADateCriteria").'</span></td></tr>';
} else {
print '<tr class="liste_total"><td>'.$langs->trans("Totalforthispage").'</td>';
print '<td></td><td></td><td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td><td></td><td></td><td></td><td></td></tr>';
print '<tr class="liste_total">';
print '<td>'.$langs->trans("Totalforthispage").'</td>';
print '<td></td>';
if ($mode == 'future') {
print '<td class="right">'.price(price2num($totalcurrentstock, 'MS')).'</td>';
print '<td></td>';
print '<td></td>';
print '<td class="right">'.price(price2num($totalvirtualstock, 'MS')).'</td>';
} else {
print '<td></td>';
print '<td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td>';
print '<td></td>';
print '<td></td>';
print '<td class="right">'.($productid > 0 ? price(price2num($totalcurrentstock, 'MS')) : '').'</td>';
}
print '<td></td>';
print '</tr>';
}
print '</table>';

2
htdocs/societe/paymentmodes.php
View File

@@ -863,7 +863,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="socid" value="'.$object->id.'">';
print img_picto($langs->trans("CreateCustomerOnStripe"), 'stripe');
print '<input type="submit" class="buttonreset nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
print '<input type="submit" class="buttonlink nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
print '</form>';
}
print '</td></tr>';

8
htdocs/theme/eldy/global.inc.php
View File

@@ -3545,6 +3545,14 @@ input.button[name="upload"] {
input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
font-size: 0.8em;
}
input.buttonlink {
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}
input.buttonlink:hover {
text-decoration: underline;
}
input.buttonreset {
margin-top: 3px;
margin-bottom: 3px;

8
htdocs/theme/md/style.css.php
View File

@@ -3511,6 +3511,14 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
.smallpaddingimp {
padding: 4px !important;
}
input.buttonlink {
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}
input.buttonlink:hover {
text-decoration: underline;
}
input.buttonreset {
margin-top: 3px;
margin-bottom: 3px;

3
htdocs/user/list.php
View File

@@ -110,7 +110,8 @@ $fieldstosearchall = array(
'u.office_phone'=>"PhonePro",
'u.user_mobile'=>"PhoneMobile",
'u.email'=>"EMail",
'u.note'=>"Note",
'u.note_public'=>"NotePublic",
'u.note_private'=>"NotePrivate"
);
if (!empty($conf->api->enabled)) {
$fieldstosearchall['u.api_key'] = "ApiKey";