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

NEW : can choose lines while creating order from origin

Browse Source
This commit is contained in:
Maxime Kohlhaas 2019-07-08 23:16:32 +02:00
parent 4387d40b9a
commit 9c47cb6f91
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/commande/card.php
View File

@ -232,6 +232,7 @@ if (empty($reshook))
{ {
$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year')); $datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
$selectedLines = GETPOST('toselect');
if ($datecommande == '') { if ($datecommande == '') {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@ -338,6 +339,8 @@ if (empty($reshook))
for($i = 0; $i < $num; $i ++) for($i = 0; $i < $num; $i ++)
{ {
if(!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
$label = (! empty($lines[$i]->label) ? $lines[$i]->label : ''); $label = (! empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : ''); $desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : '');
$product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0); $product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
@ -1870,8 +1873,6 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<input type="button" class="button" name="cancel" value="' . $langs->trans("Cancel") . '" onclick="javascript:history.go(-1)">'; print '<input type="button" class="button" name="cancel" value="' . $langs->trans("Cancel") . '" onclick="javascript:history.go(-1)">';
print '</div>'; print '</div>';
print '</form>';
// Show origin lines // Show origin lines
if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) { if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
$title = $langs->trans('ProductsAndServices'); $title = $langs->trans('ProductsAndServices');
@ -1883,6 +1884,8 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</table>'; print '</table>';
} }
print '</form>';
} else { } else {
// Mode view // Mode view
$now = dol_now(); $now = dol_now();

11
htdocs/core/class/commonobject.class.php
View File

@ -4145,7 +4145,7 @@ abstract class CommonObject
*/ */
public function printOriginLinesList($restrictlist = '') public function printOriginLinesList($restrictlist = '')
{ {
global $langs, $hookmanager, $conf; global $langs, $hookmanager, $conf, $form;
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Ref').'</td>'; print '<td>'.$langs->trans('Ref').'</td>';
@ -4158,8 +4158,9 @@ abstract class CommonObject
{ {
print '<td class="left">'.$langs->trans('Unit').'</td>'; print '<td class="left">'.$langs->trans('Unit').'</td>';
} }
print '<td class="right">'.$langs->trans('ReductionShort').'</td></tr>'; print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
print '</tr>';
$var = true; $var = true;
$i = 0; $i = 0;
@ -4200,7 +4201,7 @@ abstract class CommonObject
*/ */
public function printOriginLine($line, $var, $restrictlist = '', $defaulttpldir = '/core/tpl') public function printOriginLine($line, $var, $restrictlist = '', $defaulttpldir = '/core/tpl')
{ {
global $langs, $conf; global $langs, $conf, $selectedLines;
//var_dump($line); //var_dump($line);
if (!empty($line->date_start)) if (!empty($line->date_start))
@ -4222,6 +4223,8 @@ abstract class CommonObject
if ($line->date_fin_reel) $date_end=$line->date_fin_reel; if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
} }
$this->tpl['id'] = $line->id;
$this->tpl['label'] = ''; $this->tpl['label'] = '';
if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow'); if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

4
htdocs/core/tpl/originproductline.tpl.php
View File

@ -40,6 +40,10 @@ if($conf->global->PRODUCT_USE_UNITS)
print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>'; print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
print '<td class="right">'.$this->tpl['remise_percent'].'</td>'; print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
$selected=1;
if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) $selected=0;
print '<td class="center"><input id="cb'.$this->tpl['id'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->tpl['id'].'"'.($selected?' checked="checked"':'').'></td>';
print '</tr>'."\n"; print '</tr>'."\n";
?> ?>
<!-- END PHP TEMPLATE originproductline.tpl.php --> <!-- END PHP TEMPLATE originproductline.tpl.php -->