diff --git a/include/class/anc_acc_list.class.php b/include/class/anc_acc_list.class.php index f25987e63..0d4a2f24f 100644 --- a/include/class/anc_acc_list.class.php +++ b/include/class/anc_acc_list.class.php @@ -32,6 +32,7 @@ class Anc_Acc_List extends Anc_Acc_Link { + var $arow; //!< $arow array of row from /** *@brief display form to get the parameter * - card_poste 1 by card, 2 by account diff --git a/include/class/forecast.class.php b/include/class/forecast.class.php index a298d0250..bb88d201b 100644 --- a/include/class/forecast.class.php +++ b/include/class/forecast.class.php @@ -25,6 +25,7 @@ /*! * \brief manage the table forecast */ +#[\AllowDynamicProperties] class Forecast { private static $variable=array ("id"=>"f_id", diff --git a/include/class/print_ledger.class.php b/include/class/print_ledger.class.php index 8f92ebca3..718eb14bf 100644 --- a/include/class/print_ledger.class.php +++ b/include/class/print_ledger.class.php @@ -32,32 +32,34 @@ class Print_Ledger extends PDF { protected $filter_operation; // See Acc_Ledger_History::filter_operation - private $ledger ; //!< concerned Ledger - private $from ; //previous_amount + protected $rap_htva; //!< $rap_htva (float) previous price w/o VAT + protected $rap_tvac; //!< $rap_tvac (float) previous amount + //All Tax Include (full price) + protected $rap_tva; //!< $rap_tva array(tva_id,amount) + protected $rap_priv; //!< $rap_priv (float) personal expense + protected $rap_other_tax; //!< $rap_other_tav, amount to report for other tax than VAT + protected $other_tax_previous;//! $other_tax_previous (array) + //see Acc_Ledger->previous_other_tax + protected $a_Tva; //!< $a_Tva array ( tva_id,tva_label,tva_poste ) of existing_vat + protected $jrn_type; //get_ledger()->get_operation($this->get_from(),$this->get_to()); $this->SetFont('DejaVu','BI',7); - $this->write_cell(215,7,'report Débit',0,0,'R'); + $this->write_cell(155,7,'report Débit',0,0,'R'); $this->write_cell(30,7,nbm($rap_deb),0,0,'R'); $this->line_new(4); - $this->write_cell(215,7,'report Crédit',0,0,'R'); + $this->write_cell(155,7,'report Crédit',0,0,'R'); $this->write_cell(30,7,nbm($rap_cred),0,0,'R'); - $this->line_new(4); + $this->line_new(10); // print all operation for ($i=0;$i< count($array);$i++) @@ -92,13 +92,14 @@ class Print_Ledger_Detail extends Print_Ledger $this->SetFont('DejaVuCond','B',7); $row=$array[$i]; - $this->write_multi(20,3,$row['pj']); - $this->write_cell(15,7,$row['date_fmt']); - $this->write_cell(20,7,$row['internal']); - $this->write_multi(170,3,$row['comment']); - $this->write_cell(20,7,nbm($row['montant']),0,0,'R'); + $this->write_multi(20, 4,$row['pj'],'T'); + $this->write_cell(15,4,$row['date_fmt'],'T'); + $this->write_cell(20,4,$row['internal'],'T'); + $this->write_multi(100,4,$row['comment'],'T'); + $this->write_cell(40,4,nbm($row['montant']),'T',0,'R'); + - $this->line_new(); + $this->line_new(7); // get the entries $aEntry=$this->cn->get_array("select j_id,j_poste,j_qcode,j_montant,j_debit, j_text,". " case when j_text='' or j_text is null then pcm_lib else j_text end as desc,". @@ -126,7 +127,7 @@ class Print_Ledger_Detail extends Print_Ledger } else $name=$entry['desc']; - $this->write_cell(150,6,$name,0,0,'L'); + $this->write_cell(100,6,$name,0,0,'L'); // print amount $str_amount=nbm($entry['j_montant']); @@ -134,6 +135,7 @@ class Print_Ledger_Detail extends Print_Ledger { $this->write_cell(20,6,$str_amount,0,0,'R'); $this->write_cell(20,6,'',0,0,'R'); + } else { @@ -142,6 +144,7 @@ class Print_Ledger_Detail extends Print_Ledger } $this->line_new(4); } + $this->line_new(3); } } } diff --git a/include/class/print_ledger_fin.class.php b/include/class/print_ledger_fin.class.php index ab768ded0..2086263cf 100644 --- a/include/class/print_ledger_fin.class.php +++ b/include/class/print_ledger_fin.class.php @@ -32,7 +32,6 @@ class Print_Ledger_Financial extends Print_Ledger { private $rap_amount; /* amount from begining exercice */ private $tp_amount; /* amount total page */ - private $jrn_type; //!< $jrn_type (VEN,ACH,ODS,FIN) ledger type function __construct(Database $p_cn, Acc_Ledger $p_jrn,$p_from,$p_to) { diff --git a/include/class/print_ledger_simple.class.php b/include/class/print_ledger_simple.class.php index a3ea4bc55..766546f60 100644 --- a/include/class/print_ledger_simple.class.php +++ b/include/class/print_ledger_simple.class.php @@ -33,28 +33,7 @@ class Print_Ledger_Simple extends \Print_Ledger { - private $a_Tva; //!< $a_Tva array ( tva_id,tva_label,tva_poste ) of existing_vat - private $rap_tva; //!< $rap_tva array(tva_id,amount) - private $rap_other_tax; //!< $rap_other_tav, amount to report for other tax than VAT - private $jrn_type;//! $jrn_type (string) 'VEN','ACH','ODS','FIN' - private $previous;//! $previous (array) see Acc_Ledger->previous_amount - private $other_tax_previous;//! $other_tax_previous (array) - //see Acc_Ledger->previous_other_tax - private $rap_htva; //!< $rap_htva (float) previous price w/o VAT - private $rap_tvac; //!< $rap_tvac (float) previous amount - //All Tax Include (full price) - private $rap_priv; //!< $rap_priv (float) personal expense - private $rap_nd; //!< $rap_nd (float) $no-deductible tax - private $rap_tva_np; //!< $rap_tva_np VAT not deductible - private $flag_other_tax; //!< $flag_other_tax(bool) true if other tax exists - private $tp_htva; //!< $tp_htva (float) total page price w/o VAT - private $tp_tva; //!< $tp_tva (float) total page VAT - private $tp_tvac; //!< $tp_tvac (float) total page full price All Tax Incl. - private $tp_priv;//!< $tp_priv (float) total page personal expense - private $tp_nd;//!< $tp_nd (float) total page price w/o VAT - private $tp_tva_np;//!< $tp_tva_np (float) total page not deductible - private $tp_other_tax;//!< $tp_other_tax (float) other tax - + public function __construct ($p_cn, Acc_Ledger $p_jrn,$p_from,$p_to,$p_filter_operation) { diff --git a/unit-test/include/class/AccountRepositoryTest.php b/unit-test/include/class/AccountRepositoryTest.php index e0088d066..97c8f32f4 100644 --- a/unit-test/include/class/AccountRepositoryTest.php +++ b/unit-test/include/class/AccountRepositoryTest.php @@ -137,6 +137,7 @@ class AccountRepositoryTest extends TestCase { /** * @testdox create a repository + * @backupGlobals disabled */ function testCreate() { try { diff --git a/unit-test/include/class/acc_ledger_purchaseTest.php b/unit-test/include/class/acc_ledger_purchaseTest.php index 19289225a..c41f20bf3 100644 --- a/unit-test/include/class/acc_ledger_purchaseTest.php +++ b/unit-test/include/class/acc_ledger_purchaseTest.php @@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase; * @covers Fiche * */ +#[\AllowDynamicProperties] class Acc_Ledger_PurchaseTest extends TestCase { diff --git a/unit-test/include/class/acc_ledger_saleTest.php b/unit-test/include/class/acc_ledger_saleTest.php index b9eb6756e..da3be8d85 100644 --- a/unit-test/include/class/acc_ledger_saleTest.php +++ b/unit-test/include/class/acc_ledger_saleTest.php @@ -6,6 +6,7 @@ use PHPUnit\Framework\TestCase; * @backupGlobals enabled * @coversDefaultClass Acc_Ledger_Sale */ +#[\AllowDynamicProperties] class Acc_Ledger_SaleTest extends TestCase { diff --git a/unit-test/include/class/acc_letterTest.php b/unit-test/include/class/acc_letterTest.php index 55aedca12..efa3797c3 100644 --- a/unit-test/include/class/acc_letterTest.php +++ b/unit-test/include/class/acc_letterTest.php @@ -32,7 +32,7 @@ use PHPUnit\Framework\TestCase; * @backupGlobals enabled */ require DIRTEST.'/global.php'; - +#[\AllowDynamicProperties] class Acc_LetterTest extends TestCase { /** diff --git a/unit-test/include/class/acc_operationTest.php b/unit-test/include/class/acc_operationTest.php index ba9c9335e..e2c16dee6 100644 --- a/unit-test/include/class/acc_operationTest.php +++ b/unit-test/include/class/acc_operationTest.php @@ -4,6 +4,7 @@ use PHPUnit\Framework\TestCase; * Generated by PHPUnit_SkeletonGenerator on 2016-02-13 at 00:41:50. * @backupGlobals enabled */ +#[\AllowDynamicProperties] class Acc_OperationTest extends TestCase { /** diff --git a/unit-test/include/class/followup_detail.Test.php b/unit-test/include/class/followup_detail.Test.php index 74e3520ec..3463984ab 100644 --- a/unit-test/include/class/followup_detail.Test.php +++ b/unit-test/include/class/followup_detail.Test.php @@ -33,7 +33,7 @@ use PHPUnit\Framework\TestCase; * @coversDefaultClass \Follow_Up_Detail */ - +#[\AllowDynamicProperties] class Follow_Up_DetailTest extends TestCase { diff --git a/unit-test/include/class/pdf_anc_acc_listTest.php b/unit-test/include/class/pdf_anc_acc_listTest.php index 475e093c1..60f99bfe1 100644 --- a/unit-test/include/class/pdf_anc_acc_listTest.php +++ b/unit-test/include/class/pdf_anc_acc_listTest.php @@ -32,7 +32,7 @@ use PHPUnit\Framework\TestCase; * @backupGlobals enabled */ require DIRTEST.'/global.php'; - +#[\AllowDynamicProperties] class PDF_Anc_Acc_ListTest extends TestCase { diff --git a/unit-test/include/class/print_LedgerTest.php b/unit-test/include/class/print_LedgerTest.php index ad1ea84e4..c4ef54953 100644 --- a/unit-test/include/class/print_LedgerTest.php +++ b/unit-test/include/class/print_LedgerTest.php @@ -26,6 +26,7 @@ use PHPUnit\Framework\TestCase; * @brief concerne print_LedgerTest * @coversDefaultClass Print_Ledger */ +#[\AllowDynamicProperties] class print_LedgerTest extends TestCase { diff --git a/unit-test/include/class/print_ledger_detail.classTest.php b/unit-test/include/class/print_ledger_detailTest.php similarity index 98% rename from unit-test/include/class/print_ledger_detail.classTest.php rename to unit-test/include/class/print_ledger_detailTest.php index 055549b0b..eb85db112 100644 --- a/unit-test/include/class/print_ledger_detail.classTest.php +++ b/unit-test/include/class/print_ledger_detailTest.php @@ -27,7 +27,7 @@ use PHPUnit\Framework\TestCase; * @coversDefaultClass Print_Ledger_Detail */ require DIRTEST.'/global.php'; - +#[\AllowDynamicProperties] class Print_Ledger_DetailTest extends TestCase {