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

Fixed: Add option on a not common new feature

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-28 00:34:03 +01:00
parent dc1c98734e
commit 232921a506
2 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/commande/card.php
View File

@ -1391,9 +1391,12 @@ if ($action == 'create' && $user->rights->commande->creer) {
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">'; if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
$form->select_comptes($fk_account, 'fk_account', 0, '', 1); {
print '</td></tr>'; print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
print '</td></tr>';
}
// Delivery delay // Delivery delay
print '<tr><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">'; print '<tr><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
@ -1995,21 +1998,24 @@ if ($action == 'create' && $user->rights->commande->creer) {
$rowspan ++; $rowspan ++;
// Bank Account // Bank Account
print '<tr><td class="nowrap">'; if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; {
print $langs->trans('BankAccount'); print '<tr><td class="nowrap">';
print '<td>'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
if ($action != 'editbankaccount' && $user->rights->commande->creer) print $langs->trans('BankAccount');
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>'; print '<td>';
print '</tr></table>'; if ($action != 'editbankaccount' && $user->rights->commande->creer)
print '</td><td colspan="3">'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
if ($action == 'editbankaccount') { print '</tr></table>';
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); print '</td><td colspan="3">';
} else { if ($action == 'editbankaccount') {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
} } else {
print '</td>'; $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
print '</tr>'; }
print '</td>';
print '</tr>';
}
// Total HT // Total HT
print '<tr><td>' . $langs->trans('AmountHT') . '</td>'; print '<tr><td>' . $langs->trans('AmountHT') . '</td>';

48
htdocs/fourn/commande/card.php
View File

@ -136,9 +136,10 @@ else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
} }
// bank account // bank account
else if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer) { else if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer)
{
$result=$object->setBankAccount(GETPOST('fk_account', 'int')); $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
} }
// date de livraison // date de livraison
if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer) if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer)
@ -1268,9 +1269,13 @@ if ($action=="create")
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">'; if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
$form->select_comptes($fk_account, 'fk_account', 0, '', 1); {
print '</td></tr>'; $langs->load("bank");
print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
print '</td></tr>';
}
print '<tr><td>'.$langs->trans('NotePublic').'</td>'; print '<tr><td>'.$langs->trans('NotePublic').'</td>';
print '<td>'; print '<td>';
@ -1539,21 +1544,24 @@ elseif (! empty($object->id))
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
print '<tr><td class="nowrap">'; if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; {
print $langs->trans('BankAccount'); print '<tr><td class="nowrap">';
print '<td>'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) print $langs->trans('BankAccount');
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>'; print '<td>';
print '</tr></table>'; if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer)
print '</td><td colspan="3">'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
if ($action == 'editbankaccount') { print '</tr></table>';
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); print '</td><td colspan="3">';
} else { if ($action == 'editbankaccount') {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
} } else {
print '</td>'; $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
print '</tr>'; }
print '</td>';
print '</tr>';
}
// Delivery date planed // Delivery date planed
print '<tr><td>'; print '<tr><td>';