diff --git a/htdocs/product/card.php b/htdocs/product/card.php index af503d4a924..704a0db9442 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1010,13 +1010,13 @@ else { print ''; - // PRIX + // Price print ''; print ''; - // MIN PRICE + // Min price print ''; print ''; @@ -1031,28 +1031,21 @@ else print '
'; } - /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled)) - { - // Don't show accounting field when accounting id disabled. - } - else - {*/ - print '
'.$langs->trans("SellingPrice").''; print $form->selectPriceBaseType($object->price_base_type, "price_base_type"); print '
'.$langs->trans("MinPrice").''; print '
'; + print '
'; - // Accountancy_code_sell - print ''; - print ''; + // Accountancy_code_sell + print ''; + print ''; - // Accountancy_code_buy - print ''; - print ''; + // Accountancy_code_buy + print ''; + print ''; - print '
'.$langs->trans("ProductAccountancySellCode").''; - print '
'.$langs->trans("ProductAccountancySellCode").''; + print '
'.$langs->trans("ProductAccountancyBuyCode").''; - print '
'.$langs->trans("ProductAccountancyBuyCode").''; + print '
'; + print ''; - print '
'; - //} + print '
'; dol_fiche_end(); @@ -1435,22 +1428,15 @@ else print ''."\n"; } - /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled)) - { - // Don't show accounting field when accounting id disabled. - } - else - {*/ - // Accountancy sell code - print ''.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').''; - print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string'); - print ''; + // Accountancy sell code + print ''.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').''; + print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string'); + print ''; - // Accountancy buy code - print ''.$form->editfieldkey("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 ''; - //} + // Accountancy buy code + print ''.$form->editfieldkey("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 ''; // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')';