Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #11071 from OPEN-DSI/fix-fourn--orderstoinvoice-reglement

Browse Source 
Fix default payment terms and method
This commit is contained in:
Laurent Destailleur
2019-04-25 19:03:58 +02:00
committed by GitHub
parent ad50aa2e79 e80436469f
commit c76c0e6fd0
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/fourn/commande/orderstoinvoice.php
View File

@@ -298,11 +298,23 @@ if ($action == 'create' && !$error) {
if ($socid) if ($socid)
$res = $soc->fetch($socid); $res = $soc->fetch($socid);
if ($res) { if ($res) {
$cond_reglement_id = $soc->cond_reglement_id; $cond_reglement_id = $soc->cond_reglement_supplier_id;
$mode_reglement_id = $soc->mode_reglement_id; $mode_reglement_id = $soc->mode_reglement_supplier_id;
} }
$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : ''; $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
$objectsrc = new CommandeFournisseur($db);
$listoforders = array();
foreach ($selected as $sel) {
$result = $objectsrc->fetch($sel);
if ($result > 0) {
$listoforders[] = $objectsrc->ref;
}
if (empty($cond_reglement_id)) $cond_reglement_id = $objectsrc->cond_reglement_id;
if (empty($mode_reglement_id)) $mode_reglement_id = $objectsrc->mode_reglement_id;
}
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">'; print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
@@ -350,15 +362,6 @@ if ($action == 'create' && !$error) {
print '</td></tr>'; print '</td></tr>';
} }
$objectsrc = new CommandeFournisseur($db);
$listoforders = array ();
foreach ($selected as $sel) {
$result = $objectsrc->fetch($sel);
if ($result > 0) {
$listoforders[] = $objectsrc->ref;
}
}
// Other attributes // Other attributes
$parameters = array ( $parameters = array (
'objectsrc' => $objectsrc, 'objectsrc' => $objectsrc,