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

Reverted $rowid instead of $id property

Browse Source
This commit is contained in:
Marcos García de La Fuente 2015-03-23 01:17:43 +01:00
parent 4349f27299
commit 3d50b41b8e
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/class/commande.class.php
View File

@ -3178,7 +3178,6 @@ class Commande extends CommonOrder
$this->lines[$i] = new OrderLine($this->db);
$this->lines[$i]->id = $obj->rowid;
$this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label;
$this->lines[$i]->description = $obj->description;
$this->lines[$i]->fk_product = $obj->fk_product;

1
htdocs/compta/facture/class/facture.class.php
View File

@ -3408,7 +3408,6 @@ class Facture extends CommonInvoice
$this->lines[$i] = new FactureLigne($this->db);
$this->lines[$i]->id = $obj->rowid;
$this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label; // deprecated
$this->lines[$i]->description = $obj->description;
$this->lines[$i]->fk_product = $obj->fk_product;

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

@ -2821,7 +2821,7 @@ abstract class CommonObject
if (! empty($line->date_end)) $type=1; // deprecated
// Ligne en mode visu
if ($action != 'editline' || $selected != $line->rowid)
if ($action != 'editline' || $selected != $line->id)
{
// Product
if ($line->fk_product > 0)
@ -2879,7 +2879,7 @@ abstract class CommonObject
}
// Ligne en mode update
if ($this->statut == 0 && $action == 'editline' && $selected == $line->rowid)
if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
{
$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"';

2
htdocs/core/class/commonobjectline.class.php
View File

@ -31,13 +31,13 @@ abstract class CommonObjectLine extends CommonObject
/**
* Id of the line
* @var int
* @deprecated Use $rowid
*/
public $id;
/**
* Id of the line
* @var int
* @deprecated Try to use id property as possible
*/
public $rowid;

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

@ -53,9 +53,9 @@ $coldisplay=-1; // We remove first td
?>
<tr <?php echo $bc[$var]; ?>>
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><?php $coldisplay+=(! empty($conf->global->MAIN_VIEW_LINE_NUMBER))?2:1; ?>
<div id="line_<?php echo $line->rowid; ?>"></div>
<div id="line_<?php echo $line->id; ?>"></div>
<input type="hidden" name="lineid" value="<?php echo $line->rowid; ?>">
<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
<input type="hidden" id="product_id" name="productid" value="<?php echo (! empty($line->fk_product)?$line->fk_product:0); ?>" />
<input type="hidden" id="special_code" name="special_code" value="<?php echo $line->special_code; ?>">

12
htdocs/core/tpl/objectline_view.tpl.php
View File

@ -48,11 +48,11 @@ if (empty($usemargins)) $usemargins=0;
?>
<?php $coldisplay=0; ?>
<!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
<tr <?php echo 'id="row-'.$line->rowid.'" '.$bcdd[$var]; ?>>
<tr <?php echo 'id="row-'.$line->id.'" '.$bcdd[$var]; ?>>
<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
<td align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
<?php } ?>
<td><?php $coldisplay++; ?><div id="line_<?php echo $line->rowid; ?>"></div>
<td><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
<?php if (($line->info_bits & 2) == 2) { ?>
<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
<?php
@ -183,7 +183,7 @@ if (empty($usemargins)) $usemargins=0;
<td align="center"><?php $coldisplay++; ?>
<?php if (($line->info_bits & 2) == 2) { ?>
<?php } else { ?>
<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->rowid.'#line_'.$line->rowid; ?>">
<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
<?php echo img_edit(); ?>
</a>
<?php } ?>
@ -192,7 +192,7 @@ if (empty($usemargins)) $usemargins=0;
<td align="center"><?php $coldisplay++; ?>
<?php
if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->rowid . '">';
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
print img_delete();
print '</a>';
}
@ -202,12 +202,12 @@ if (empty($usemargins)) $usemargins=0;
<?php if ($num > 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?>
<td align="center" class="tdlineupdown"><?php $coldisplay++; ?>
<?php if ($i > 0) { ?>
<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->rowid; ?>">
<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
<?php echo img_up('default',0,'imgupforline'); ?>
</a>
<?php } ?>
<?php if ($i < $num-1) { ?>
<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->rowid; ?>">
<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
<?php echo img_down('default',0,'imgdownforline'); ?>
</a>
<?php } ?>

1
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -260,7 +260,6 @@ class CommandeFournisseur extends CommonOrder
$line = new CommandeFournisseurLigne($this->db);
$line->id = $objp->rowid;
$line->rowid = $objp->rowid;
$line->desc = $objp->description;
$line->description = $objp->description;
$line->qty = $objp->qty;