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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-29 05:07:23 +02:00
parent 593f3b81e5
commit 723a263cd3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/discount.class.php
View File

@ -651,7 +651,7 @@ class DiscountAbsolute
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
$sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id; $sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
} }
else if ($invoice->element == 'invoice_supplier') elseif ($invoice->element == 'invoice_supplier')
{ {
$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount'; $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';

2
htdocs/core/lib/pdf.lib.php
View File

@ -2134,7 +2134,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
} }
} }
else if ($objecttype == 'fichinter') elseif ($objecttype == 'fichinter')
{ {
$outputlangs->load('interventions'); $outputlangs->load('interventions');
foreach($objects as $elementobject) foreach($objects as $elementobject)

4
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1810,7 +1810,7 @@ class SupplierProposal extends CommonObject
if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code); if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
$productsupplier->id = $product->fk_product; $productsupplier->id = $product->fk_product;
$productsupplier->update_buyprice($product->qty, $product->subprice, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_subprice, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', ''); $productsupplier->update_buyprice($product->qty, $product->subprice, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_subprice, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
} }
return 1; return 1;
@ -1849,7 +1849,7 @@ class SupplierProposal extends CommonObject
public function createPriceFournisseur($product, $user) public function createPriceFournisseur($product, $user)
{ {
global $conf; global $conf;
$price=price2num($product->subprice*$product->qty, 'MU'); $price=price2num($product->subprice*$product->qty, 'MU');
$qty=price2num($product->qty); $qty=price2num($product->qty);
$unitPrice = price2num($product->subprice, 'MU'); $unitPrice = price2num($product->subprice, 'MU');