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

renaming exp to rcp

Browse Source
This commit is contained in:
atm-quentin 2018-10-18 15:11:43 +02:00
parent ba997a0d0f
commit 606011180b
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/reception/card.php
View File

@ -1909,7 +1909,7 @@ else if ($id || $ref)
{ {
print '<!-- case edit 1 -->'; print '<!-- case edit 1 -->';
print '<tr>'; print '<tr>';
// Qty to ship or shipped // Qty to receive or received
print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>'; print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
// Warehouse source // Warehouse source
print '<td>' . $formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>'; print '<td>' . $formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
@ -1929,7 +1929,7 @@ else if ($id || $ref)
{ {
print '<!-- case edit 2 -->'; print '<!-- case edit 2 -->';
print '<tr>'; print '<tr>';
// Qty to ship or shipped // Qty to receive or received
print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>'; print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
// Warehouse source // Warehouse source
print '<td>' . '</td>'; print '<td>' . '</td>';
@ -1942,33 +1942,21 @@ else if ($id || $ref)
} }
else else
{ {
// Qty to ship or shipped // Qty to receive or received
print '<td align="center">'.$lines[$i]->qty.'</td>'; print '<td align="center">'.$lines[$i]->qty.'</td>';
// Warehouse source // Warehouse source
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {
print '<td align="left">'; print '<td align="left">';
if ($lines[$i]->fk_entrepot > 0) if ($lines[$i]->fk_entrepot > 0)
{ {
$entrepot = new Entrepot($db); $entrepot = new Entrepot($db);
$entrepot->fetch($lines[$i]->fk_entrepot); $entrepot->fetch($lines[$i]->fk_entrepot);
print $entrepot->getNomUrl(1); print $entrepot->getNomUrl(1);
} }
else if (count($lines[$i]->details_entrepot) > 1)
{
$detail = '';
foreach ($lines[$i]->details_entrepot as $detail_entrepot)
{
if ($detail_entrepot->entrepot_id > 0)
{
$entrepot = new Entrepot($db);
$entrepot->fetch($detail_entrepot->entrepot_id);
$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
}
}
print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
}
print '</td>'; print '</td>';
} }
@ -2014,8 +2002,6 @@ else if ($id || $ref)
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
// Size
//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
if ($action == 'editline' && $lines[$i]->id == $line_id) if ($action == 'editline' && $lines[$i]->id == $line_id)
{ {

9
htdocs/reception/class/reception.class.php
View File

@ -1250,8 +1250,7 @@ class Reception extends CommonObject
$line->desc=$langs->trans("Description")." ".$xnbp; $line->desc=$langs->trans("Description")." ".$xnbp;
$line->libelle=$langs->trans("Description")." ".$xnbp; $line->libelle=$langs->trans("Description")." ".$xnbp;
$line->qty=10; $line->qty=10;
$line->qty_asked=5;
$line->qty_shipped=4;
$line->fk_product=$this->commande->lines[$xnbp]->fk_product; $line->fk_product=$this->commande->lines[$xnbp]->fk_product;
$this->lines[]=$line; $this->lines[]=$line;
@ -1508,7 +1507,7 @@ class Reception extends CommonObject
$langs->load("agenda"); $langs->load("agenda");
// Loop on each product line to add a stock movement // Loop on each product line to add a stock movement
// TODO possibilite d'expedier a partir d'une propale ou autre origine ? // TODO possibilite de receptionner a partir d'une propale ou autre origine ?
$sql = "SELECT cd.fk_product, cd.subprice,"; $sql = "SELECT cd.fk_product, cd.subprice,";
$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,"; $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
$sql.= " ed.eatby, ed.sellby, ed.batch"; $sql.= " ed.eatby, ed.sellby, ed.batch";
@ -1673,7 +1672,7 @@ class Reception extends CommonObject
$langs->load("agenda"); $langs->load("agenda");
// Loop on each product line to add a stock movement // Loop on each product line to add a stock movement
// TODO possibilite d'expedier a partir d'une propale ou autre origine // TODO possibilite de receptionner a partir d'une propale ou autre origine
$sql = "SELECT ed.fk_product, cd.subprice,"; $sql = "SELECT ed.fk_product, cd.subprice,";
$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,"; $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
$sql.= " ed.eatby, ed.sellby, ed.batch"; $sql.= " ed.eatby, ed.sellby, ed.batch";
@ -1809,7 +1808,7 @@ class Reception extends CommonObject
$langs->load("agenda"); $langs->load("agenda");
// Loop on each product line to add a stock movement // Loop on each product line to add a stock movement
// TODO possibilite d'expedier a partir d'une propale ou autre origine // TODO possibilite de receptionner a partir d'une propale ou autre origine
$sql = "SELECT cd.fk_product, cd.subprice,"; $sql = "SELECT cd.fk_product, cd.subprice,";
$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,"; $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
$sql.= " ed.eatby, ed.sellby, ed.batch"; $sql.= " ed.eatby, ed.sellby, ed.batch";

10
htdocs/reception/list.php
View File

@ -49,7 +49,7 @@ $result = restrictedArea($user, 'reception',$receptionid,'');
$diroutputmassaction=$conf->reception->dir_output . '/temp/massgeneration/'.$user->id; $diroutputmassaction=$conf->reception->dir_output . '/temp/massgeneration/'.$user->id;
$search_ref_exp = GETPOST("search_ref_exp"); $search_ref_rcp = GETPOST("search_ref_rcp");
$search_ref_liv = GETPOST('search_ref_liv'); $search_ref_liv = GETPOST('search_ref_liv');
$search_ref_supplier = GETPOST('search_ref_supplier'); $search_ref_supplier = GETPOST('search_ref_supplier');
$search_company = GETPOST("search_company"); $search_company = GETPOST("search_company");
@ -138,7 +138,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
{ {
$search_ref_supplier=''; $search_ref_supplier='';
$search_ref_exp=''; $search_ref_rcp='';
$search_ref_liv=''; $search_ref_liv='';
$search_company=''; $search_company='';
$search_town=''; $search_town='';
@ -467,7 +467,7 @@ if ($search_zip) $sql.= natural_search("s.zip",$search_zip);
if ($search_state) $sql.= natural_search("state.nom",$search_state); if ($search_state) $sql.= natural_search("state.nom",$search_state);
if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')'; if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp); if ($search_ref_rcp) $sql .= natural_search('e.ref', $search_ref_rcp);
if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv); if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
if ($search_company) $sql .= natural_search('s.nom', $search_company); if ($search_company) $sql .= natural_search('s.nom', $search_company);
if ($search_ref_supplier) $sql .= natural_search('e.ref_supplier', $search_ref_supplier); if ($search_ref_supplier) $sql .= natural_search('e.ref_supplier', $search_ref_supplier);
@ -516,7 +516,7 @@ if ($resql)
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
if ($sall) $param.= "&amp;sall=".$sall; if ($sall) $param.= "&amp;sall=".$sall;
if ($search_ref_exp) $param.= "&amp;search_ref_exp=".$search_ref_exp; if ($search_ref_rcp) $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
if ($search_ref_liv) $param.= "&amp;search_ref_liv=".$search_ref_liv; if ($search_ref_liv) $param.= "&amp;search_ref_liv=".$search_ref_liv;
if ($search_company) $param.= "&amp;search_company=".$search_company; if ($search_company) $param.= "&amp;search_company=".$search_company;
if ($optioncss != '') $param.='&amp;optioncss='.$optioncss; if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
@ -630,7 +630,7 @@ if ($resql)
if (! empty($arrayfields['e.ref']['checked'])) if (! empty($arrayfields['e.ref']['checked']))
{ {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">'; print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
print '</td>'; print '</td>';
} }
// Ref customer // Ref customer