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

Merge pull request #1633 from aspangaro/develop

Browse Source 
Typo / Missing key language / Fix limit list on mass movement stock page
This commit is contained in:
Laurent Destailleur 2014-05-30 11:33:08 +02:00
commit fb0f0047e7
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1259,7 +1259,7 @@ class Form
* Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
*
* @param int $selected Preselected products
* @param string $htmlname Name of HTML seletc field (must be unique in page)
* @param string $htmlname Name of HTML select field (must be unique in page)
* @param int $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* @param int $limit Limit on number of returned lines
* @param int $price_level Level of price to show
@ -1268,7 +1268,7 @@ class Form
* @param string $selected_input_value Value of preselected input text (with ajax)
* @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
* @param array $ajaxoptions Options for ajax_autocompleter
* @param int $socid Thridparty Id
* @param int $socid Thirdparty Id
* @return void
*/
function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(),$socid=0)
@ -1320,13 +1320,13 @@ class Form
* @param int $selected Preselected product
* @param string $htmlname Name of select html
* @param string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* @param int $limit Limite sur le nombre de lignes retournees
* @param int $limit Limit on number of returned lines
* @param int $price_level Level of price to show
* @param string $filterkey Filter on product
* @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell
* @param int $finished Filter on finished field: 2=No filter
* @param int $outputmode 0=HTML select string, 1=Array
* @param int $socid Thridparty Id
* @param int $socid Thirdparty Id
* @return array Array of keys for json
*/
function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0)

1
htdocs/langs/en_US/stocks.lang
View File

@ -112,6 +112,7 @@ ReplenishmentOrdersDesc=This is list of all opened supplier orders
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
MassMovement=Mass movement
MassStockMovement=Mass stock movement
SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
RecordMovement=Record transfert

2
htdocs/langs/fr_FR/products.lang
View File

@ -28,8 +28,10 @@ ProductsAndServicesStatistics=Statistiques produits et services
ProductsStatistics=Statistiques produits
ProductsOnSell=Produits en vente ou en achat
ProductsNotOnSell=Produits hors vente et hors achat
ProductsOnSellAndOnBuy=Produits en vente et en achat
ServicesOnSell=Services en vente ou en achat
ServicesNotOnSell=Services hors vente et hors achat
ServicesOnSellAndOnBuy=Services en vente et en achat
InternalRef=Référence interne
LastRecorded=Derniers produits/services en vente enregistrés
LastRecordedProductsAndServices=Les %s derniers produits/services enregistrés

2
htdocs/langs/fr_FR/stocks.lang
View File

@ -103,7 +103,7 @@ CurentlyUsingVirtualStock=Stock théorique
CurentlyUsingPhysicalStock=Stock réel
RuleForStockReplenishment=Règle de gestion du réapprovisionnement des stocks
SelectProductWithNotNullQty=Sélectionnez au moins un produit avec une quantité non nulle et un fournisseur
AlertOnly= Alertes seulement
AlertOnly=Alertes seulement
WarehouseForStockDecrease=L'entrepôt <b>%s</b> sera utilisé pour la décrémentation du stock
WarehouseForStockIncrease=L'entrepôt <b>%s</b> sera utilisé pour l'incrémentation du stock
ForThisWarehouse=Pour cet entrepôt

10
htdocs/product/stock/massstockmove.php
View File

@ -265,7 +265,15 @@ print '<tr '.$bc[$var].'>';
print '<td colspan="2">';
$filtertype=0;
if (! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype='';
print $form->select_produits($id_product,'productid',$filtertype);
if ($conf->global->PRODUIT_LIMIT_SIZE <= 0)
{
$limit='';
}
else
{
$limit = $conf->global->PRODUIT_LIMIT_SIZE;
}
print $form->select_produits($id_product,'productid',$filtertype,$limit);
print '</td>';
// In warehouse
print '<td>';