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

Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card

Browse Source
This commit is contained in:
gauthier 2016-10-07 09:25:18 +02:00
commit fee0a88d27
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/html.form.class.php
View File

@ -2340,11 +2340,12 @@ class Form
/** /**
* Return list of suppliers prices for a product * Return list of suppliers prices for a product
* *
* @param int $productid Id of product * @param int $productid Id of product
* @param string $htmlname Name of HTML field * @param string $htmlname Name of HTML field
* @return string|null * @param int $selected_supplier Pre-selected supplier if more than 1 result
* @return void
*/ */
function select_product_fourn_price($productid, $selected_supplier='', $htmlname='productfournpriceid') function select_product_fourn_price($productid, $htmlname='productfournpriceid', $selected_supplier='')
{ {
global $langs,$conf; global $langs,$conf;

2
htdocs/product/stock/replenish.php
View File

@ -644,7 +644,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
print '<td align="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.$stocktobuy.'"></td>'; print '<td align="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.$stocktobuy.'"></td>';
// Supplier // Supplier
print '<td align="right">'. $form->select_product_fourn_price($prod->id, $fk_supplier, 'fourn'.$i).'</td>'; print '<td align="right">'. $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier).'</td>';
print '</tr>'; print '</tr>';
} }