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

remove superfluous spaces

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-08-21 20:12:27 +02:00
parent 0fbccce9a7
commit c76a33fb4f
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -932,109 +932,109 @@ class doc_generic_project_odt extends ModelePDFProjects
'title' => "ListProposalsAssociatedProject", 'title' => "ListProposalsAssociatedProject",
'class' => 'Propal', 'class' => 'Propal',
'table' => 'propal', 'table' => 'propal',
'test' => $conf->propal->enabled && $user->rights->propale->lire 'test' => $conf->propal->enabled && $user->rights->propale->lire
), ),
'order' => array( 'order' => array(
'title' => "ListOrdersAssociatedProject", 'title' => "ListOrdersAssociatedProject",
'class' => 'Commande', 'class' => 'Commande',
'table' => 'commande', 'table' => 'commande',
'test' => $conf->commande->enabled && $user->rights->commande->lire 'test' => $conf->commande->enabled && $user->rights->commande->lire
), ),
'invoice' => array( 'invoice' => array(
'title' => "ListInvoicesAssociatedProject", 'title' => "ListInvoicesAssociatedProject",
'class' => 'Facture', 'class' => 'Facture',
'table' => 'facture', 'table' => 'facture',
'test' => $conf->facture->enabled && $user->rights->facture->lire 'test' => $conf->facture->enabled && $user->rights->facture->lire
), ),
'invoice_predefined' => array( 'invoice_predefined' => array(
'title' => "ListPredefinedInvoicesAssociatedProject", 'title' => "ListPredefinedInvoicesAssociatedProject",
'class' => 'FactureRec', 'class' => 'FactureRec',
'table' => 'facture_rec', 'table' => 'facture_rec',
'test' => $conf->facture->enabled && $user->rights->facture->lire 'test' => $conf->facture->enabled && $user->rights->facture->lire
), ),
'proposal_supplier' => array( 'proposal_supplier' => array(
'title' => "ListSupplierProposalsAssociatedProject", 'title' => "ListSupplierProposalsAssociatedProject",
'class' => 'SupplierProposal', 'class' => 'SupplierProposal',
'table' => 'supplier_proposal', 'table' => 'supplier_proposal',
'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire 'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
), ),
'order_supplier' => array( 'order_supplier' => array(
'title' => "ListSupplierOrdersAssociatedProject", 'title' => "ListSupplierOrdersAssociatedProject",
'table' => 'commande_fournisseur', 'table' => 'commande_fournisseur',
'class' => 'CommandeFournisseur', 'class' => 'CommandeFournisseur',
'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
), ),
'invoice_supplier' => array( 'invoice_supplier' => array(
'title' => "ListSupplierInvoicesAssociatedProject", 'title' => "ListSupplierInvoicesAssociatedProject",
'table' => 'facture_fourn', 'table' => 'facture_fourn',
'class' => 'FactureFournisseur', 'class' => 'FactureFournisseur',
'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
), ),
'contract' => array( 'contract' => array(
'title' => "ListContractAssociatedProject", 'title' => "ListContractAssociatedProject",
'class' => 'Contrat', 'class' => 'Contrat',
'table' => 'contrat', 'table' => 'contrat',
'test' => $conf->contrat->enabled && $user->rights->contrat->lire 'test' => $conf->contrat->enabled && $user->rights->contrat->lire
), ),
'intervention' => array( 'intervention' => array(
'title' => "ListFichinterAssociatedProject", 'title' => "ListFichinterAssociatedProject",
'class' => 'Fichinter', 'class' => 'Fichinter',
'table' => 'fichinter', 'table' => 'fichinter',
'disableamount' => 1, 'disableamount' => 1,
'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire 'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
), ),
'shipping' => array( 'shipping' => array(
'title' => "ListShippingAssociatedProject", 'title' => "ListShippingAssociatedProject",
'class' => 'Expedition', 'class' => 'Expedition',
'table' => 'expedition', 'table' => 'expedition',
'disableamount' => 1, 'disableamount' => 1,
'test' => $conf->expedition->enabled && $user->rights->expedition->lire 'test' => $conf->expedition->enabled && $user->rights->expedition->lire
), ),
'trip' => array( 'trip' => array(
'title' => "ListTripAssociatedProject", 'title' => "ListTripAssociatedProject",
'class' => 'Deplacement', 'class' => 'Deplacement',
'table' => 'deplacement', 'table' => 'deplacement',
'disableamount' => 1, 'disableamount' => 1,
'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire 'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
), ),
'expensereport' => array( 'expensereport' => array(
'title' => "ListExpenseReportsAssociatedProject", 'title' => "ListExpenseReportsAssociatedProject",
'class' => 'ExpenseReportLine', 'class' => 'ExpenseReportLine',
'table' => 'expensereport_det', 'table' => 'expensereport_det',
'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire 'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
), ),
'donation' => array( 'donation' => array(
'title' => "ListDonationsAssociatedProject", 'title' => "ListDonationsAssociatedProject",
'class' => 'Don', 'class' => 'Don',
'table' => 'don', 'table' => 'don',
'test' => $conf->don->enabled && $user->rights->don->lire 'test' => $conf->don->enabled && $user->rights->don->lire
), ),
'loan' => array( 'loan' => array(
'title' => "ListLoanAssociatedProject", 'title' => "ListLoanAssociatedProject",
'class' => 'Loan', 'class' => 'Loan',
'table' => 'loan', 'table' => 'loan',
'test' => $conf->loan->enabled && $user->rights->loan->read 'test' => $conf->loan->enabled && $user->rights->loan->read
), ),
'chargesociales' => array( 'chargesociales' => array(
'title' => "ListSocialContributionAssociatedProject", 'title' => "ListSocialContributionAssociatedProject",
'class' => 'ChargeSociales', 'class' => 'ChargeSociales',
'table' => 'chargesociales', 'table' => 'chargesociales',
'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id, 'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
'test' => $conf->tax->enabled && $user->rights->tax->charges->lire 'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
), ),
'stock_mouvement' => array( 'stock_mouvement' => array(
'title' => "ListMouvementStockProject", 'title' => "ListMouvementStockProject",
'class' => 'MouvementStock', 'class' => 'MouvementStock',
'table' => 'stock_mouvement', 'table' => 'stock_mouvement',
'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)) 'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
), ),
'agenda' => array( 'agenda' => array(
'title' => "ListActionsAssociatedProject", 'title' => "ListActionsAssociatedProject",
'class' => 'ActionComm', 'class' => 'ActionComm',
'table' => 'actioncomm', 'table' => 'actioncomm',
'disableamount' => 1, 'disableamount' => 1,
'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire 'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
) )
); );
//Insert reference //Insert reference

2
htdocs/index.php
View File

@ -568,7 +568,7 @@ if (! empty($valid_dashboardlines))
if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
{ {
$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.price($board->total) .'</span></a>'; $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.price($board->total) .'</span></a>';
} }
$boxwork .= '</div>'; $boxwork .= '</div>';
if ($board->nbtodolate > 0) if ($board->nbtodolate > 0)
{ {

4
htdocs/product/list.php
View File

@ -748,8 +748,8 @@ if ($resql)
if (! empty($arrayfields['p.duration']['checked'])) if (! empty($arrayfields['p.duration']['checked']))
{ {
print '<td align="center">'; print '<td align="center">';
if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration)) if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration))
{ {
$duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1);
$duration_unit = substr($obj->duration,-1); $duration_unit = substr($obj->duration,-1);