admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1188 : display side for detail operation

Browse source
This commit is contained in:
Dany De Bontridder 2015-10-28 10:48:38 +01:00
parent 3920bb9ff8
commit 47bfc62a29
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/class/class_acc_operation.php
View file

@ -662,7 +662,7 @@ class Acc_Sold extends Acc_Detail
{
parent::get();
$sql="SELECT qs_id, qs_internal, qs_fiche, qs_quantite, qs_price, qs_vat,
qs_vat_code, qs_client, qs_valid, j_id,j_text,qs_vat_sided , qs_unit
qs_vat_code, qs_client, qs_valid, j_id,j_text,qs_vat_sided , qs_unit , j_debit
FROM quant_sold join jrnx using(j_id) where j_grpt=$1";
$this->det->array=$this->db->get_array($sql,array($this->det->jr_grpt_id));
}
@ -688,7 +688,7 @@ class Acc_Purchase extends Acc_Detail
parent::get();
$sql="SELECT qp_id, qp_internal, j_id, qp_fiche, qp_quantite, qp_price, qp_vat,
qp_vat_code, qp_nd_amount, qp_nd_tva, qp_nd_tva_recup, qp_supplier,
qp_valid, qp_dep_priv,j_text,qp_vat_sided,qp_unit
qp_valid, qp_dep_priv,j_text,qp_vat_sided,qp_unit , j_debit
FROM quant_purchase join jrnx using(j_id) where j_grpt=$1";
$this->det->array=$this->db->get_array($sql,array($this->det->jr_grpt_id));
}

4
include/template/ledger_detail_ach.php
View file

@ -217,12 +217,14 @@ $str_anc="";
$anc_op = new Anc_Operation($cn);
$anc_op->j_id = $q['j_id'];
$anc_op->in_div=$div;
$side=($q['j_debit'] == 'f')?'C':'D';
echo HtmlInput::hidden('op[]', $anc_op->j_id);
/* compute total price */
bcscale(2);
$str_anc.='<tr>';
$str_anc.=td($qcode);
$str_anc.=td(nbm($htva));
$str_anc.=td(nbm($htva)." {$side}");
$str_anc.=$anc_op->display_table(1, $htva, $div);
} else
{

4
include/template/ledger_detail_misc.php
View file

@ -166,11 +166,13 @@ $amount_idx=0;
$anc_op=new Anc_Operation($cn);
$anc_op->j_id=$q[$e]['j_id'];
$anc_op->in_div=$div;
$side=($q[$e]['j_debit'] == 'f')?'C':'D';
$str_anc.='<tr>';
$str_anc.=HtmlInput::hidden('op[]',$anc_op->j_id);
$str_anc.=td($q[$e]['j_qcode']);
$str_anc.=td($q[$e]['j_poste']);
$str_anc.=td($q[$e]['j_montant']);
$str_anc.=td(nbm($q[$e]['j_montant'])." {$side}");
$str_anc.=$anc_op->display_table(1,$q[$e]['j_montant'],$div);
$str_anc.='</tr>';
$amount_idx++;

3
include/template/ledger_detail_ven.php
View file

@ -215,12 +215,13 @@ echo $ipaid->input();
$anc_op = new Anc_Operation($cn);
$anc_op->in_div=$div;
$anc_op->j_id = $q['j_id'];
$side=($q['j_debit'] == 'f')?'C':'D';
echo HtmlInput::hidden('op[]', $anc_op->j_id);
/* compute total price */
bcscale(2);
$str_anc.='<tr>';
$str_anc.=td($qcode);
$str_anc.=td(nbm($htva));
$str_anc.=td(nbm($htva)." {$side}");
$str_anc.=$anc_op->display_table(1, $htva, $div).'</tr>';
// $row.=($div == 'popup') ? $anc_op->display_table(1, $htva, $div):"";
} else