Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2014-10-18 15:39:24 +02:00
commit 331e047c6d

View File

@ -278,12 +278,20 @@ if ($id > 0 || $ref)
// Status (to sell) // Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>'; print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
print ajax_productonoff($product->id, 'status');
} else {
print $product->getLibStatut(2,0); print $product->getLibStatut(2,0);
}
print '</td></tr>'; print '</td></tr>';
// Status (to buy) // Status (to buy)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>'; print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
print ajax_productonoff($product->id, 'status_buy');
} else {
print $product->getLibStatut(2,1); print $product->getLibStatut(2,1);
}
print '</td></tr>'; print '</td></tr>';
if ($conf->productbatch->enabled) { if ($conf->productbatch->enabled) {