Skip to content
Snippets Groups Projects
Commit 232921a5 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fixed: Add option on a not common new feature

parent dc1c9873
No related branches found
No related tags found
No related merge requests found
...@@ -1391,9 +1391,12 @@ if ($action == 'create' && $user->rights->commande->creer) { ...@@ -1391,9 +1391,12 @@ if ($action == 'create' && $user->rights->commande->creer) {
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
{
print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">'; print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1); $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
print '</td></tr>'; 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,6 +1998,8 @@ if ($action == 'create' && $user->rights->commande->creer) { ...@@ -1995,6 +1998,8 @@ if ($action == 'create' && $user->rights->commande->creer) {
$rowspan ++; $rowspan ++;
// Bank Account // Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
{
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount'); print $langs->trans('BankAccount');
...@@ -2010,6 +2015,7 @@ if ($action == 'create' && $user->rights->commande->creer) { ...@@ -2010,6 +2015,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
}
// Total HT // Total HT
print '<tr><td>' . $langs->trans('AmountHT') . '</td>'; print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
......
...@@ -136,7 +136,8 @@ else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer) ...@@ -136,7 +136,8 @@ 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'));
} }
...@@ -1268,9 +1269,13 @@ if ($action=="create") ...@@ -1268,9 +1269,13 @@ if ($action=="create")
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
{
$langs->load("bank");
print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">'; print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1); $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
print '</td></tr>'; print '</td></tr>';
}
print '<tr><td>'.$langs->trans('NotePublic').'</td>'; print '<tr><td>'.$langs->trans('NotePublic').'</td>';
print '<td>'; print '<td>';
...@@ -1539,6 +1544,8 @@ elseif (! empty($object->id)) ...@@ -1539,6 +1544,8 @@ elseif (! empty($object->id))
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
{
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount'); print $langs->trans('BankAccount');
...@@ -1554,6 +1561,7 @@ elseif (! empty($object->id)) ...@@ -1554,6 +1561,7 @@ elseif (! empty($object->id))
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
}
// Delivery date planed // Delivery date planed
print '<tr><td>'; print '<tr><td>';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment