diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 5cb10e31e6d..3faa45d7d84 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -187,7 +187,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') print ""; print ""; print "fk_bank."\">"; - + dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment'); $linkback = ''.$langs->trans("BackToList").''; @@ -199,7 +199,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') print '
| '; print ' | '; @@ -516,6 +507,16 @@ if ($rowid > 0) print "||||
| '.$langs->trans("Ref").' | '.$object->id.' | |||
| '.$langs->trans("Ref").' | '.$object->id.' | |||
| '.$langs->trans("Label").' | ||||
| '.$langs->trans("Label").' | ||||
| '.$langs->trans("SubscriptionRequired").' | ';
print $form->selectyesno("subscription",$object->subscription,1);
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 3c47b188972..f33968e0ff9 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -26,8 +26,8 @@ ProductOrService=Product or Service
ProductsAndServices=Products and Services
ProductsOrServices=Products or Services
ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Product for purchase only
-ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
ProductsOnSellAndOnBuy=Products for sale and for purchase
ServicesOnSaleOnly=Services for sale only
ServicesOnPurchaseOnly=Services for purchase only
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 1d45e93590c..d3694e039eb 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -232,7 +232,7 @@ if ($resql)
$moreforfilter.='';
}
//$moreforfilter.=$langs->trans("StockTooLow").' ';
-
+
if (! empty($moreforfilter))
{
print ' ';
@@ -257,7 +257,7 @@ if ($resql)
print ' ';
print '
|