Documentation and add toString to acc_operation and children
This commit is contained in:
sparkyx
parent
797b8bf254
commit
145301bd34
3 changed files with 73 additions and 30 deletions
|
|
@ -64,14 +64,14 @@ class Acc_Operation
|
|||
* \brief constructor set automatically the attributes user and periode
|
||||
* \param $p_cn the databse connection
|
||||
*/
|
||||
function __construct($p_cn)
|
||||
function __construct($p_cn,$p_jrid=0)
|
||||
{
|
||||
global $g_user;
|
||||
$this->db=$p_cn;
|
||||
$this->qcode="";
|
||||
$this->user=$_SESSION[SESSION_KEY.'g_user'];
|
||||
$this->periode=$g_user->get_periode();
|
||||
$this->jr_id=0;
|
||||
$this->jr_id=$p_jrid;
|
||||
$this->jr_optype="NOR";
|
||||
$this->amount=0;
|
||||
$this->currency_rate=1;
|
||||
|
|
@ -84,7 +84,7 @@ class Acc_Operation
|
|||
$r=<<<EOF
|
||||
Acc_Operation Object
|
||||
[
|
||||
db {$this->db}
|
||||
|
||||
qcode {$this->qcode}
|
||||
user {$this->user}
|
||||
periode {$this->periode}
|
||||
|
|
@ -1125,7 +1125,7 @@ class Acc_Detail extends Acc_Operation
|
|||
} else {
|
||||
$this->det->note=strip_tags($a['n_text']);
|
||||
$this->det->note_html=($a['n_html'] == "")?$a['n_text']:$a['n_html'];
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
*
|
||||
|
|
@ -1139,6 +1139,15 @@ class Acc_Detail extends Acc_Operation
|
|||
$array['p_jrn']=$this->det->jr_def_id;
|
||||
return $array;
|
||||
|
||||
}
|
||||
function __toString(): string
|
||||
{
|
||||
$r= __CLASS__;
|
||||
$r.="this->signature ".$this->signature."\n";
|
||||
$r.="this->det ".print_r($this->det,true);
|
||||
|
||||
return $r;
|
||||
|
||||
}
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -1210,6 +1219,15 @@ SELECT jx1.j_id
|
|||
|
||||
return $array;
|
||||
|
||||
}
|
||||
function __toString(): string
|
||||
{
|
||||
$r= __CLASS__;
|
||||
$r.="this->signature ".$this->signature."\n";
|
||||
$r.="this->det ".print_r($this->det,true);
|
||||
|
||||
return $r;
|
||||
|
||||
}
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -1225,33 +1243,33 @@ class Acc_Sold extends Acc_Detail
|
|||
{
|
||||
parent::__construct($p_cn,$p_jrid);
|
||||
$this->signature='VEN';
|
||||
$this->det=new stdClass();
|
||||
$this->det->array=new stdClass();
|
||||
}
|
||||
function get()
|
||||
{
|
||||
parent::get();
|
||||
$sql="
|
||||
select qs_id, qs_internal
|
||||
, jx1.j_id
|
||||
, qs1.qs_fiche
|
||||
, qs1.qs_quantite
|
||||
, qs1.qs_price
|
||||
, qs1.qs_vat
|
||||
, qs1.qs_vat_code
|
||||
, qs1.qs_client
|
||||
, qs1.qs_valid
|
||||
, jx1.j_text
|
||||
, qs_vat_sided
|
||||
, qs_unit
|
||||
, jx1.j_debit
|
||||
,oc1.oc_amount
|
||||
,oc1.oc_vat_amount
|
||||
,oc1.oc_price_unit
|
||||
from quant_sold qs1
|
||||
join jrnx jx1 using(j_id)
|
||||
left join operation_currency oc1 using(j_id)
|
||||
where jx1.j_grpt = $1
|
||||
order by jx1.j_id;
|
||||
, jx1.j_id
|
||||
, qs1.qs_fiche
|
||||
, qs1.qs_quantite
|
||||
, qs1.qs_price
|
||||
, qs1.qs_vat
|
||||
, qs1.qs_vat_code
|
||||
, qs1.qs_client
|
||||
, qs1.qs_valid
|
||||
, jx1.j_text
|
||||
, qs_vat_sided
|
||||
, qs_unit
|
||||
, jx1.j_debit
|
||||
,oc1.oc_amount
|
||||
,oc1.oc_vat_amount
|
||||
,oc1.oc_price_unit
|
||||
from quant_sold qs1
|
||||
join jrnx jx1 using(j_id)
|
||||
left join operation_currency oc1 using(j_id)
|
||||
where jx1.j_grpt = $1
|
||||
order by jx1.j_id;
|
||||
";
|
||||
$this->det->array=$this->db->get_array($sql,array($this->det->jr_grpt_id));
|
||||
}
|
||||
|
|
@ -1284,7 +1302,15 @@ order by jx1.j_id;
|
|||
return $array;
|
||||
|
||||
}
|
||||
|
||||
function __toString(): string
|
||||
{
|
||||
$r="";
|
||||
$r.="this->signature ".$this->signature."\n";
|
||||
$r.="this->det ".print_r($this->det,true);
|
||||
|
||||
return $r;
|
||||
|
||||
}
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
/**
|
||||
|
|
@ -1367,7 +1393,15 @@ order by jx1.j_id
|
|||
return $array;
|
||||
|
||||
}
|
||||
|
||||
function __toString(): string
|
||||
{
|
||||
$r= __CLASS__;
|
||||
$r.="this->signature ".$this->signature."\n";
|
||||
$r.="this->det ".print_r($this->det,true);
|
||||
|
||||
return $r;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -1425,5 +1459,13 @@ class Acc_Fin extends Acc_Detail
|
|||
return $array;
|
||||
|
||||
}
|
||||
|
||||
function __toString(): string
|
||||
{
|
||||
$r= __CLASS__;
|
||||
$r.="this->signature ".$this->signature."\n";
|
||||
$r.="this->det ".print_r($this->det,true);
|
||||
|
||||
return $r;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ if ( isset($_POST['record']) )
|
|||
$xmldocument->set_pdf_filename($pdf_filename);
|
||||
|
||||
// make the XML + PDF
|
||||
//@var $xml(XML String)
|
||||
$xml=$xmldocument->create_invoice($Ledger->jr_id);
|
||||
if (DEBUGNOALYSS > 1) {
|
||||
$mt=date ('ymd-Hi').'+'.$Ledger->jr_id;
|
||||
|
|
@ -231,7 +232,7 @@ if ( isset($_POST['record']) )
|
|||
echo \Noalyss\Dbg::echo_file("file save $uniq");
|
||||
|
||||
}
|
||||
// FOR BELGIUM : XML and PDF will be store separately
|
||||
// FOR BELGIUM : XML and PDF will be stored separately
|
||||
// save XML string into the DB
|
||||
$oid=$cn->lo_write($xml);
|
||||
echo \Noalyss\Dbg::echo_var(1, "oid is $oid");
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ VALUES('RAW:xml-invoice', 'Exporte la facture XML', 'export_xml-invoice.php', NU
|
|||
insert into profile_menu (me_code,p_id, p_type_display) select 'RAW:xml-invoice',p_id,'P' from profile;
|
||||
|
||||
alter table jrn_note add column n_html text;
|
||||
comment on columnt table.jrn_note is ' contains the HTML version from n_text';
|
||||
comment on column jrn_note.n_html is ' contains the HTML version from n_text';
|
||||
update jrn_note set n_html=n_text;
|
||||
|
||||
-- replace jrn_add_note
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue