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

Fix css

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-23 23:16:27 +01:00
parent 02daf09928
commit b66ec5bc64
7 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/prelevement.php
View File

@ -213,7 +213,7 @@ if ($object->id > 0)
$head = facture_prepare_head($object); $head = facture_prepare_head($object);
} }
print dol_get_fiche_head($head, 'standingorders', $title, -1, 'bill'); print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
// Invoice content // Invoice content
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {

40
htdocs/fourn/facture/card.php
View File

@ -115,6 +115,8 @@ $permissiondellink = $usercancreate; // Used by the include of actions_dellink.i
$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
$error = 0;
/* /*
* Actions * Actions
@ -183,8 +185,7 @@ if (empty($reshook))
} }
// Check parameters // Check parameters
if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
{
$langs->load("stocks"); $langs->load("stocks");
if (!$idwarehouse || $idwarehouse == -1) if (!$idwarehouse || $idwarehouse == -1)
{ {
@ -194,11 +195,9 @@ if (empty($reshook))
} }
} }
if (!$error) if (!$error) {
{
$result = $object->validate($user, '', $idwarehouse); $result = $object->validate($user, '', $idwarehouse);
if ($result < 0) if ($result < 0) {
{
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} else { } else {
// Define output language // Define output language
@ -220,8 +219,7 @@ if (empty($reshook))
} }
} }
} }
} elseif ($action == 'confirm_delete' && $confirm == 'yes') } elseif ($action == 'confirm_delete' && $confirm == 'yes') {
{
$object->fetch($id); $object->fetch($id);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
@ -280,15 +278,13 @@ if (empty($reshook))
} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) { } elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) {
$object->fetch($id); $object->fetch($id);
$result = $object->set_paid($user); $result = $object->set_paid($user);
if ($result < 0) if ($result < 0) {
{
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
// Set supplier ref // Set supplier ref
if ($action == 'setref_supplier' && $usercancreate) if ($action == 'setref_supplier' && $usercancreate) {
{
$object->ref_supplier = GETPOST('ref_supplier', 'alpha'); $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
if ($object->update($user) < 0) { if ($object->update($user) < 0) {
@ -315,8 +311,7 @@ if (empty($reshook))
} }
// payments conditions // payments conditions
if ($action == 'setconditions' && $usercancreate) if ($action == 'setconditions' && $usercancreate) {
{
$object->fetch($id); $object->fetch($id);
$object->cond_reglement_code = 0; // To clean property $object->cond_reglement_code = 0; // To clean property
$object->cond_reglement_id = 0; // To clean property $object->cond_reglement_id = 0; // To clean property
@ -1680,20 +1675,17 @@ if ($action == 'create')
$currency_code = $conf->currency; $currency_code = $conf->currency;
$societe = ''; $societe = '';
if (GETPOST('socid') > 0) if (GETPOST('socid') > 0) {
{
$societe = new Societe($db); $societe = new Societe($db);
$societe->fetch(GETPOST('socid', 'int')); $societe->fetch(GETPOST('socid', 'int'));
if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code; if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code;
} }
if (!empty($origin) && !empty($originid)) if (!empty($origin) && !empty($originid)) {
{
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
$element = $subelement = $origin; $element = $subelement = $origin;
if ($element == 'project') if ($element == 'project') {
{
$projectid = $originid; $projectid = $originid;
$element = 'projet'; $element = 'projet';
} }
@ -2204,8 +2196,7 @@ if ($action == 'create')
// Show origin lines // Show origin lines
if (is_object($objectsrc)) if (is_object($objectsrc)) {
{
print '<br>'; print '<br>';
$title = $langs->trans('ProductsAndServices'); $title = $langs->trans('ProductsAndServices');
@ -2218,8 +2209,7 @@ if ($action == 'create')
print '</table>'; print '</table>';
} }
} else { } else {
if ($id > 0 || !empty($ref)) if ($id > 0 || !empty($ref)) {
{
/* *************************************************************************** */ /* *************************************************************************** */
/* */ /* */
/* Fiche en mode visu ou edition */ /* Fiche en mode visu ou edition */
@ -2275,7 +2265,7 @@ if ($action == 'create')
$head = facturefourn_prepare_head($object); $head = facturefourn_prepare_head($object);
$titre = $langs->trans('SupplierInvoice'); $titre = $langs->trans('SupplierInvoice');
print dol_get_fiche_head($head, 'card', $titre, -1, 'bill'); print dol_get_fiche_head($head, 'card', $titre, -1, 'supplier_invoice');
$formconfirm = ''; $formconfirm = '';

2
htdocs/fourn/facture/contact.php
View File

@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref))
$head = facturefourn_prepare_head($object); $head = facturefourn_prepare_head($object);
print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill'); print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';

2
htdocs/fourn/facture/document.php
View File

@ -90,7 +90,7 @@ llxHeader('', $title, $helpurl);
if ($object->id > 0) if ($object->id > 0)
{ {
$head = facturefourn_prepare_head($object); $head = facturefourn_prepare_head($object);
print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill'); print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
$totalpaye = $object->getSommePaiement(); $totalpaye = $object->getSommePaiement();

2
htdocs/fourn/facture/index.php
View File

@ -51,7 +51,7 @@ $maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->globa
llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores'); llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'bill'); print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'supplier_invoice');
print '<div class="fichecenter">'; print '<div class="fichecenter">';

2
htdocs/fourn/facture/info.php
View File

@ -65,7 +65,7 @@ $alreadypaid = $object->getSommePaiement();
$head = facturefourn_prepare_head($object); $head = facturefourn_prepare_head($object);
$titre = $langs->trans('SupplierInvoice'); $titre = $langs->trans('SupplierInvoice');
print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill'); print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';

2
htdocs/fourn/facture/note.php
View File

@ -82,7 +82,7 @@ if ($object->id > 0)
$head = facturefourn_prepare_head($object); $head = facturefourn_prepare_head($object);
$titre = $langs->trans('SupplierInvoice'); $titre = $langs->trans('SupplierInvoice');
print dol_get_fiche_head($head, 'note', $titre, -1, 'bill'); print dol_get_fiche_head($head, 'note', $titre, -1, 'supplier_invoice');
// Supplier invoice card // Supplier invoice card