X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=19a01cabbfe64952f350729c9a8839aa75d77319;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=7e526b5ba718cbd560418e42cbcbf34e74232ee9;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git diff --git a/reporting/rep707.php b/reporting/rep707.php index 7e526b5b..19a01cab 100644 --- a/reporting/rep707.php +++ b/reporting/rep707.php @@ -204,7 +204,7 @@ function print_profit_and_loss_statement() $dec = user_price_dec(); $pdec = user_percent_dec(); - $cols = array(0, 50, 200, 350, 425, 500); + $cols = array(0, 60, 200, 350, 425, 500); //------------0--1---2----3----4----5-- $headers = array(_('Account'), _('Account Name'), _('Period'), _('Accumulated'), _('Achieved %')); @@ -252,6 +252,8 @@ function print_profit_and_loss_statement() { $begin = add_months($from, -12); $end = add_months($to, -12); + if (date_comp($to, end_month($to)) == 0) // compensate for leap years. If to-date equal end month + $end = end_month($end); // then the year-1 should also be end month $headers[3] = _('Period Y-1'); } @@ -330,7 +332,7 @@ function print_profit_and_loss_statement() $pg->skin = $SysPrefs->graph_skin; $pg->built_in = false; $pg->latin_notation = ($SysPrefs->decseps[user_dec_sep()] != "."); - $filename = company_path(). "/pdf_files/". uniqid("").".png"; + $filename = company_path(). "/pdf_files/". random_id().".png"; $pg->display($filename, true); $w = $pg->width / 1.5; $h = $pg->height / 1.5;