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

Product card: remove old code

Browse Source
This commit is contained in:
aspangaro 2015-07-16 05:31:05 +02:00
parent f3c3bb708f
commit 8689b22e14
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/product/card.php
View File

@ -1010,13 +1010,13 @@ else
{ {
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// PRIX // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td>'; print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
print '<td><input name="price" size="10" value="'.$object->price.'">'; print '<td><input name="price" size="10" value="'.$object->price.'">';
print $form->selectPriceBaseType($object->price_base_type, "price_base_type"); print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
print '</td></tr>'; print '</td></tr>';
// MIN PRICE // Min price
print '<tr><td>'.$langs->trans("MinPrice").'</td>'; print '<tr><td>'.$langs->trans("MinPrice").'</td>';
print '<td><input name="price_min" size="10" value="'.$object->price_min.'">'; print '<td><input name="price_min" size="10" value="'.$object->price_min.'">';
print '</td></tr>'; print '</td></tr>';
@ -1031,28 +1031,21 @@ else
print '<br>'; print '<br>';
} }
/*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled)) print '<table class="border" width="100%">';
{
// Don't show accounting field when accounting id disabled.
}
else
{*/
print '<table class="border" width="100%">';
// Accountancy_code_sell // Accountancy_code_sell
print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>'; print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">'; print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
print '</td></tr>'; print '</td></tr>';
// Accountancy_code_buy // Accountancy_code_buy
print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>'; print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">'; print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '<br>'; print '<br>';
//}
dol_fiche_end(); dol_fiche_end();
@ -1435,22 +1428,15 @@ else
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
/*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled)) // Accountancy sell code
{ print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
// Don't show accounting field when accounting id disabled. print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
} print '</td></tr>';
else
{*/
// Accountancy sell code
print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
print '</td></tr>';
// Accountancy buy code // Accountancy buy code
print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">'; print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string'); print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
print '</td></tr>'; print '</td></tr>';
//}
// Status (to sell) // Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';