Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-16 10:19:56 +01:00
parent 2eaf794b17
commit 39849de96e
6 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1316,7 +1316,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= ", multicurrency_tx";
$sql .= ") ";
$sql .= " VALUES (";
$sql .= "''";
$sql .= "'(PROV)'";
$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
$sql .= ", '".$this->db->escape($this->note_private)."'";
$sql .= ", '".$this->db->escape($this->note_public)."'";

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -1057,7 +1057,7 @@ class ProductFournisseur extends Product
//$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
$out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
foreach ($productFournLogList as $productFournLog) {
$out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
$out .= '<tr><td>'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
$out .= '<td class="right">'.price($productFournLog['price'], 0, $langs, 1, -1, -1, $conf->currency);
if ($productFournLog['multicurrency_code'] != $conf->currency) {
$out .= ' ('.price($productFournLog['multicurrency_price'], 0, $langs, 1, -1, -1, $productFournLog['multicurrency_code']).')';

6
htdocs/fourn/commande/card.php
View File

@ -1146,8 +1146,8 @@ if (empty($reshook)) {
// Creation commande
$object->ref_supplier = GETPOST('refsupplier');
$object->socid = $socid;
$object->cond_reglement_id = GETPOST('cond_reglement_id');
$object->mode_reglement_id = GETPOST('mode_reglement_id');
$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
$object->fk_account = GETPOST('fk_account', 'int');
$object->note_private = GETPOST('note_private', 'restricthtml');
$object->note_public = GETPOST('note_public', 'restricthtml');
@ -1157,7 +1157,7 @@ if (empty($reshook)) {
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
$object->fk_project = GETPOST('projectid');
$object->fk_project = GETPOST('projectid', 'int');
// Fill array 'array_options' with data from add form
if (!$error) {

12
htdocs/product/fournisseurs.php
View File

@ -227,17 +227,17 @@ if (empty($reshook)) {
}
}
if (!empty($conf->multicurrency->enabled)) {
if (empty($_POST["multicurrency_code"])) {
if (!GETPOST("multicurrency_code")) {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
}
if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
if (price2num(GETPOST("multicurrency_tx")) <= 0 || GETPOST("multicurrency_tx") == '') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
}
if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
if (price2num(GETPOST("multicurrency_price")) < 0 || GETPOST("multicurrency_price") == '') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
@ -1081,7 +1081,7 @@ END;
// Currency
if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">';
print '<td class="right nowraponall">';
print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
print '</td>';
}
@ -1130,9 +1130,9 @@ END;
print '</td>';
}
// Date
// Date modification
if (!empty($arrayfields['pfp.tms']['checked'])) {
print '<td align="right">';
print '<td class="right nowraponall">';
print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), "dayhour");
print '</td>';
}

17
htdocs/supplier_proposal/card.php
View File

@ -1786,30 +1786,31 @@ if ($action == 'create') {
if ($action == 'statut') {
// Form to set proposal accepted/refused
$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" id="formacceptrefuse" class="formconsumeproduce">';
$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" id="formacceptrefuse" class="formconsumeproduce paddingbottom paddingleft paddingright">';
$form_close .= '<input type="hidden" name="token" value="'.newToken().'">';
$form_close .= '<input type="hidden" name="action" value="setstatut">';
if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) {
$form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option
}
$form_close .= '<table class="border centpercent">';
$form_close .= '<tr><td width="150" class="left">'.$langs->trans("CloseAs").'</td><td class="left">';
$form_close .= '<table class="border centpercent marginleftonly marginrightonly">';
$form_close .= '<tr><td>'.$langs->trans("CloseAs").'</td><td class="left">';
$form_close .= '<select id="statut" name="statut" class="flat">';
$form_close .= '<option value="0">&nbsp;</option>';
$form_close .= '<option value="2">'.$langs->trans('SupplierProposalStatusSigned').'</option>';
$form_close .= '<option value="3">'.$langs->trans('SupplierProposalStatusNotSigned').'</option>';
$form_close .= '</select>';
$form_close .= '</td></tr>';
$form_close .= '<tr><td width="150" class="left">'.$langs->trans('Note').'</td><td class="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
$form_close .= $object->note;
$form_close .= '<tr><td class="left">'.$langs->trans('Note').'</td><td class="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
$form_close .= $object->note_private;
$form_close .= '</textarea></td></tr>';
$form_close .= '<tr><td class="center" colspan="2">';
$form_close .= '</table>';
$form_close .= '<center>';
$form_close .= '<input type="submit" class="button button-save" name="validate" value="'.$langs->trans("Save").'">';
$form_close .= ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
$form_close .= '<a name="acceptedrefused">&nbsp;</a>';
$form_close .= '</td>';
$form_close .= '</tr></table></form>';
$form_close .= '</center>';
$form_close .= '</form>';
print $form_close;
}

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

@ -465,6 +465,7 @@ input#onlinepaymenturl, input#directdownloadlink {
.formconsumeproduce {
background: #f3f3f3;
padding: 20px 0px 0px 0px;
border-radius: 8px;
}
div#moretabsList, div#moretabsListaction {