This list is closed, nobody may subscribe to it.
2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <rc...@us...> - 2016-03-24 17:10:04
|
Revision: 7480 http://sourceforge.net/p/web-erp/reponame/7480 Author: rchacon Date: 2016-03-24 17:10:01 +0000 (Thu, 24 Mar 2016) Log Message: ----------- Minor changes: standardise names and variables in horizontal analysis. Modified Paths: -------------- trunk/AnalysisHorizontalIncome.php trunk/AnalysisHorizontalPosition.php trunk/doc/Manual/ManualGeneralLedger.html Modified: trunk/AnalysisHorizontalIncome.php =================================================================== --- trunk/AnalysisHorizontalIncome.php 2016-03-24 02:22:23 UTC (rev 7479) +++ trunk/AnalysisHorizontalIncome.php 2016-03-24 17:10:01 UTC (rev 7480) @@ -2,10 +2,10 @@ /* $Id: AnalysisHorizontalIncome.php 7349 2015-09-14 14:43:19Z rchacon $*/ /* Shows the horizontal analysis of the statement of comprehensive income. */ -function RelativeChange($SelectedPeriod, $PreviousPeriod) { +function RelativeChange($selected_period, $previous_period) { // Calculates the relative change between selected and previous periods. Uses percent with locale number format. - if($PreviousPeriod<>0) { - return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%'; + if($previous_period<>0) { + return locale_number_format(($selected_period-$previous_period)*100/$previous_period, $_SESSION['CompanyRecord']['decimalplaces']) . '%'; } else { return _('N/A'); } @@ -157,8 +157,8 @@ } else {// Summary report: echo '<th class="text" colspan="2">', _('Summary'), '</th>'; } - echo '<th class="number">', ' - ', $myrow[0], '</th> - <th class="number">', _('Last Year'), '</th> + echo '<th class="number">', _('Current period'), '</th> + <th class="number">', _('Last period'), '</th> <th class="number">', _('Actual change'), '</th> <th class="number">', _('Relative change'), '</th> </tr> @@ -183,8 +183,8 @@ SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd, SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwdly, SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwdly - FROM chartmaster - INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname + FROM chartmaster + INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1 WHERE accountgroups.pandl=1 Modified: trunk/AnalysisHorizontalPosition.php =================================================================== --- trunk/AnalysisHorizontalPosition.php 2016-03-24 02:22:23 UTC (rev 7479) +++ trunk/AnalysisHorizontalPosition.php 2016-03-24 17:10:01 UTC (rev 7480) @@ -2,10 +2,10 @@ /* $Id: AnalysisHorizontalPosition.php 7349 2015-09-14 14:43:19Z rchacon $*/ /* Shows the horizontal analysis of the statement of financial position. */ -function RelativeChange($SelectedPeriod, $PreviousPeriod) { +function RelativeChange($selected_period, $previous_period) { // Calculates the relative change between selected and previous periods. Uses percent with locale number format. - if($PreviousPeriod<>0) { - return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%'; + if($previous_period<>0) { + return locale_number_format(($selected_period-$previous_period)*100/$previous_period, $_SESSION['CompanyRecord']['decimalplaces']) . '%'; } else { return _('N/A'); } @@ -57,15 +57,6 @@ } echo ' value="', $myrow['periodno'], '">', MonthAndYearFromSQLDate($myrow['lastdate_in_period']), '</option>'; } -/* - while($myrow=DB_fetch_array($Periods)) { - echo '<option'; - if($myrow['periodno']==$DefaultToPeriod) { - echo ' selected="selected"'; - } - echo ' value="', $myrow['periodno'], '">', MonthAndYearFromSQLDate($myrow['lastdate_in_period']), '</option>'; - } -*/ echo '</select></td> </tr> <tr> @@ -120,8 +111,8 @@ } else {// Summary report: echo '<th class="text" colspan="2">', _('Summary'), '</th>'; } - echo '<th class="number">', $BalanceDate, '</th> - <th class="number">', _('Last Year'), '</th> + echo '<th class="number">', _('Current period'), '</th> + <th class="number">', _('Last period'), '</th> <th class="number">', _('Actual change'), '</th> <th class="number">', _('Relative change'), '</th> </tr> @@ -156,8 +147,8 @@ chartmaster.accountname, Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd, Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwdly - FROM chartmaster - INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname + FROM chartmaster + INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1 WHERE accountgroups.pandl=0 Modified: trunk/doc/Manual/ManualGeneralLedger.html =================================================================== --- trunk/doc/Manual/ManualGeneralLedger.html 2016-03-24 02:22:23 UTC (rev 7479) +++ trunk/doc/Manual/ManualGeneralLedger.html 2016-03-24 17:10:01 UTC (rev 7480) @@ -364,9 +364,9 @@ <li> <h3><a id="AnalysisHorizontal">Horizontal analysis</a></h3> <p>The horizontal analysis, also known as trend analysis, is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.</p> - <p>The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).</p> - <p>The absolute variation is calculated as <i>selected_period</i> - <i>previous_period</i>. - <p>The relative variation is calculated as (<i>selected_period</i> - <i>previous_period</i>) / <i>previous_period</i> * 100. + <p>The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (actual change) and percentage (relative change).</p> + <p>The actual change is calculated as <i>selected_period</i> - <i>previous_period</i>. + <p>The relative change is calculated as (<i>selected_period</i> - <i>previous_period</i>) / <i>previous_period</i> * 100. <h4><a id="AnalysisHorizontalPosition">Horizontal Analysis of Statement of Financial Position</a></h4> <p>The debit amounts (assets) of the selected and previous statement of financial position are shown as positive numbers; the credit amounts (liabilities and equity) are shown as negative numbers.</p> <p>The sources of funds are shown as positive numbers in the absolute variation column; the applications of funds are shown as negative numbers in the absolute variation column.</p> |
From: <ex...@us...> - 2016-03-24 02:22:26
|
Revision: 7479 http://sourceforge.net/p/web-erp/reponame/7479 Author: exsonqu Date: 2016-03-24 02:22:23 +0000 (Thu, 24 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-24 02:21:39 UTC (rev 7478) +++ trunk/doc/Change.log 2016-03-24 02:22:23 UTC (rev 7479) @@ -1,5 +1,7 @@ webERP Change Log +24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php. +18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php. 18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php. 10/03/2016 Tim: Fixed the credit note tax authority not set up bug in SelectCreditItems.php. Reported by Bob. 03/09/16 Exson: Fixed the bug of wrong location selected when add items to Work Orders in WorkOrderEntry.php. |
From: <ex...@us...> - 2016-03-24 02:21:40
|
Revision: 7478 http://sourceforge.net/p/web-erp/reponame/7478 Author: exsonqu Date: 2016-03-24 02:21:39 +0000 (Thu, 24 Mar 2016) Log Message: ----------- 24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php. Modified Paths: -------------- trunk/MRPReport.php Modified: trunk/MRPReport.php =================================================================== --- trunk/MRPReport.php 2016-03-18 08:09:22 UTC (rev 7477) +++ trunk/MRPReport.php 2016-03-24 02:21:39 UTC (rev 7478) @@ -184,7 +184,7 @@ $pdf->addTextWrap(410,$YPos,50,$FontSize,locale_number_format($qoh,$myrow['decimalplaces']),'right'); $YPos -=$line_height; $pdf->addTextWrap($Left_Margin,$YPos,30,$FontSize,_('Desc:'),''); - $pdf->addTextWrap(70,$YPos,150,$FontSize,$myrow['description'],''); + $pdf->addTextWrap(70,$YPos,240,$FontSize,$myrow['description'],''); $pdf->addTextWrap(245,$YPos,40,$FontSize,_('Pan Size:'),'right'); $pdf->addTextWrap(285,$YPos,45,$FontSize,locale_number_format($myrow['pansize'],$myrow['decimalplaces']),'right'); $pdf->addTextWrap(360,$YPos,50,$FontSize,_('On Order:'),'right'); |
From: <ex...@us...> - 2016-03-18 08:09:24
|
Revision: 7477 http://sourceforge.net/p/web-erp/reponame/7477 Author: exsonqu Date: 2016-03-18 08:09:22 +0000 (Fri, 18 Mar 2016) Log Message: ----------- 18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php. Modified Paths: -------------- trunk/GLAccountInquiry.php Modified: trunk/GLAccountInquiry.php =================================================================== --- trunk/GLAccountInquiry.php 2016-03-18 07:54:29 UTC (rev 7476) +++ trunk/GLAccountInquiry.php 2016-03-18 08:09:22 UTC (rev 7477) @@ -62,7 +62,6 @@ if($myrow['accountcode'] == $SelectedAccount){ if (!is_null($myrow['bankact'])) { $BankAccount = true; - $BankCurrency = $myrow['currcode']; } echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>'; } else { @@ -297,10 +296,10 @@ $BankRef = $bankrow['ref']; $OrgAmt = $bankrow['amount']; $Currency = $bankrow['currcode']; - } elseif(isset($BankCurrency)){ + } elseif(isset($BankAccount)){ $BankRef = ''; $OrgAmt = $myrow['amount']; - $Currency = $BankCurrency; + $Currency = $_SESSION['CompanyRecord']['currencydefault']; } } |
From: <ex...@us...> - 2016-03-18 07:54:31
|
Revision: 7476 http://sourceforge.net/p/web-erp/reponame/7476 Author: exsonqu Date: 2016-03-18 07:54:29 +0000 (Fri, 18 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-18 07:53:53 UTC (rev 7475) +++ trunk/doc/Change.log 2016-03-18 07:54:29 UTC (rev 7476) @@ -1,4 +1,6 @@ webERP Change Log + +18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php. 10/03/2016 Tim: Fixed the credit note tax authority not set up bug in SelectCreditItems.php. Reported by Bob. 03/09/16 Exson: Fixed the bug of wrong location selected when add items to Work Orders in WorkOrderEntry.php. 9/3/16 Andrew Galuski: Fix FormDesigner requires casting XML elements as strings |
From: <ex...@us...> - 2016-03-18 07:53:55
|
Revision: 7475 http://sourceforge.net/p/web-erp/reponame/7475 Author: exsonqu Date: 2016-03-18 07:53:53 +0000 (Fri, 18 Mar 2016) Log Message: ----------- 18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php. Modified Paths: -------------- trunk/GLAccountInquiry.php Modified: trunk/GLAccountInquiry.php =================================================================== --- trunk/GLAccountInquiry.php 2016-03-09 23:02:09 UTC (rev 7474) +++ trunk/GLAccountInquiry.php 2016-03-18 07:53:53 UTC (rev 7475) @@ -51,7 +51,8 @@ $sql = "SELECT chartmaster.accountcode, bankaccounts.accountcode AS bankact, - chartmaster.accountname + bankaccounts.currcode, + chartmaster.accountname FROM chartmaster LEFT JOIN bankaccounts ON chartmaster.accountcode=bankaccounts.accountcode INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1 @@ -61,6 +62,7 @@ if($myrow['accountcode'] == $SelectedAccount){ if (!is_null($myrow['bankact'])) { $BankAccount = true; + $BankCurrency = $myrow['currcode']; } echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>'; } else { @@ -295,6 +297,10 @@ $BankRef = $bankrow['ref']; $OrgAmt = $bankrow['amount']; $Currency = $bankrow['currcode']; + } elseif(isset($BankCurrency)){ + $BankRef = ''; + $OrgAmt = $myrow['amount']; + $Currency = $BankCurrency; } } |
From: <ex...@us...> - 2016-03-09 23:02:11
|
Revision: 7474 http://sourceforge.net/p/web-erp/reponame/7474 Author: exsonqu Date: 2016-03-09 23:02:09 +0000 (Wed, 09 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-09 23:01:36 UTC (rev 7473) +++ trunk/doc/Change.log 2016-03-09 23:02:09 UTC (rev 7474) @@ -1,4 +1,5 @@ webERP Change Log +10/03/2016 Tim: Fixed the credit note tax authority not set up bug in SelectCreditItems.php. Reported by Bob. 03/09/16 Exson: Fixed the bug of wrong location selected when add items to Work Orders in WorkOrderEntry.php. 9/3/16 Andrew Galuski: Fix FormDesigner requires casting XML elements as strings 03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php. |
From: <ex...@us...> - 2016-03-09 23:01:39
|
Revision: 7473 http://sourceforge.net/p/web-erp/reponame/7473 Author: exsonqu Date: 2016-03-09 23:01:36 +0000 (Wed, 09 Mar 2016) Log Message: ----------- 10/03/2016 Tim: Fixed the credit note tax authority not set up bug in SelectCreditItems.php. Reported by Bob. Modified Paths: -------------- trunk/SelectCreditItems.php Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2016-03-09 08:29:47 UTC (rev 7472) +++ trunk/SelectCreditItems.php 2016-03-09 23:01:36 UTC (rev 7473) @@ -117,6 +117,7 @@ $myrow=DB_fetch_array($result_CustSelect); $SelectedCustomer = trim($myrow['debtorno']); $SelectedBranch = trim($myrow['branchcode']); + $_POST['JustSelectedACustomer'] = true; } elseif (DB_num_rows($result_CustSelect)==0){ prnMsg(_('Sorry') . ' ... ' . _('there are no customer branch records contain the selected text') . ' - ' . _('please alter your search criteria and try again'),'info'); } |
From: <ex...@us...> - 2016-03-09 08:29:50
|
Revision: 7472 http://sourceforge.net/p/web-erp/reponame/7472 Author: exsonqu Date: 2016-03-09 08:29:47 +0000 (Wed, 09 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-09 08:26:50 UTC (rev 7471) +++ trunk/doc/Change.log 2016-03-09 08:29:47 UTC (rev 7472) @@ -1,5 +1,5 @@ webERP Change Log - +03/09/16 Exson: Fixed the bug of wrong location selected when add items to Work Orders in WorkOrderEntry.php. 9/3/16 Andrew Galuski: Fix FormDesigner requires casting XML elements as strings 03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php. 03/09/16 Exson: Fixed the typo which make sql query failed in GLPostings.inc. reported by Richard. |
From: <ex...@us...> - 2016-03-09 08:26:53
|
Revision: 7471 http://sourceforge.net/p/web-erp/reponame/7471 Author: exsonqu Date: 2016-03-09 08:26:50 +0000 (Wed, 09 Mar 2016) Log Message: ----------- 09/03/16 Exson: Fix the bug of wrong location selected when add items to the workorders in WorkOrderEntry.php. Modified Paths: -------------- trunk/WorkOrderEntry.php Modified: trunk/WorkOrderEntry.php =================================================================== --- trunk/WorkOrderEntry.php 2016-03-09 08:09:37 UTC (rev 7470) +++ trunk/WorkOrderEntry.php 2016-03-09 08:26:50 UTC (rev 7471) @@ -284,7 +284,7 @@ INNER JOIN bom ON stockmaster.stockid=bom.component WHERE bom.parent='" . $NewItem . "' - AND bom.loccode='" . $_POST['StockLocation'] . "' + AND bom.loccode=(SELECT loccode FROM workorders WHERE wo='" . $_POST['WO'] . "') AND bom.effectiveafter<='" . Date('Y-m-d') . "' AND bom.effectiveto>='" . Date('Y-m-d') . "'"); $CostRow = DB_fetch_array($CostResult); |
From: <dai...@us...> - 2016-03-09 08:09:39
|
Revision: 7470 http://sourceforge.net/p/web-erp/reponame/7470 Author: daintree Date: 2016-03-09 08:09:37 +0000 (Wed, 09 Mar 2016) Log Message: ----------- Andrew Galuski fix to FormDesigner.php casting XML elements as strings Modified Paths: -------------- trunk/FormDesigner.php trunk/doc/Change.log trunk/includes/MainMenuLinksArray.php Modified: trunk/FormDesigner.php =================================================================== --- trunk/FormDesigner.php 2016-03-09 03:00:30 UTC (rev 7469) +++ trunk/FormDesigner.php 2016-03-09 08:09:37 UTC (rev 7470) @@ -165,7 +165,7 @@ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFFGLabel.php?' . SID .'WO=Preview">'; break; case 'ShippingLabel.xml': - echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFShipLabel.php?' . SID .'SO=Preview">'; + echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFShipLabel.php?' . SID .'ORD=Preview">'; break; } } else { @@ -194,7 +194,8 @@ while (false !== ($file = readdir($handle))) { if ($file[0]!='.') { $FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$file); - echo '<option value="'.$file.'">' . _($FormDesign['name']) . '</option>'; + //echo "name is". $FormDesign['name']; + echo '<option value="'.$file.'">' . /*_(*/ $FormDesign['name'] /*)*/ . '</option>'; } } closedir($handle); @@ -211,13 +212,13 @@ if (empty($_POST['preview'])) { $FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']); } -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Designer') . '" alt="" />' . ' ' . _('Form Designer') . '<br />' . _($FormDesign['name']) . '</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Designer') . '" alt="" />' . ' ' . _('Form Designer') . '<br />' . _((string)$FormDesign['name']) . '</p>'; echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') . '<br /> '. _('All measurements are in PostScript points (72 points = 25,4 mm).') . '<br /> '. _('All coordinates are measured from the lower left corner of the sheet to the top left corner of the element.') . '</div><br />'; -$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A6_Landscape', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations amg adds A6 +$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A6_Landscape', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -245,7 +246,7 @@ foreach ($FormDesign as $key) { switch ($key['type']) { case 'image': - echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . _($key['name']) . '</th>'; + echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . _((string)$key['name']) . '</th>'; echo '</tr><tr>'; // New table row. InputX($key['id'], $key->x); InputY($key['id'], $key->y); @@ -259,7 +260,7 @@ break; case 'SimpleText': echo '<td colspan="1" valign="top"><table width="100%" border="1">'; - echo '<tr><th colspan="6">' . _($key['name']) . '</th>'; + echo '<tr><th colspan="6">' . _((string)$key['name']) . '</th>'; echo '</tr><tr>'; // New table row. InputX($key['id'], $key->x); InputY($key['id'], $key->y); @@ -270,7 +271,7 @@ break; case 'MultiLineText': echo '<td colspan="1" valign="top"><table width="100%" border="1">'; - echo '<tr><th colspan="8">' . _($key['name']) . '</th>'; + echo '<tr><th colspan="8">' . _((string)$key['name']) . '</th>'; echo '</tr><tr>'; // New table row. InputX($key['id'], $key->x); InputY($key['id'], $key->y); @@ -281,27 +282,27 @@ $counter=$counter+1; break; case 'ElementArray': - echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="7">' . _($key['name']) . '</th></tr>'; + echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="7">' . _((string)$key['name']) . '</th></tr>'; foreach ($key as $subkey) { echo '<tr>'; if ($subkey['type']=='SimpleText') { - echo '<td>' . _($subkey['name']) . '</td>'; + echo '<td>' . _((string)$subkey['name']) . '</td>'; InputX($subkey['id'], $subkey->x); InputY($subkey['id'], $subkey->y); SelectFontSize($subkey['id'], $subkey->FontSize); } elseif ($subkey['type']=='MultiLineText') { // This element (9 td) overflows the table size (7 td). - echo '<td>' . _($subkey['name']) . '</td>'; + echo '<td>' . _((string)$subkey['name']) . '</td>'; InputX($subkey['id'], $subkey->x); InputY($subkey['id'], $subkey->y); InputWidth($subkey['id'], $subkey->Length); SelectFontSize($subkey['id'], $subkey->FontSize); } elseif ($subkey['type']=='DataText') { - echo '<td>' . _($subkey['name']) . '</td>'; + echo '<td>' . _((string)$subkey['name']) . '</td>'; InputX($subkey['id'], $subkey->x); InputWidth($subkey['id'], $subkey->Length); SelectFontSize($subkey['id'], $subkey->FontSize); } elseif ($subkey['type']=='StartLine') { - echo '<td colspan="3">' . _($subkey['name']) . ' = ' . '</td>'; + echo '<td colspan="3">' . _((string)$subkey['name']) . ' = ' . '</td>'; echo '<td><input type="text" class="number" name="StartLine" size="4" maxlength="4" value="'.$key->y.'" /></td>'; } echo '</tr>'; @@ -310,7 +311,7 @@ $counter=$counter+1; break; case 'CurvedRectangle': - echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th>'; + echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _((string)$key['name']) . '</th>'; echo '</tr><tr>'; // New table row. InputX($key['id'], $key->x); InputY($key['id'], $key->y); @@ -332,7 +333,7 @@ $counter=$counter+1; break; case 'Rectangle': // This case is probably included in CurvedRectangle. - echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . _($key['name']) . '</th>'; + echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . _((string)$key['name']) . '</th>'; echo '</tr><tr>'; // New table row. InputX($key['id'], $key->x); InputY($key['id'], $key->y); @@ -345,7 +346,7 @@ $counter=$counter+1; break; case 'Line': - echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>'; + echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _((string)$key['name']) . '</th></tr>'; echo '<tr>'; echo '<td class="number">' . _('Start x co-ordinate').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'startx" size="4" maxlength="4" value="'.$key->startx.'" /></td>'; echo '<td class="number">' . _('Start y co-ordinate').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'starty" size="4" maxlength="4" value="'.$key->starty.'" /></td></tr><tr>'; @@ -373,4 +374,4 @@ /* BEGIN: Final common code division. */ include('includes/footer.inc'); /* END: Final common code division. */ -?> +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-09 03:00:30 UTC (rev 7469) +++ trunk/doc/Change.log 2016-03-09 08:09:37 UTC (rev 7470) @@ -1,5 +1,6 @@ webERP Change Log +9/3/16 Andrew Galuski: Fix FormDesigner requires casting XML elements as strings 03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php. 03/09/16 Exson: Fixed the typo which make sql query failed in GLPostings.inc. reported by Richard. 24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc. Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2016-03-09 03:00:30 UTC (rev 7469) +++ trunk/includes/MainMenuLinksArray.php 2016-03-09 08:09:37 UTC (rev 7470) @@ -153,7 +153,7 @@ _('List Daily Transactions'), _('Supplier Transaction Inquiries')); -$MenuItems['AP']['Reports']['URL'] = array( '/SuppWhereAlloc.php', +$MenuItems['AP']['Reports']['URL'] = array( '/SuppWhereAlloc.php', '/AgedSuppliers.php', '/SuppPaymentRun.php', '/PDFRemittanceAdvice.php', |
From: <ex...@us...> - 2016-03-09 03:00:32
|
Revision: 7469 http://sourceforge.net/p/web-erp/reponame/7469 Author: exsonqu Date: 2016-03-09 03:00:30 +0000 (Wed, 09 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-09 02:59:37 UTC (rev 7468) +++ trunk/doc/Change.log 2016-03-09 03:00:30 UTC (rev 7469) @@ -1,4 +1,6 @@ webERP Change Log + +03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php. 03/09/16 Exson: Fixed the typo which make sql query failed in GLPostings.inc. reported by Richard. 24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc. 20/02/16 Janb,Tim fixed typo in upgrade4.12.3-4.13.sql |
From: <ex...@us...> - 2016-03-09 02:59:39
|
Revision: 7468 http://sourceforge.net/p/web-erp/reponame/7468 Author: exsonqu Date: 2016-03-09 02:59:37 +0000 (Wed, 09 Mar 2016) Log Message: ----------- 03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php. Modified Paths: -------------- trunk/PO_SelectOSPurchOrder.php Modified: trunk/PO_SelectOSPurchOrder.php =================================================================== --- trunk/PO_SelectOSPurchOrder.php 2016-03-09 01:55:34 UTC (rev 7467) +++ trunk/PO_SelectOSPurchOrder.php 2016-03-09 02:59:37 UTC (rev 7468) @@ -251,6 +251,7 @@ echo '<option value="Rejected">' . _('Rejected') . '</option>'; } } + $Checked = (isset($_POST['PODetails']))?'checked="checked"':''; echo '</select> ' . _('Orders Between') . ': <input type="text" name="DateFrom" value="' . ConvertSQLDate($DateFrom) . '" class="date" size="10" alt="' . $_SESSION['DefaultDateFormat'] . '" /> @@ -259,6 +260,7 @@ <input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" /> </td> </tr> + <tr><td>' . _('Show PO Details') . '<input type="checkbox" name="PODetails" ' . $Checked . ' /></td></tr> </table>'; } //!isset($OrderNumber) or $OrderNumber == '' @@ -580,14 +582,18 @@ echo '<table cellpadding="2" width="97%" class="selection">'; - + if (isset($_POST['PODetails'])) { + $BalHead = '<th class="ascending">' . _('Balance') .' (' . _('Stock ID') . '--' . _('Quantity') . ' )</th>'; + } else { + $BalHead = ''; + } echo '<tr> <th class="ascending">' . _('Order #') . '</th> <th class="ascending">' . _('Order Date') . '</th> <th class="ascending">' . _('Delivery Date') . '</th> <th class="ascending">' . _('Initiated by') . '</th> <th class="ascending">' . _('Supplier') . '</th> - <th class="ascending">' . _('Balance') .' ('. _('Stock ID') . '--' . _('Quantity') . ' )</th> + ' . $BalHead . ' <th class="ascending">' . _('Currency') . '</th>'; if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) { @@ -600,6 +606,24 @@ $j = 1; $k = 0; //row colour counter while ($myrow = DB_fetch_array($PurchOrdersResult)) { + $Bal = ''; + if (isset($_POST['PODetails'])) { + //lets retrieve the PO balance here to make it a standard sql query. + $BalSql = "SELECT itemcode, quantityord - quantityrecd as balance FROM purchorderdetails WHERE orderno = '" . $myrow['orderno'] . "'"; + $ErrMsg = _('Failed to retrieve purchorder details'); + $BalResult = DB_query($BalSql,$ErrMsg); + if (DB_num_rows($BalResult)>0) { + while ($BalRow = DB_fetch_array($BalResult)) { + $Bal .= '<br/>' . $BalRow['itemcode'] . ' -- ' . $BalRow['balance']; + } + } + } + if (isset($_POST['PODetails'])) { + $BalRow = '<td width="250" style="word-break:break-all">' . $Bal . '</td>'; + } else { + $BalRow = ''; + } + if ($k == 1) { /*alternate bgcolour of row for highlighting */ echo '<tr class="EvenTableRows">'; @@ -641,7 +665,7 @@ <td>' . $FormatedDeliveryDate . '</td> <td>' . $InitiatorName . '</td> <td>' . $myrow['suppname'] . '</td> - <td width="250" style="word-break:break-all">' . $myrow['bal'] . '</td> + ' . $BalRow . ' <td>' . $myrow['currcode'] . '</td>'; if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) { echo '<td class="number">' . $FormatedOrderValue . '</td>'; |
From: <ex...@us...> - 2016-03-09 01:55:37
|
Revision: 7467 http://sourceforge.net/p/web-erp/reponame/7467 Author: exsonqu Date: 2016-03-09 01:55:34 +0000 (Wed, 09 Mar 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-03-09 01:54:37 UTC (rev 7466) +++ trunk/doc/Change.log 2016-03-09 01:55:34 UTC (rev 7467) @@ -1,5 +1,5 @@ webERP Change Log - +03/09/16 Exson: Fixed the typo which make sql query failed in GLPostings.inc. reported by Richard. 24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc. 20/02/16 Janb,Tim fixed typo in upgrade4.12.3-4.13.sql 19/02/16 Daveparrish fixed page number error of AgedDebtors.php. |
From: <ex...@us...> - 2016-03-09 01:54:39
|
Revision: 7466 http://sourceforge.net/p/web-erp/reponame/7466 Author: exsonqu Date: 2016-03-09 01:54:37 +0000 (Wed, 09 Mar 2016) Log Message: ----------- 03/09/16 Exson: Fixed the typo which make sql query failed in GLPostings.inc. Modified Paths: -------------- trunk/includes/GLPostings.inc Modified: trunk/includes/GLPostings.inc =================================================================== --- trunk/includes/GLPostings.inc 2016-03-02 23:23:45 UTC (rev 7465) +++ trunk/includes/GLPostings.inc 2016-03-09 01:54:37 UTC (rev 7466) @@ -60,7 +60,7 @@ LEFT JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode AND periods.periodno=chartdetails.period WHERE (periods.periodno BETWEEN '" . $CreateFrom . "' AND '" . $CreateTo . "') - AND chartdetails.account code IS NULL ORDER BY accountcode,periodno"; + AND chartdetails.accountcode IS NULL ORDER BY accountcode,periodno"; $ErrMsg = _('Failed to retrieve new account code and periods'); $NewPeriodResult = DB_query($sql,$ErrMsg); if (DB_num_rows($result)>0){ |
From: <rc...@us...> - 2016-03-02 23:23:48
|
Revision: 7465 http://sourceforge.net/p/web-erp/reponame/7465 Author: rchacon Date: 2016-03-02 23:23:45 +0000 (Wed, 02 Mar 2016) Log Message: ----------- Spanish translation update. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-02-24 01:13:13 UTC (rev 7464) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-03-02 23:23:45 UTC (rev 7465) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-29 12:33-0600\n" -"PO-Revision-Date: 2016-01-20 11:40-0600\n" +"PO-Revision-Date: 2016-02-01 09:59-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -3655,7 +3655,7 @@ #: BankReconciliation.php:120 CustomerReceipt.php:819 msgid "You must first" -msgstr "Antes debe" +msgstr "Primero debe seleccionar" #: BankReconciliation.php:120 CustomerReceipt.php:819 #: DailyBankTransactions.php:43 Payments.php:794 SuppPaymentRun.php:332 @@ -4032,7 +4032,7 @@ #: CollectiveWorkOrderCost.php:268 msgid "Start Date To" -msgstr "Fecha inial al" +msgstr "Fecha inicial al" #: CollectiveWorkOrderCost.php:274 SelectWorkOrder.php:175 msgid "New Work Order" @@ -5815,7 +5815,7 @@ "You should automatically be forwarded to the Contract page. If this does not " "happen perhaps the browser does not support META Refresh" msgstr "" -"Debería ser redirigido automáticamente a la página de contrato. Si esto no " +"Debería ser enviado automáticamente a la página de contrato. Si esto no " "ocurre, es posible que el buscador no soporte la recarga META" #: ContractBOM.php:44 ContractOtherReqts.php:47 Contracts.php:96 @@ -6331,8 +6331,8 @@ "You should automatically be forwarded to the entry of the Contract line " "items page" msgstr "" -"Automáticamente deberá enviarse a la entrada de los elementos del contrato " -"de línea la página" +"Debería ser enviado automáticamente a la entrada de los elementos del " +"contrato de línea la página" #: Contracts.php:96 Contracts.php:104 Customers.php:272 #: DeliveryDetails.php:276 DeliveryDetails.php:285 EmailCustStatements.php:14 @@ -6360,7 +6360,7 @@ "You should automatically be forwarded to the entry of the Contract " "requirements page" msgstr "" -"Usted debe ser automáticamente enviado a la entrada de los requisitos del " +"Debería ser enviado automáticamente a la entrada de los requisitos del " "contrato página" #: Contracts.php:111 @@ -10806,8 +10806,8 @@ "You should automatically be forwarded to the entry of a new Customer Branch " "page" msgstr "" -"Debería ser dirigido automáticamente a la página de Nueva sucursal del " -"Cliente" +"Debería ser enviado automáticamente a la página de entrada de nueva sucursal " +"del Cliente" #: Customers.php:279 msgid "No updates or deletes took place" @@ -11532,7 +11532,7 @@ "You should automatically be forwarded to the entry of recurring order " "details page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de detalles de " +"Debería ser enviado automáticamente a la página de entrada de detalles de " "pedidos frecuentes" #: DeliveryDetails.php:282 DeliveryDetails.php:1210 @@ -11544,7 +11544,7 @@ "You should automatically be forwarded to the entry of the order line details " "page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de detalles de " +"Debería ser enviado automáticamente a la página de entrada de detalles de " "filas del pedido" #: DeliveryDetails.php:298 @@ -15012,7 +15012,7 @@ #: GLJournal.php:202 msgid "You must select a GL account code" -msgstr "Usted debe seleccionar un código de cuenta contable" +msgstr "Debe seleccionar un código de cuenta contable" #: GLJournal.php:264 msgid "Date to Process Journal" @@ -16205,7 +16205,7 @@ #: ImportBankTransAnalysis.php:61 SuppTransGLAnalysis.php:37 msgid "You must select a general ledger code from the list below" -msgstr "Usted debe seleccionar un código contable de la siguiente lista" +msgstr "Debe seleccionar un código contable de la siguiente lista" #: ImportBankTransAnalysis.php:71 SuppTransGLAnalysis.php:47 msgid "The account code entered is not a valid code" @@ -21295,7 +21295,7 @@ "You should automatically be forwarded to the entry of the purchase order " "line items page" msgstr "" -"Debería ser conducido automáticamente a la página de entrada de filas " +"Debería ser enviado automáticamente a la página de entrada de filas " "artículos de la orden de compra" #: PO_Header.php:296 @@ -23391,13 +23391,11 @@ #: PcTabs.php:82 msgid "You must select a General ledger code for the cash to be assigned from" -msgstr "" -"Usted debe seleccionar un código contable para el dinero que se asignará a" +msgstr "Debe seleccionar un código contable para el dinero que se asignará a" #: PcTabs.php:87 msgid "You must select a General ledger code for this petty cash tab" -msgstr "" -"Usted debe seleccionar un código contable para esta ficha de caja chica" +msgstr "Debe seleccionar un código contable para esta ficha de caja chica" #: PcTabs.php:104 PcTabs.php:142 PcTabs.php:168 msgid "The Petty Cash Tab" @@ -23612,6 +23610,8 @@ #: PriceMatrix.php:202 msgid "You must select a stock item first before set a price maxtrix" msgstr "" +"Debe seleccionar primero un artículo de inventario antes de fijar una matriz " +"de precios" #: PriceMatrix.php:219 PriceMatrix.php:266 Prices.php:329 msgid "Price Effective From Date" @@ -24440,7 +24440,7 @@ #: PrintCustStatements.php:460 msgid " Customer statements has been emailed to" -msgstr "" +msgstr "Estados de cuenta de cliente han sido enviados por correo-e a" #: PrintCustStatements.php:475 msgid "No Statements Found" @@ -24683,7 +24683,7 @@ #: PrintCustTrans.php:785 PrintCustTransPortrait.php:854 msgid "Your Order Ref" -msgstr "Referencia Pedidos Compra" +msgstr "Su referencia de pedido" #: PrintCustTrans.php:786 PrintCustTransPortrait.php:855 msgid "Our Order No" @@ -26809,7 +26809,7 @@ "You should automatically be forwarded to the CSV Sales Analysis file when it " "is ready" msgstr "" -"Debería ser conducido automáticamente al fichero CSV de Análisis de Ventas " +"Debería ser enviado automáticamente al fichero CSV de Análisis de Ventas " "cuando esté listo" #: SalesByTypePeriodInquiry.php:6 SalesByTypePeriodInquiry.php:10 @@ -28593,8 +28593,8 @@ "You should automatically be forwarded to the entry of the delivery details " "page" msgstr "" -"Usted automáticamente debería redirigirse al ingreso de los detalles de " -"entrega de la página" +"Debería ser enviado automáticamente al ingreso de los detalles de entrega de " +"la página" #: SelectOrderItems.php:1147 msgid "if this does not happen" @@ -32831,7 +32831,7 @@ #: StockUsage.php:19 msgid "You should automatically be forwarded to the usage graph" -msgstr "Debería ser conducido automáticamente a la gráfica de uso" +msgstr "Debería ser enviado automáticamente a la gráfica de uso" #: StockUsage.php:55 msgid "" @@ -34404,7 +34404,7 @@ "You should automatically be forwarded to the entry of credit notes against " "goods received page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de notas de " +"Debería ser enviado automáticamente a la página de entrada de notas de " "crédito respecto a bienes recibidos" #: SupplierCredit.php:221 @@ -34412,7 +34412,7 @@ "You should automatically be forwarded to the entry of credit notes against " "shipments page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de notas de " +"Debería ser enviado automáticamente a la página de entrada de notas de " "crédito respecto a envíos" #: SupplierCredit.php:233 @@ -34420,7 +34420,7 @@ "You should automatically be forwarded to the entry of credit notes against " "the general ledger page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de notas de " +"Debería ser enviado automáticamente a la página de entrada de notas de " "crédito respecto a la contabilidad" #: SupplierCredit.php:243 @@ -34428,15 +34428,15 @@ "You should automatically be forwarded to the entry of supplier credit notes " "against contracts page" msgstr "" -"Automáticamente debería remitirse al ingreso de notas de crédito de " -"proveedores contra la página contratos" +"Debería ser enviado automáticamente a la página de entrada de las notas de " +"crédito de proveedores contra contratos" #: SupplierCredit.php:253 msgid "" "You should automatically be forwarded to the entry of invoices against fixed " "assets page" msgstr "" -"Automáticamente debería remitirse al ingreso de las facturas contra la " +"Debería ser enviado automáticamente al ingreso de las facturas contra la " "página de activos fijos" #: SupplierCredit.php:283 @@ -34944,7 +34944,7 @@ "You should automatically be forwarded to the entry of invoices against goods " "received page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de facturas " +"Debería ser enviado automáticamente a la página de entrada de facturas " "respecto a bienes recibidos" #: SupplierInvoice.php:570 @@ -34952,7 +34952,7 @@ "You should automatically be forwarded to the entry of invoices against " "shipments page" msgstr "" -"Debería ser conducido automáticamente a la página de entrada de facturas " +"Debería ser enviado automáticamente a la página de entrada de facturas " "contra envíos" #: SupplierInvoice.php:578 @@ -34960,7 +34960,7 @@ "You should automatically be forwarded to the entry of invoices against the " "general ledger page" msgstr "" -"Debería ser dirigido automáticamente a la página de entrada de facturas " +"Debería ser enviado automáticamente a la página de entrada de facturas " "respecto a la contabilidad" #: SupplierInvoice.php:586 @@ -34968,15 +34968,15 @@ "You should automatically be forwarded to the entry of invoices against " "contracts page" msgstr "" -"Automáticamente deben remitirse al ingreso de las facturas contra la página " -"contratos" +"Debería ser enviado automáticamente al ingreso de las facturas contra la " +"página contratos" #: SupplierInvoice.php:596 msgid "" "You should automatically be forwarded to the entry of invoice amounts " "against fixed assets page" msgstr "" -"Automáticamente deben remitirse a los ingresos de importes de la factura " +"Debería ser enviado automáticamente a los ingresos de importes de la factura " "contra la página de activos fijos" #: SupplierInvoice.php:628 @@ -36181,9 +36181,9 @@ "The default theme to use for the login screen and the setup of new users. " "The users' theme selection will override it." msgstr "" -"El tema por defecto a utilizar para la pantalla de inicio de sesión y la " -"configuración de los usuarios nuevos. Selección de temas de los usuarios lo " -"anulará." +"El tema por defecto a usar en la pantalla de inicio de sesión y en la " +"configuración de los usuarios nuevos. La selección de un tema de usuario " +"prevalecerá sobre este." #: SystemParameters.php:449 msgid "Accounts Receivable/Payable Settings" @@ -36435,7 +36435,7 @@ #: SystemParameters.php:586 msgid "0" -msgstr "" +msgstr "0" #: SystemParameters.php:589 msgid "" @@ -39965,7 +39965,7 @@ #: WorkOrderReceive.php:127 msgid "The Expiry Date should be in date format" -msgstr "" +msgstr "La fecha de caducidad debe estar en formato de fecha" #: WorkOrderReceive.php:140 msgid "" @@ -42016,6 +42016,7 @@ #: Z_ImportCustbranch.php:188 msgid "The Debtor No cannot contain any of the following characters" msgstr "" +"El número de deudor no puede contener ninguno de los siguientes caracteres" #: Z_ImportCustbranch.php:194 msgid "" @@ -42105,7 +42106,7 @@ #: Z_ImportCustbranch.php:359 msgid "The Debtor No" -msgstr "" +msgstr "El número de deudor" #: Z_ImportCustbranch.php:359 msgid "has not existed, and its branches data cannot be imported" @@ -50489,6 +50490,7 @@ #: install/index.php:222 msgid "You must enter a valid email address for the Administrator." msgstr "" +"Debe introducir una dirección de correo-e válida para el administrador." #: install/index.php:228 msgid "" |
From: <ex...@us...> - 2016-02-24 01:13:15
|
Revision: 7464 http://sourceforge.net/p/web-erp/reponame/7464 Author: exsonqu Date: 2016-02-24 01:13:13 +0000 (Wed, 24 Feb 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-02-24 01:12:29 UTC (rev 7463) +++ trunk/doc/Change.log 2016-02-24 01:13:13 UTC (rev 7464) @@ -1,4 +1,6 @@ webERP Change Log + +24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc. 20/02/16 Janb,Tim fixed typo in upgrade4.12.3-4.13.sql 19/02/16 Daveparrish fixed page number error of AgedDebtors.php. 02/02/16 Exson\xA3\xBAFixed the bug of chartdetails bfwd amount wrong in GLPostings.inc. |
From: <ex...@us...> - 2016-02-24 01:12:32
|
Revision: 7463 http://sourceforge.net/p/web-erp/reponame/7463 Author: exsonqu Date: 2016-02-24 01:12:29 +0000 (Wed, 24 Feb 2016) Log Message: ----------- 24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc. Modified Paths: -------------- trunk/includes/GLPostings.inc Modified: trunk/includes/GLPostings.inc =================================================================== --- trunk/includes/GLPostings.inc 2016-02-20 08:27:29 UTC (rev 7462) +++ trunk/includes/GLPostings.inc 2016-02-24 01:12:29 UTC (rev 7463) @@ -54,7 +54,22 @@ $ChartDetailsNotSetUpResult = DB_query($sql,_('Could not test to see that all chart detail records properly initiated')); if(DB_num_rows($ChartDetailsNotSetUpResult)>0){ - + //first lets retrieve those new added accountcode and period; + $sql = "SELECT chartmaster.accountcode,periods.periodno + FROM (chartmaster CROSS JOIN periods) + LEFT JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode + AND periods.periodno=chartdetails.period + WHERE (periods.periodno BETWEEN '" . $CreateFrom . "' AND '" . $CreateTo . "') + AND chartdetails.account code IS NULL ORDER BY accountcode,periodno"; + $ErrMsg = _('Failed to retrieve new account code and periods'); + $NewPeriodResult = DB_query($sql,$ErrMsg); + if (DB_num_rows($result)>0){ + $NewPeriods = array(); + while ($NewPeriodsRow = DB_fetch_array($NewPeriodResult)) { + if (!isset($NewPeriods[$NewPeriodsRow['accountcode']])) { + $NewPeriods[$NewPeriodsRow['accountcode']] = $NewPeriodsRow['period']; + } + } /*Now insert the chartdetails records that do not already exist */ $sql = "INSERT INTO chartdetails (accountcode, period) SELECT chartmaster.accountcode, periods.periodno @@ -66,21 +81,17 @@ $ErrMsg = _('Inserting new chart details records required failed because'); $InsChartDetailsRecords = DB_query($sql,$ErrMsg); + } } + //now lets update those new created period with the bfwd amount -$sql = "SELECT max(period),accountcode - FROM chartdetails - WHERE bfwd!=0 - GROUP BY accountcode"; -$ErrMsg = _('Failed to retrieve new period data'); -$NewAccountsResult = DB_query($sql,$ErrMsg); -if (DB_num_rows($NewAccountsResult)>0) { - while ($NewAccountsRow = DB_fetch_row($NewAccountsResult)) { - $sql = "UPDATE chartdetails AS c INNER JOIN chartdetails AS s ON c.accountcode=s.accountcode AND c.period=s.period - SET c.bfwd= (SELECT bfwd FROM (SELECT bfwd FROM chartdetails WHERE period='" . $NewAccountsRow[0]. "' AND accountcode='" . $NewAccountsRow[1] . "') AS temple) - WHERE c.accountcode='" . $NewAccountsRow[1] . "' AND c.period>'" . $NewAccountsRow[0] . "'"; - $ErrMsg = _('Failed to update chartdetails bfwd data'); - $result = DB_query($sql,$ErrMsg); +if (isset($NewPeriods)) { + foreach ($NewPeriods as $Account=>$Period) { + if ($Period>$CreateFrom) { + $sql = "UPDATE chartdetails SET bfwd=(SELECT bfwd+actual FROM chartdetails WHERE accountcode='" . $Account . "' AND period='" . $Period - 1 . "') WHERE accountcode='" . $Account . "' AND period>= " . $Period; + $ErrMsg = _('Failed to update the bfwd amount'); + $BfwdResult = DB_query($sql,$ErrMsg); + } } } |
From: <te...@us...> - 2016-02-20 08:27:31
|
Revision: 7462 http://sourceforge.net/p/web-erp/reponame/7462 Author: tehonu Date: 2016-02-20 08:27:29 +0000 (Sat, 20 Feb 2016) Log Message: ----------- Avoid error in error_log PHP Strict Standards: Only variables should be passed by reference in weberp/StockTransfers.php Modified Paths: -------------- trunk/StockTransfers.php Modified: trunk/StockTransfers.php =================================================================== --- trunk/StockTransfers.php 2016-02-20 08:04:49 UTC (rev 7461) +++ trunk/StockTransfers.php 2016-02-20 08:27:29 UTC (rev 7462) @@ -230,7 +230,8 @@ WHERE stockmaster.stockid ='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "'"; $ErrMsg = _('The standard cost of the item cannot be retrieved because'); $DbgMsg = _('The SQL that failed was'); - $myrow = DB_fetch_array(DB_query($SQLstandardcost,$ErrMsg,$DbgMsg)); + $ResultStandardCost = DB_query($SQLstandardcost,$ErrMsg,$DbgMsg); + $myrow = DB_fetch_array($ResultStandardCost); $StandardCost = $myrow['standardcost'];// QUESTION: Standard cost for: Assembly (value="A") and Manufactured (value="M") items ? // Insert record: $SQL = "INSERT INTO gltrans ( @@ -385,7 +386,8 @@ WHERE stockmaster.stockid ='" . $_SESSION['Transfer']->TransferItem[0]->StockID . "'"; $ErrMsg = _('The standard cost of the item cannot be retrieved because'); $DbgMsg = _('The SQL that failed was'); - $myrow = DB_fetch_array(DB_query($SQLstandardcost,$ErrMsg,$DbgMsg)); + $ResultStandardCost = DB_query($SQLstandardcost,$ErrMsg,$DbgMsg); + $myrow = DB_fetch_array($ResultStandardCost); $StandardCost = $myrow['standardcost'];// QUESTION: Standard cost for: Assembly (value="A") and Manufactured (value="M") items ? // Insert record: $SQL = "INSERT INTO gltrans ( |
From: <ex...@us...> - 2016-02-20 08:04:52
|
Revision: 7461 http://sourceforge.net/p/web-erp/reponame/7461 Author: exsonqu Date: 2016-02-20 08:04:49 +0000 (Sat, 20 Feb 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-02-20 08:00:32 UTC (rev 7460) +++ trunk/doc/Change.log 2016-02-20 08:04:49 UTC (rev 7461) @@ -1,5 +1,5 @@ webERP Change Log - +20/02/16 Janb,Tim fixed typo in upgrade4.12.3-4.13.sql 19/02/16 Daveparrish fixed page number error of AgedDebtors.php. 02/02/16 Exson\xA3\xBAFixed the bug of chartdetails bfwd amount wrong in GLPostings.inc. 1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc. |
From: <ex...@us...> - 2016-02-20 08:00:34
|
Revision: 7460 http://sourceforge.net/p/web-erp/reponame/7460 Author: exsonqu Date: 2016-02-20 08:00:32 +0000 (Sat, 20 Feb 2016) Log Message: ----------- 20/02/16 Janb,Tim Fixed typo in the upgrade4.12.3-4.13.sql. Modified Paths: -------------- trunk/sql/mysql/upgrade4.12.3-4.13.sql Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-02-19 10:43:20 UTC (rev 7459) +++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-02-20 08:00:32 UTC (rev 7460) @@ -14,7 +14,7 @@ ('EmailCustStatements.php','3','Email customer statement to customer'), ('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account'), ('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry'), - ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)') + ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)'), ('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user'); CREATE TABLE IF NOT EXISTS `suppinvstogrn` ( @@ -49,7 +49,7 @@ ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`; ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`; INSERT INTO scripts VALUES('CollectiveWorkOrderCost.php',2,'Multiple work orders cost review'); -ALTER table BOM ADD remark varchar(500) NOT NULL DEFAULT ''; +ALTER table bom ADD remark varchar(500) NOT NULL DEFAULT ''; INSERT INTO scripts VALUES ('SuppWhereAlloc.php',3,'Suppliers Where allocated'); |
From: <ex...@us...> - 2016-02-19 10:43:23
|
Revision: 7459 http://sourceforge.net/p/web-erp/reponame/7459 Author: exsonqu Date: 2016-02-19 10:43:20 +0000 (Fri, 19 Feb 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-02-19 10:42:30 UTC (rev 7458) +++ trunk/doc/Change.log 2016-02-19 10:43:20 UTC (rev 7459) @@ -1,5 +1,6 @@ webERP Change Log +19/02/16 Daveparrish fixed page number error of AgedDebtors.php. 02/02/16 Exson\xA3\xBAFixed the bug of chartdetails bfwd amount wrong in GLPostings.inc. 1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc. 30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish. |
From: <ex...@us...> - 2016-02-19 10:42:32
|
Revision: 7458 http://sourceforge.net/p/web-erp/reponame/7458 Author: exsonqu Date: 2016-02-19 10:42:30 +0000 (Fri, 19 Feb 2016) Log Message: ----------- 19/02/16 Daveparrish fixed page number error of AgedDebtors.php. Modified Paths: -------------- trunk/AgedDebtors.php Modified: trunk/AgedDebtors.php =================================================================== --- trunk/AgedDebtors.php 2016-02-01 19:18:55 UTC (rev 7457) +++ trunk/AgedDebtors.php 2016-02-19 10:42:30 UTC (rev 7458) @@ -398,7 +398,6 @@ $YPos -=$line_height; if ($YPos < $Bottom_Margin + $line_height){ - $PageNumber++; include('includes/PDFAgedDebtorsPageHeader.inc'); } @@ -531,4 +530,4 @@ } include('includes/footer.inc'); } /*end of else not PrintPDF */ -?> \ No newline at end of file +?> |
From: <ex...@us...> - 2016-02-01 19:18:57
|
Revision: 7457 http://sourceforge.net/p/web-erp/reponame/7457 Author: exsonqu Date: 2016-02-01 19:18:55 +0000 (Mon, 01 Feb 2016) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-02-01 19:17:56 UTC (rev 7456) +++ trunk/doc/Change.log 2016-02-01 19:18:55 UTC (rev 7457) @@ -1,5 +1,6 @@ webERP Change Log +02/02/16 Exson\xA3\xBAFixed the bug of chartdetails bfwd amount wrong in GLPostings.inc. 1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc. 30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish. 14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php. |
From: <ex...@us...> - 2016-02-01 19:17:59
|
Revision: 7456 http://sourceforge.net/p/web-erp/reponame/7456 Author: exsonqu Date: 2016-02-01 19:17:56 +0000 (Mon, 01 Feb 2016) Log Message: ----------- 02/02/16 Exson?\239?\188?\154Fixed the bug of chartdetails bfwd amount wrong in GLPostings.inc. Modified Paths: -------------- trunk/includes/GLPostings.inc Modified: trunk/includes/GLPostings.inc =================================================================== --- trunk/includes/GLPostings.inc 2016-02-01 13:28:43 UTC (rev 7455) +++ trunk/includes/GLPostings.inc 2016-02-01 19:17:56 UTC (rev 7456) @@ -67,9 +67,23 @@ $ErrMsg = _('Inserting new chart details records required failed because'); $InsChartDetailsRecords = DB_query($sql,$ErrMsg); } +//now lets update those new created period with the bfwd amount +$sql = "SELECT max(period),accountcode + FROM chartdetails + WHERE bfwd!=0 + GROUP BY accountcode"; +$ErrMsg = _('Failed to retrieve new period data'); +$NewAccountsResult = DB_query($sql,$ErrMsg); +if (DB_num_rows($NewAccountsResult)>0) { + while ($NewAccountsRow = DB_fetch_row($NewAccountsResult)) { + $sql = "UPDATE chartdetails AS c INNER JOIN chartdetails AS s ON c.accountcode=s.accountcode AND c.period=s.period + SET c.bfwd= (SELECT bfwd FROM (SELECT bfwd FROM chartdetails WHERE period='" . $NewAccountsRow[0]. "' AND accountcode='" . $NewAccountsRow[1] . "') AS temple) + WHERE c.accountcode='" . $NewAccountsRow[1] . "' AND c.period>'" . $NewAccountsRow[0] . "'"; + $ErrMsg = _('Failed to update chartdetails bfwd data'); + $result = DB_query($sql,$ErrMsg); + } +} - - /*All the ChartDetail records should have been created now and be available to accept postings */ for ( $CurrPeriod = $CreateFrom; $CurrPeriod <= $CreateTo; $CurrPeriod++ ) { @@ -107,7 +121,7 @@ $TotalAmount += $UnpostedTrans['amount']; } // There will be one account still to post after the loop - if($CurrentAccount != 0) { + if($CurrentAccount != '0') { $sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . " WHERE accountcode = '" . $CurrentAccount . "' AND period= '" . $CurrPeriod . "'"; |