Menu
▾
▴
web-erp-svn
|
From: <rc...@us...> - 2016-03-24 19:39:51
|
Revision: 7481
http://sourceforge.net/p/web-erp/reponame/7481
Author: rchacon
Date: 2016-03-24 19:39:49 +0000 (Thu, 24 Mar 2016)
Log Message:
-----------
On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/CustomerReceipt.php 2016-03-24 19:39:49 UTC (rev 7481)
@@ -7,7 +7,6 @@
$Title = _('Receipt Entry');
-
if ($_GET['Type']=='GL') {
$ViewTopic= 'GeneralLedger';
$BookMark = 'GLReceipts';
@@ -905,7 +904,7 @@
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->FunctionalExRate,8), '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
@@ -1100,9 +1099,9 @@
<td>' . _('GL Account') . ':</td>
<td><select tabindex="8" name="GLCode">';
- $SQL = "SELECT chartmaster.accountcode,
- chartmaster.accountname
- FROM chartmaster
+ $SQL = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
ORDER BY chartmaster.accountcode";
$result=DB_query($SQL);
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/Payments.php 2016-03-24 19:39:49 UTC (rev 7481)
@@ -16,7 +16,6 @@
}
include('includes/header.inc');
-
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['PaymentCancelled'])) {
@@ -891,7 +890,7 @@
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
<td>', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/doc/Change.log 2016-03-24 19:39:49 UTC (rev 7481)
@@ -1,5 +1,6 @@
webERP Change Log
+24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
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.
|
|
From: <ex...@us...> - 2016-04-01 08:36:05
|
Revision: 7482
http://sourceforge.net/p/web-erp/reponame/7482
Author: exsonqu
Date: 2016-04-01 08:36:03 +0000 (Fri, 01 Apr 2016)
Log Message:
-----------
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcExpenses.php
trunk/PcTabs.php
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcAssignCashToTab.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -163,9 +163,9 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $SQL = "SELECT tabcode
+ $SQL = "SELECT tabcode, assigner
FROM pctabs
- WHERE assigner='" . $_SESSION['UserID'] . "'
+ WHERE assigner LIKE '%" . $_SESSION['UserID'] . "%'
ORDER BY tabcode";
$result = DB_query($SQL);
@@ -175,12 +175,15 @@
echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
<td><select name="SelectedTabs">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
+ $Assigner = explode(',',$myrow['assigner']);
+ if (in_array($_SESSION['UserID'],$Assigner)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
}
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
}
echo '</select></td></tr>';
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcAuthorizeExpenses.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -304,9 +304,9 @@
<br />
<table class="selection">'; //Main table
- $SQL = "SELECT tabcode
+ $SQL = "SELECT tabcode,authorizer
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'";
+ WHERE authorizer LIKE '%" . $_SESSION['UserID'] . "%'";
$result = DB_query($SQL);
@@ -315,12 +315,14 @@
<td><select name="SelectedTabs" required="required" autofocus="autofocus" >';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
- }
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ $Authorisers = explode(',',$myrow['authorizer']);
+ if (in_array($_SESSION['UserID'],$Authorisers)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
} //end while loop get type of tab
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcExpenses.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -186,11 +186,11 @@
echo '<table class="selection">';
echo '<tr>
- <th>' . _('Code Of Expense') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Account Code') . '</th>
- <th>' . _('Account Description') . '</th>
- <th>' . _('Tag') . '</th>
+ <th class="ascending">' . _('Code Of Expense') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('Account Code') . '</th>
+ <th class="ascending">' . _('Account Description') . '</th>
+ <th class="ascending">' . _('Tag') . '</th>
</tr>';
$k=0; //row colour counter
@@ -358,4 +358,4 @@
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcTabs.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -67,12 +67,12 @@
echo prnMsg(_('You must select a type of tab from the list'),'error');
$Errors[$i] = 'TabType';
$i++;
- } elseif (($_POST['SelectAssigner'])=='') {
+ } elseif (empty($_POST['SelectAssigner'])) {
$InputError = 1;
echo prnMsg(_('You must select a User to assign cash to this tab'),'error');
$Errors[$i] = 'AssignerName';
$i++;
- } elseif (($_POST['SelectAuthoriser'])=='') {
+ } elseif (empty($_POST['SelectAuthoriser'])) {
$InputError = 1;
echo prnMsg(_('You must select a User to authorise this tab'),'error');
$Errors[$i] = 'AuthoriserName';
@@ -88,15 +88,35 @@
$Errors[$i] = 'GLTab';
$i++;
}
+
+ if ($InputError == 0) {
+ $Authorisers = '';
+ $i = 0;
+ foreach ($_POST['SelectAuthoriser'] as $value) {
+ if ($i) $Authorisers .= ',';
+ $Authorisers .= $value;
+ $i++;
+ }
+ $Assigners = '';
+ $i = 0;
+ foreach ($_POST['SelectAssigner'] as $value) {
+ if ($i) $Assigners .= ',';
+ $Assigners .= $value;
+ $i++;
+ }
+ }
+
if (isset($SelectedTab) AND $InputError !=1) {
+ //get the authorisers value
+
$sql = "UPDATE pctabs SET usercode = '" . $_POST['SelectUser'] . "',
typetabcode = '" . $_POST['SelectTabs'] . "',
currency = '" . $_POST['SelectCurrency'] . "',
tablimit = '" . filter_number_format($_POST['TabLimit']) . "',
- assigner = '" . $_POST['SelectAssigner'] . "',
- authorizer = '" . $_POST['SelectAuthoriser'] . "',
+ assigner = '" . $Assigners . "',
+ authorizer = '" . $Authorisers . "',
glaccountassignment = '" . $_POST['GLAccountCash'] . "',
glaccountpcash = '" . $_POST['GLAccountPcashTab'] . "'
WHERE tabcode = '".$SelectedTab."'";
@@ -134,8 +154,8 @@
'" . $_POST['SelectTabs'] . "',
'" . $_POST['SelectCurrency'] . "',
'" . filter_number_format($_POST['TabLimit']) . "',
- '" . $_POST['SelectAssigner'] . "',
- '" . $_POST['SelectAuthoriser'] . "',
+ '" . $Assigners . "',
+ '" . $Authorisers . "',
'" . $_POST['GLAccountCash'] . "',
'" . $_POST['GLAccountPcashTab'] . "')";
@@ -383,7 +403,7 @@
echo '<tr>
<td>' . _('Assigner') . ':</td>
- <td><select name="SelectAssigner">';
+ <td><select multiple="multiple" name="SelectAssigner[]">';
$SQL = "SELECT userid,
realname
@@ -393,7 +413,8 @@
$result = DB_query($SQL);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAssigner']) and $myrow['userid']==$_POST['SelectAssigner']) {
+ $Assigners = explode(',',$_POST['SelectAssigner']);
+ if (isset($_POST['SelectAssigner']) and in_array($myrow['userid'],$Assigners)) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -408,7 +429,7 @@
echo '<tr>
<td>' . _('Authoriser') . ':</td>
- <td><select name="SelectAuthoriser">';
+ <td><select multiple="multiple" name="SelectAuthoriser[]">';
$SQL = "SELECT userid,
realname
@@ -418,7 +439,8 @@
$result = DB_query($SQL);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAuthoriser']) and $myrow['userid']==$_POST['SelectAuthoriser']) {
+ $Authorizer = explode(',',$_POST['SelectAuthoriser']);
+ if (isset($_POST['SelectAuthoriser']) and in_array($myrow['userid'],$Authorizer)) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -493,4 +515,4 @@
} // end if user wish to delete
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2016-04-07 14:42:24
|
Revision: 7488
http://sourceforge.net/p/web-erp/reponame/7488
Author: rchacon
Date: 2016-04-07 14:42:22 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 13:12:11 UTC (rev 7487)
+++ trunk/doc/Change.log 2016-04-07 14:42:22 UTC (rev 7488)
@@ -1,5 +1,6 @@
webERP Change Log
+07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2016-04-07 13:12:11 UTC (rev 7487)
+++ trunk/includes/class.pdf.php 2016-04-07 14:42:22 UTC (rev 7488)
@@ -82,29 +82,39 @@
function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='J', $border=0, $fill=0) {
// R&OS version 0.12.2: "addTextWrap function is no more, use addText instead".
- /* Returns the balance of the string that could not fit in the width
+ /* Returns the balance of the string that could not fit in the width */
// $XPos = cell horizontal coordinate from page left side to cell left side in dpi (72dpi = 25.4mm).
// $YPos = cell vertical coordinate from page bottom side to cell bottom side in dpi (72dpi = 25.4mm).
- */
+ // $Width = Cell (line) width in dpi (72dpi = 25.4mm).
+ // $Height = Font size in dpi (72dpi = 25.4mm).
+ // $Text = Text to be split in portion to be add to the page and the remainder to be returned.
+ // $Align = 'left', 'center', 'centre', 'full' or 'right'.
+
//some special characters are html encoded
//this code serves to make them appear human readable in pdf file
- $Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8');
+ $Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8');// Convert all HTML entities to their applicable characters.
$this->x = $XPos;
- $this->y = $this->h - $YPos - $Height;//RChacon: This -$Height is the difference in yPos between AddText() and AddTextWarp().
+ $this->y = $this->h - $YPos - $Height;//RChacon: This -$Height is the difference in yPos between AddText() and AddTextWarp(). It is better "$this->y = $this->h-$YPos", but that requires to recode all the pdf generator scripts.
- switch($Align) {
+ switch($Align) {// Translate from Pdf-Creator to TCPDF.
+ case 'left':
+ $Align = 'L'; break;
case 'right':
$Align = 'R'; break;
case 'center':
$Align = 'C'; break;
+ case 'centre':
+ $Align = 'C'; break;
+ case 'full':
+ $Align = 'J'; break;
default:
- $Align = 'L';
+ $Align = 'L'; break;
}
- $this->SetFontSize($Height);
+ $this->SetFontSize($Height);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php.
if($Width==0) {
- $Width=$this->w-$this->rMargin-$this->x;
+ $Width = $this->w - $this->rMargin - $this->x;// Line_width = Page_width - Right_margin - Cell_horizontal_coordinate($XPos).
}
$wmax=($Width-2*$this->cMargin);
$s=str_replace("\r",'',$Text);
@@ -167,7 +177,7 @@
}
}
- $this->Cell($Width,$Height,mb_substr($s,0,$sep),$b,2,$Align,$fill);
+ $this->Cell($Width, $Height, mb_substr($s,0,$sep), $b, 2, $Align, $fill);
$this->x=$this->lMargin;
return mb_substr($s, $sep);
}// End function addTextWrap.
@@ -177,7 +187,7 @@
/* Javier: Some scripts set the creator to be WebERP like this
$pdf->addInfo('Creator', 'WebERP http://www.weberp.org');
- But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in tcpdf/config/tcpdfconfig.php
+ But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in ~/includes/tcpdf/config/tcpdfconfig.php
*/ $this->SetCreator(PDF_CREATOR);
}
if ($label == 'Author') {
|
|
From: <rc...@us...> - 2016-04-10 17:12:54
|
Revision: 7489
http://sourceforge.net/p/web-erp/reponame/7489
Author: rchacon
Date: 2016-04-10 17:12:51 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
Modified Paths:
--------------
trunk/SuppTransGLAnalysis.php
trunk/SupplierInvoice.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SuppTransGLAnalysis.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -10,9 +10,9 @@
/* Session started in header.inc for password checking and authorisation level check */
include('includes/session.inc');
-
$Title = _('Supplier Transaction General Ledger Analysis');
-
+$ViewTopic = 'AccountsPayable';
+$BookMark = 'SuppTransGLAnalysis';
include('includes/header.inc');
if (!isset($_SESSION['SuppTrans'])){
@@ -106,9 +106,10 @@
$TableHeader = '<tr>
<th class="ascending">' . _('Account') . '</th>
<th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th class="ascending">' . _('Amount') . '<br />(' . $_SESSION['SuppTrans']->CurrCode . ')</th>
<th>' . _('Narrative') . '</th>
<th class="ascending">' . _('Tag') . '</th>
+ <th colspan="2"> </th>
</tr>';
echo $TableHeader;
$TotalGLValue=0;
@@ -117,11 +118,11 @@
foreach ( $_SESSION['SuppTrans']->GLCodes AS $EnteredGLCode){
echo '<tr>
- <td>' . $EnteredGLCode->GLCode . '</td>
- <td>' . $EnteredGLCode->GLActName . '</td>
+ <td class="text">' . $EnteredGLCode->GLCode . '</td>
+ <td class="text">' . $EnteredGLCode->GLActName . '</td>
<td class="number">' . locale_number_format($EnteredGLCode->Amount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
- <td>' . $EnteredGLCode->Narrative . '</td>
- <td>' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
+ <td class="text">' . $EnteredGLCode->Narrative . '</td>
+ <td class="text">' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Edit=' . $EnteredGLCode->Counter . '">' . _('Edit') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $EnteredGLCode->Counter . '">' . _('Delete') . '</a></td>
</tr>';
@@ -138,6 +139,7 @@
echo '<tr>
<td colspan="2" class="number">' . _('Total') . ':</td>
<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
+ <td colspan="4"> </td>
</tr>
</table>';
@@ -216,7 +218,7 @@
$_POST['Amount']=0;
}
echo '<tr>
- <td>' . _('Amount') . ':</td>
+ <td>' . _('Amount'), ' (', $_SESSION['SuppTrans']->CurrCode, '):</td>
<td><input type="text" class="number" required="required" pattern="(?!^[-]?0[.,]0*$).{1,11}" title="'._('The amount must be numeric and cannot be zero').'" name="Amount" size="12" placeholder="'._('No zero numeric').'" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
</tr>';
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SupplierInvoice.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1109,7 +1109,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $EnteredGLCode->GLCode . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . $EnteredGLCode->Narrative . "',
'" . $EnteredGLCode->Tag . "',
'" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')";
@@ -1138,7 +1138,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $_SESSION['SuppTrans']->GRNAct . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
'" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') .
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/aguapop/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -477,12 +477,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -491,8 +495,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/default/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -438,12 +438,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -451,10 +455,6 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fluid/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -375,20 +375,21 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fresh/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -484,12 +484,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background-color:#C9D392;
color:black;
@@ -501,8 +505,4 @@
width:30%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/gel/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -528,12 +528,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -542,8 +546,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -505,12 +505,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -521,8 +525,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional-rtl/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -523,12 +523,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;/* Should be left ? */
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;/* Should be right ? */
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -539,8 +543,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;/* Should be right ? */
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/silverwolf/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -496,12 +496,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background:gainsboro;
margin:10px auto;
@@ -509,8 +513,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/wood/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -559,12 +559,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -573,8 +577,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/xenos/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -623,12 +623,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-size:18px;
@@ -639,8 +643,4 @@
width:60%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Change.log 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1,5 +1,6 @@
webERP Change Log
+10/04/16 RChacon: On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
Modified: trunk/doc/Manual/ManualAccountsPayable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsPayable.html 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Manual/ManualAccountsPayable.html 2016-04-10 17:12:51 UTC (rev 7489)
@@ -172,7 +172,7 @@
<p>
If there are some charges that relate to stock items and some charges that relate to shipments then the total of both is accumulated into the invoice total.</p>
-<h3>Entry of General Ledger Charges</h3>
+<h3><a id="SuppTransGLAnalysis">Entry of General Ledger Charges</a></h3>
<p>
Purchase invoice entry looks a little different depending on whether the GL link to Account Payable is enabled or not (See Setup tab -> Company Preferences). If the GL interface is NOT enabled then there is simply a field to enter the total amount of the invoice into. If the GL interface is enabled then a third button shows "Enter General Ledger Analysis" - the total of all the general ledger analysis, the shipment costs and the entries against GRNs is accumulated into the total invoice charge and there is no opportunity to enter an invoice total amount anywhere - it is derived as the total of all the defined charges on the invoice.</p>
<p>
|
|
From: <rc...@us...> - 2016-04-11 02:00:44
|
Revision: 7490
http://sourceforge.net/p/web-erp/reponame/7490
Author: rchacon
Date: 2016-04-11 02:00:42 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
Modified Paths:
--------------
trunk/WorkCentres.php
trunk/doc/Change.log
trunk/doc/Manual/ManualManufacturing.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/WorkCentres.php
===================================================================
--- trunk/WorkCentres.php 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/WorkCentres.php 2016-04-11 02:00:42 UTC (rev 7490)
@@ -1,9 +1,11 @@
<?php
/* $Id$*/
+/* Defines the various centres of work within a manufacturing company. Also the overhead and labour rates applicable to the work centre and its standard capacity */
-
include('includes/session.inc');
$Title = _('Work Centres');
+$ViewTopic = 'Manufacturing';
+$BookMark = 'WorkCentres';
include('includes/header.inc');
if (isset($_POST['SelectedWC'])){
@@ -124,11 +126,12 @@
$result = DB_query($sql);
echo '<table class="selection">
<tr>
- <th class="ascending">' . _('WC Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('Location') . '</th>
- <th class="ascending">' . _('Overhead GL Account') . '</th>
- <th class="ascending">' . _('Overhead Per Hour') . '</th>
+ <th class="ascending">', _('WC Code'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th class="ascending">', _('Location'), '</th>
+ <th class="ascending">', _('Overhead GL Account'), '</th>
+ <th class="ascending">', _('Overhead Per Hour'), '</th>
+ <th colspan="2"> </th>
</tr>';
while ($myrow = DB_fetch_array($result)) {
@@ -160,7 +163,10 @@
//end of ifs and buts!
if (isset($SelectedWC)) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="',// Icon image.
+ $Title, '" /> ',// Icon title.
+ $Title, '</p>';// Page title.
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show all Work Centres') . '</a></div>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/doc/Change.log 2016-04-11 02:00:42 UTC (rev 7490)
@@ -1,10 +1,11 @@
webERP Change Log
-10/04/16 RChacon: On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
-07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
+10/04/16 RChacon: In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
+10/04/16 RChacon: In SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". In SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. In css/*/default.css, regroup horizontal align classes for readability. In doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
+07/04/16 RChacon: In includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
-24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
+24/03/16 RChacon: In CustomerReceipt.php, allow more precision on the functional_exchange_rate. In Payments.php, add pattern and required attributes to the functional_exchange_rate input.
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.
@@ -26,9 +27,9 @@
13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
-29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
+29/12/15 RChacon: In GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
-27/12/15 RChacon: On UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
+27/12/15 RChacon: In UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
26/12/2015 Exson: Add items not received information on outstanding po inquiry screen in PO_SelectOSPurchOrder.php.
24/12/15 Exson: Add supplier no as a option for supplier transaction inquiry in SupplierTransInquiry.php.
24/12/15 Exson: Add width of printed text to make day to appear in PDFOstdgGRNsPageHeader.inc.
Modified: trunk/doc/Manual/ManualManufacturing.html
===================================================================
--- trunk/doc/Manual/ManualManufacturing.html 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/doc/Manual/ManualManufacturing.html 2016-04-11 02:00:42 UTC (rev 7490)
@@ -169,4 +169,36 @@
<p>MRP.php runs the MRP itself. It is a regenerative process that purges all of the old files and creates new ones. There is a selection to chose the location for inventory. Days Leeway can be entered, so purchase order and work order dates scheduled within the leeway of the calculated need date are considered valid; the system does not actually change the dates in the work orders or purchase orders, but there is a report of those orders that the MRP estimates should be changed. And there are check boxes to select if MRP Demands, eoq, pan size, and shrinkage factor should be used. The MRP runs pretty quickly. The system I am running it against is not as large as most long running systems, but, with about 3,000 parts, a few hundred open sales orders and purchase orders, a half a dozen demands for assemblies that go 7 levels deep and have close to a thousand parts, plus individual demands for a few hundred other parts, I run this on a 3 and a half year old iMac with 1 gig of memory and it takes less than a minute. I also tried it on my web host, which is in Chicago, while I’m in New Jersey about 30 miles west of New York, and it took less than 20 seconds.</p>
-<p>The MRP doesn’t change or create webERP purchase orders or work orders. I think it might be dangerous to do that automatically, without some sort of human oversight. In the 2.0 version, I might have some sort of screen that will bring up what I call MRP Planned Orders and allow users to generate purchase orders or work orders from them. Right now, there are several reports to show the results of the MRP. MRPReschedules.php shows those work orders and purchase orders that the system calculates should have their dates changed; if there is no requirement for the orders, a CANCEL message is displayed. MRPPlannedWorkOrders.php and MRPPlannedPurchaseOrders.php show orders that the MRP calculates should be created. The reports can be created showing every individual order needed and the source of its requirement, or the orders can be consolidated into weekly or monthly orders. MRPReport.php shows the supply and demand for individual parts. On the demand side, it shows the type of order that created the demand, the top level part for that demand, and the order number – in the case of user entered MRP demands, the order number is system generated. The supply side shows orders that make up the supply and in the case of Planned orders created by the MRP, it shows the type of demand the supply was planned to cover and the order number for that demand. Finally, there is MRPShortages.php that shows those parts that have a demand that is greater than the supply. The dollar total might be a little misleading because if there is a sales order for an assembly without enough supply to cover it, that will show up on the report, but so will all of the components that are needed to build the assembly. I haven’t quite decided if I should exclude the components or not. <!-- Help End: Manufacturing --></p>
+<p>The MRP doesn’t change or create webERP purchase orders or work orders. I think it might be dangerous to do that automatically, without some sort of human oversight. In the 2.0 version, I might have some sort of screen that will bring up what I call MRP Planned Orders and allow users to generate purchase orders or work orders from them. Right now, there are several reports to show the results of the MRP. MRPReschedules.php shows those work orders and purchase orders that the system calculates should have their dates changed; if there is no requirement for the orders, a CANCEL message is displayed. MRPPlannedWorkOrders.php and MRPPlannedPurchaseOrders.php show orders that the MRP calculates should be created. The reports can be created showing every individual order needed and the source of its requirement, or the orders can be consolidated into weekly or monthly orders. MRPReport.php shows the supply and demand for individual parts. On the demand side, it shows the type of order that created the demand, the top level part for that demand, and the order number – in the case of user entered MRP demands, the order number is system generated. The supply side shows orders that make up the supply and in the case of Planned orders created by the MRP, it shows the type of demand the supply was planned to cover and the order number for that demand. Finally, there is MRPShortages.php that shows those parts that have a demand that is greater than the supply. The dollar total might be a little misleading because if there is a sales order for an assembly without enough supply to cover it, that will show up on the report, but so will all of the components that are needed to build the assembly. I haven’t quite decided if I should exclude the components or not.</p>
+
+<div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+</div>
+
+<h2><a id="Maintenance">Maintenance</a></h2>
+
+<h3><a id="WorkCentres">Work Centres</a></h3>
+
+<p>A table of work centres is maintained. It contains the following fields:</p>
+
+<dl>
+ <dt>Work Centre Code</dt>
+ <dd>Enter up to five characters for the work centre code.</dd>
+
+ <dt>Work Centre Description</dt>
+ <dd>Enter up to 20 characters for the work centre name.</dd>
+
+ <dt>Location</dt>
+ <dd>A work centre location is the factory or warehouse where the work center belongs. See <a href="ManualContents.php?ViewTopic=Inventory#Locations">Locations Maintenance</a> to set up a location.</dd>
+
+ <dt>Overhead Recovery GL Account</dt>
+ <dd>The value of the overheads allocated to works and pay for employees in this work centre will be costed to this GL account.</dd>
+
+ <dt>Overhead Per Hour</dt>
+ <dd>Enter the rate per hour (if the method you selected to calculate the overhead was as an hourly rate)
+ <!--or overhead percentage to be applied as an on-cost (if you elected to calculate the overhead as a percentage).-->.</dd>
+</dl>
+
+<!--p>Comments. if Overhead Per Hour is zero or negative = other methods ? </p-->
+
+<!-- Help End: Manufacturing -->
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-04-10 17:12:51 UTC (rev 7489)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-11 02:00:42 UTC (rev 7490)
@@ -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-03-31 07:32-0600\n"
+"PO-Revision-Date: 2016-04-10 19:44-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -2145,7 +2145,7 @@
#: BOMExtendedQty.php:274
msgid "Only Show Shortages"
-msgstr "Mostrar Sólo Escasez"
+msgstr "Solo mostrar escasez"
#: BOMExtendedQty.php:278 BOMIndented.php:268 BOMIndentedReverse.php:246
#: MRPPlannedPurchaseOrders.php:280 MRPPlannedWorkOrders.php:336
@@ -2585,7 +2585,7 @@
#: BOMInquiry.php:245
msgid "Overhead Cost"
-msgstr "Gastos Generales"
+msgstr "Costos generales"
#: BOMInquiry.php:256
msgid "Enter a stock item code above"
@@ -6007,7 +6007,7 @@
#: ContractBOM.php:399 SupplierTenders.php:758
msgid "Only the first"
-msgstr "Sólo el primero"
+msgstr "Solo el primero"
#: ContractBOM.php:399 SupplierTenders.php:758
msgid "can be displayed"
@@ -6388,7 +6388,7 @@
#: Manufacturers.php:115 SalesCategories.php:50 StockClone.php:71
#: Stocks.php:80 Z_MakeNewCompany.php:53
msgid "Only graphics files can be uploaded"
-msgstr "Sólo puede cargar ficheros gráficos"
+msgstr "Solo puede cargar archivos gráficos"
#: Contracts.php:131 FixedAssetItems.php:47 Manufacturers.php:46
#: Manufacturers.php:118 SalesCategories.php:53 StockClone.php:77
@@ -7504,7 +7504,7 @@
#: CounterSales.php:436 SelectOrderItems.php:866 SelectOrderItems.php:1053
msgid "An invalid date entry was made for "
-msgstr "Se realizó una entrada de fecha inválida para "
+msgstr "Se realizó una entrada de fecha no válida para "
#: CounterSales.php:436 SelectOrderItems.php:866 SelectOrderItems.php:1053
msgid "The date entry"
@@ -9361,7 +9361,7 @@
#: CustomerAllocations.php:51
msgid "Only positive amounts are allowed"
-msgstr "Sólo se permiten importes positivos"
+msgstr "Solo se permite cantidades positivas"
#: CustomerAllocations.php:75
msgid ""
@@ -11491,7 +11491,7 @@
#: DeliveryDetails.php:99 DeliveryDetails.php:104 DeliveryDetails.php:109
msgid "An invalid date entry was made"
-msgstr "La Fecha es inválida"
+msgstr "Se hizo una entrada de fecha no válidas "
#: DeliveryDetails.php:99 DeliveryDetails.php:104 DeliveryDetails.php:109
msgid "The date entry must be in the format"
@@ -15933,13 +15933,13 @@
#: POReport.php:871 SalesInquiry.php:82 SelectQASamples.php:166
#: TestPlanResults.php:49
msgid "Invalid From Date"
-msgstr "Fecha Desde Inválida"
+msgstr "Fecha Desde no válida"
#: HistoricalTestResults.php:31 MRPCalendar.php:52 POReport.php:92
#: POReport.php:875 SalesInquiry.php:86 SelectQASamples.php:171
#: TestPlanResults.php:54
msgid "Invalid To Date"
-msgstr "Fecha A Inválida"
+msgstr "Fecha A no válida"
#: HistoricalTestResults.php:51
msgid "Show Test Results For"
@@ -17802,7 +17802,7 @@
#: MRPCalendar.php:157
msgid "Invalid Change Date"
-msgstr "Fecha de Cambio Inválida"
+msgstr "Fecha de Cambio no válida"
#: MRPCalendar.php:174
msgid "Cannot update the MRP Calendar"
@@ -18000,11 +18000,11 @@
#: MRPDemands.php:151
msgid "Invalid due date"
-msgstr "Fecha de vencimiento inválida"
+msgstr "Fecha de vencimiento no válida"
#: MRPDemands.php:159
msgid "Invalid demand type"
-msgstr "Tipo de solicitud inválida"
+msgstr "Tipo de solicitud no válida"
#: MRPDemands.php:169
msgid "is not a valid item code"
@@ -31580,7 +31580,7 @@
#: StockClone.php:1004 Stocks.php:1338
msgid "Shrinkage Factor"
-msgstr "Factor de Escasez (¿Merma?)"
+msgstr "Factor de merma"
#: StockClone.php:1035 Stocks.php:1369
msgid "Item Category Properties"
@@ -35894,7 +35894,7 @@
#: Suppliers.php:745
msgid "Only email address are allowed"
-msgstr ""
+msgstr "Solo se permite direcciones de correo-e"
#: Suppliers.php:745 Suppliers.php:989
msgid "email format such as xx...@ma..."
@@ -35902,7 +35902,7 @@
#: Suppliers.php:749
msgid "Only URL address are allowed"
-msgstr ""
+msgstr "Sólo se permite direcciones URL"
#: Suppliers.php:749
msgid "URL format such as www.example.com"
@@ -36909,8 +36909,8 @@
"Number of month must be shown on report can be changed with this parameters "
"ex: in CustomerInquiry.php "
msgstr ""
-"El número de mes deberá indicarse en el informe, se puede cambiar con estos "
-"parámetros Ejm: in CustomerInquiry.php"
+"La cantidad de meses a mostrar por omisión en el informe se puede cambiar "
+"con este parámetro. E.g. en CustomerInquiry.php"
#: SystemParameters.php:878
msgid "The directory where images are stored"
@@ -39336,11 +39336,11 @@
#: WorkCentres.php:130
msgid "Overhead GL Account"
-msgstr "Cuenta Contable de Gastos Generales"
+msgstr "Cuenta contable de gastos generales"
#: WorkCentres.php:131 WorkCentres.php:275
msgid "Overhead Per Hour"
-msgstr "Gastos Generales Por Hora"
+msgstr "Gastos generales por hora"
#: WorkCentres.php:143
#, php-format
@@ -39615,7 +39615,7 @@
#: WorkOrderEntry.php:344
msgid "The required by date entered is in an invalid format"
-msgstr "La fecha de \"requerido\" por entrada está en un formato inválido"
+msgstr "La fecha de \"requerido\" por entrada está en un formato no válido"
#: WorkOrderEntry.php:364
msgid ""
@@ -42228,7 +42228,7 @@
#: Z_ImportFixedAssets.php:128
msgid "Invalid Description:"
-msgstr "Descripción Inválida:"
+msgstr "Descripción no válida:"
#: Z_ImportFixedAssets.php:132
msgid "The depreciation rate is expected to be numeric"
@@ -42236,7 +42236,7 @@
#: Z_ImportFixedAssets.php:133 Z_ImportFixedAssets.php:137
msgid "Invalid Depreciation Rate:"
-msgstr "Tasa de Depreciación Inválida:"
+msgstr "Tasa de Depreciación no válida:"
#: Z_ImportFixedAssets.php:141
msgid "The accumulated depreciation is expected to be numeric"
@@ -42244,7 +42244,7 @@
#: Z_ImportFixedAssets.php:142 Z_ImportFixedAssets.php:146
msgid "Invalid Accumulated Depreciation:"
-msgstr "Depreciación Acumulada No Válida:"
+msgstr "Depreciación acumulada no válida:"
#: Z_ImportFixedAssets.php:145
msgid ""
@@ -42258,7 +42258,7 @@
#: Z_ImportFixedAssets.php:151 Z_ImportFixedAssets.php:155
msgid "Invalid Cost:"
-msgstr "Costo Inválido:"
+msgstr "Costo no válido:"
#: Z_ImportFixedAssets.php:154
msgid "The cost is expected to be a positive number"
@@ -42274,7 +42274,7 @@
#: Z_ImportFixedAssets.php:160
msgid "Invalid depreciation type:"
-msgstr "Tipo de Depreciación Inválida:"
+msgstr "Tipo de Depreciación no válida:"
#: Z_ImportFixedAssets.php:166
msgid ""
@@ -42285,7 +42285,7 @@
#: Z_ImportFixedAssets.php:167
msgid "Invalid asset category:"
-msgstr "Categoría de activos No Válida:"
+msgstr "Categoría de activos no válida:"
#: Z_ImportFixedAssets.php:172
msgid ""
@@ -42304,7 +42304,7 @@
#: Z_ImportFixedAssets.php:178
msgid "Invalid date format:"
-msgstr "Formato de Fecha Inválida:"
+msgstr "Formato de fecha no válido:"
#: Z_ImportFixedAssets.php:216
msgid "The SQL that was used to add the asset and failed was"
@@ -43752,7 +43752,7 @@
#: api/api_errorcodes.php:179
msgid "Invalid Address Line"
-msgstr "Línea de Dirección Inválida"
+msgstr "Línea de dirección no válida"
#: api/api_errorcodes.php:180
msgid "Currency Code Not Setup"
@@ -43764,7 +43764,7 @@
#: api/api_errorcodes.php:182
msgid "Invalid Client Since Date"
-msgstr "Fecha de Antigüedad del cliente Inválida"
+msgstr "Fecha de Antigüedad del cliente no válida"
#: api/api_errorcodes.php:183
msgid "Hold Reason Not Setup"
@@ -43776,67 +43776,67 @@
#: api/api_errorcodes.php:185
msgid "Invalid Discount"
-msgstr "Descuento Inválido"
+msgstr "Descuento no válido"
#: api/api_errorcodes.php:186
msgid "Invalid Payment Discount"
-msgstr "Descuento del Pago Inválido"
+msgstr "Descuento del Pago no válido"
#: api/api_errorcodes.php:187
msgid "Invalid Last Paid"
-msgstr "Último Pago Inválido"
+msgstr "Último Pago no válido"
#: api/api_errorcodes.php:188
msgid "Invalid Last Paid Date"
-msgstr "Fecha del Último Pago Inválida"
+msgstr "Fecha del Último Pago no válida"
#: api/api_errorcodes.php:189
msgid "Invalid Credit Limit"
-msgstr "Límite de Crédito Inválido"
+msgstr "Límite de crédito no válido"
#: api/api_errorcodes.php:190
msgid "Invalid Inv Address Branch"
-msgstr "Sucursal de la Dirección de la Factura Inválida"
+msgstr "Sucursal de la Dirección de la Factura no válida"
#: api/api_errorcodes.php:191
msgid "Invalid Discount Code"
-msgstr "Código de Descuento Inválido"
+msgstr "Código de descuento no válido"
#: api/api_errorcodes.php:192
msgid "Invalid EDI Invoices"
-msgstr "Facturas EDI Inválidas"
+msgstr "Facturas EDI no válidas"
#: api/api_errorcodes.php:193
msgid "Invalid EDI Orders"
-msgstr "Pedidos EDI Inválidos"
+msgstr "Pedidos EDI no válidos"
#: api/api_errorcodes.php:194
msgid "Invalid EDI Reference"
-msgstr "Referencia EDI Inválida"
+msgstr "Referencia EDI no válida"
#: api/api_errorcodes.php:195
msgid "Invalid EDI Transport"
-msgstr "Transporte EDI Inválido"
+msgstr "Transporte EDI no válido"
#: api/api_errorcodes.php:196
msgid "Invalid EDI Address"
-msgstr "Dirección EDI Inválida"
+msgstr "Dirección EDI no válida"
#: api/api_errorcodes.php:197
msgid "Invalid EDI Server User"
-msgstr "Usuario del Servidor EDI Inválido"
+msgstr "Usuario del Servidor EDI no válido"
#: api/api_errorcodes.php:198
msgid "Invalid EDI Server Password"
-msgstr "Contraseña para el Servidor EDI Inválida"
+msgstr "Contraseña para el Servidor EDI no válida"
#: api/api_errorcodes.php:199
msgid "Invalid Tax Reference"
-msgstr "Referencia Fiscal Inválida"
+msgstr "Referencia Fiscal no válida"
#: api/api_errorcodes.php:200
msgid "Invalid CustomerPOLine"
-msgstr "Línea PO del cliente (nº del cliente en la orden de compra) inválida"
+msgstr "Línea PO del cliente (nº del cliente en la orden de compra) no válida"
#: api/api_errorcodes.php:201
msgid "Database Update Failed"
@@ -43864,7 +43864,7 @@
#: api/api_errorcodes.php:207
msgid "Invalid Est Delivery Days"
-msgstr "Días de Entrega Estimados Inválidos"
+msgstr "Días de Entrega Estimados no válidos"
#: api/api_errorcodes.php:208
msgid "Area Code Not Setup"
@@ -43876,23 +43876,23 @@
#: api/api_errorcodes.php:210
msgid "Invalid Fwd Date"
-msgstr "Fecha Fwd Inválida"
+msgstr "Fecha Fwd no válida"
#: api/api_errorcodes.php:211
msgid "Invalid Phone Number"
-msgstr "Nº de Teléfono Inválido"
+msgstr "Nº de Teléfono no válido"
#: api/api_errorcodes.php:212
msgid "Invalid Fax Number"
-msgstr "Número de Fax Inválido"
+msgstr "Número de Fax no válido"
#: api/api_errorcodes.php:213
msgid "Invalid Contact Name"
-msgstr "Nombre del contacto Inválido"
+msgstr "Nombre de contacto no válido"
#: api/api_errorcodes.php:214
msgid "Invalid Email Address"
-msgstr "Dirección de correo-e inválida"
+msgstr "Dirección de correo-e no válida"
#: api/api_errorcodes.php:215
msgid "Location Code Not Setup"
@@ -43908,19 +43908,19 @@
#: api/api_errorcodes.php:218
msgid "Invalid Deliver Blind"
-msgstr "Despacho a Ciegas Inválido"
+msgstr "Despacho a Ciegas no válido"
#: api/api_errorcodes.php:219
msgid "Invalid Disable Transactions"
-msgstr "Deshabilitar Transacciones Inválida"
+msgstr "Deshabilitar Transacciones no válida"
#: api/api_errorcodes.php:220
msgid "Invalid Special Instructions"
-msgstr "Instrucciones Especiales Inválidas"
+msgstr "Instrucciones Especiales no válidas"
#: api/api_errorcodes.php:221
msgid "Invalid Customer Branch Code"
-msgstr "Código de sucursal de cliente Inválida"
+msgstr "Código de sucursal de cliente no válida"
#: api/api_errorcodes.php:222
msgid "Branch No Does not Exist"
@@ -43944,39 +43944,39 @@
#: api/api_errorcodes.php:227
msgid "Incorrect MB Flag"
-msgstr "Marca MB Inválida"
+msgstr "Marca MB no válida"
#: api/api_errorcodes.php:228
msgid "Invalid Current Cost Date"
-msgstr "Fecha de Costo Actual Inválida"
+msgstr "Fecha de Costo Actual no válida"
#: api/api_errorcodes.php:229
msgid "Invalid Actual Cost"
-msgstr "Costo Real Inválido"
+msgstr "Costo Real no válido"
#: api/api_errorcodes.php:230
msgid "Invalid Lowest Level"
-msgstr "Nivel Mínimo Inválido"
+msgstr "Nivel Mínimo no válido"
#: api/api_errorcodes.php:231
msgid "Invalid Discontinued"
-msgstr "Descontinuado Inválido"
+msgstr "Descontinuado no válido"
#: api/api_errorcodes.php:232
msgid "Invalid EOQ"
-msgstr "EOQ Inválido"
+msgstr "EOQ no válido"
#: api/api_errorcodes.php:233
msgid "Invalid Volume"
-msgstr "Volumen Inválido"
+msgstr "Volumen no válido"
#: api/api_errorcodes.php:234
msgid "Invalid Kgs"
-msgstr "Peso Inválido"
+msgstr "Peso no válido"
#: api/api_errorcodes.php:235
msgid "Incorrect BarCode Length"
-msgstr "Longitud del Código de Barras Inválido"
+msgstr "Longitud del Código de Barras no válido"
#: api/api_errorcodes.php:236
msgid "Incorrect Discount Category"
@@ -43988,7 +43988,7 @@
#: api/api_errorcodes.php:238
msgid "Invalid Serialised"
-msgstr "Seriado Inválido"
+msgstr "Seriado no válido"
#: api/api_errorcodes.php:239
msgid "Incorrect Append File"
@@ -43996,11 +43996,11 @@
#: api/api_errorcodes.php:240
msgid "Invalid Perishable"
-msgstr "Perecedero Inválido"
+msgstr "Perecedero no válido"
#: api/api_errorcodes.php:241
msgid "Invalid Decimal Places"
-msgstr "Posiciones Decimales Inválida"
+msgstr "Posiciones Decimales no válida"
#: api/api_errorcodes.php:242
msgid "Incorrect Long Stock Description Length"
@@ -44016,11 +44016,11 @@
#: api/api_errorcodes.php:245
msgid "Invalid Transaction Date"
-msgstr "Fecha de Transacción Inválida"
+msgstr "Fecha de Transacción no válida"
#: api/api_errorcodes.php:246
msgid "Invalid Settled"
-msgstr "Establecido Inválido"
+msgstr "Establecido no válido"
#: api/api_errorcodes.php:247
msgid "Incorrect Reference"
@@ -44032,7 +44032,7 @@
#: api/api_errorcodes.php:249
msgid "Invalid Order Numbers"
-msgstr "Números de Pedidos Inválidos"
+msgstr "Números de Pedidos no válidos"
#: api/api_errorcodes.php:250
msgid "Invalid Exchange Rate"
@@ -44040,23 +44040,23 @@
#: api/api_errorcodes.php:251
msgid "Invalid OV Amount"
-msgstr "Importe OV Inválido"
+msgstr "Importe OV no válido"
#: api/api_errorcodes.php:252
msgid "Invalid OV Gst"
-msgstr "Gst OV Inválido"
+msgstr "Gst OV no válido"
#: api/api_errorcodes.php:253
msgid "Invalid OV Freight"
-msgstr "Flete OV Inválido"
+msgstr "Flete OV no válido"
#: api/api_errorcodes.php:254
msgid "Invalid Diff On Exchange"
-msgstr "Diferencia en Tasa de Cambio Inválida"
+msgstr "Diferencia en Tasa de Cambio no válida"
#: api/api_errorcodes.php:255
msgid "Invalid Allocation"
-msgstr "Asignación Inválida"
+msgstr "Asignación no válida"
#: api/api_errorcodes.php:256
msgid "Incorrect Invoice Text"
@@ -44064,63 +44064,63 @@
#: api/api_errorcodes.php:257
msgid "Invalid Ship Via"
-msgstr "Envío \"A Través De\" Inválido"
+msgstr "Envío \"A Través De\" no válido"
#: api/api_errorcodes.php:258
msgid "Invalid Edi Sent"
-msgstr "Envío EDI Inválido"
+msgstr "Envío EDI no válido"
#: api/api_errorcodes.php:259
msgid "Invalid Consignment"
-msgstr "Consignación Inválida"
+msgstr "Consignación no válida"
#: api/api_errorcodes.php:260
msgid "Invalid Last Cost"
-msgstr "Ultimo Costo Invál...
[truncated message content] |
|
From: <ex...@us...> - 2016-04-12 01:36:13
|
Revision: 7491
http://sourceforge.net/p/web-erp/reponame/7491
Author: exsonqu
Date: 2016-04-12 01:36:11 +0000 (Tue, 12 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2016-04-11 02:00:42 UTC (rev 7490)
+++ trunk/SelectProduct.php 2016-04-12 01:36:11 UTC (rev 7491)
@@ -4,6 +4,7 @@
$PricesSecurity = 12;//don't show pricing info unless security token 12 available to user
$SuppliersSecurity = 9; //don't show supplier purchasing info unless security token 9 available to user
+$CostSecurity = 18; //don't show cost info unless security token 18 available to user
include ('includes/session.inc');
$Title = _('Search Inventory Items');
@@ -174,6 +175,7 @@
$Price = $PriceRow[1];
echo '<td class="select" colspan="2" style="text-align:right">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>';
}
+ if (in_array($CostSecurity,$_SESSION['AllowedPageSecurityTokens'])) {
echo '<th class="number">' . _('Cost') . ':</th>
<td class="select" style="text-align:right">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td>
<th class="number">' . _('Gross Profit') . ':</th>
@@ -183,8 +185,9 @@
} else {
echo _('N/A');
}
- echo '</td>
- </tr>';
+ echo '</td>';
+ }
+ echo '</tr>';
} //end of if PricesSecuirty allows viewing of prices
echo '</table>'; //end of first nested table
// Item Category Property mod: display the item properties
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-11 02:00:42 UTC (rev 7490)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-12 01:36:11 UTC (rev 7491)
@@ -54,6 +54,7 @@
ALTER table pctabs DROP FOREIGN KEY `pctabs_ibfk_4`;
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
+INSERT INTO securitytokens VALUES(18,'Cost authority');
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <tu...@us...> - 2016-04-16 01:37:01
|
Revision: 7493
http://sourceforge.net/p/web-erp/reponame/7493
Author: turbopt
Date: 2016-04-16 01:37:00 +0000 (Sat, 16 Apr 2016)
Log Message:
-----------
add missing } causing error.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-04-12 01:39:05 UTC (rev 7492)
+++ trunk/PcAuthorizeExpenses.php 2016-04-16 01:37:00 UTC (rev 7493)
@@ -323,7 +323,7 @@
echo '<option value="';
}
echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
-
+ }
} //end while loop get type of tab
echo '</select></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-12 01:39:05 UTC (rev 7492)
+++ trunk/doc/Change.log 2016-04-16 01:37:00 UTC (rev 7493)
@@ -1,5 +1,5 @@
webERP Change Log
-
+15/04/16 PaulT: add missing } causing error.
12/04/16 Exson: add cost security token to make price security and cost security separated to cope with different situation.
10/04/16 RChacon: In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
10/04/16 RChacon: In SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". In SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. In css/*/default.css, regroup horizontal align classes for readability. In doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
@@ -18,7 +18,7 @@
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.
+02/02/16 Exson��Fixed 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: <dai...@us...> - 2016-04-25 09:53:55
|
Revision: 7494
http://sourceforge.net/p/web-erp/reponame/7494
Author: daintree
Date: 2016-04-25 09:53:53 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Jan Bakke: improvements to allow gif and png images
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/Contracts.php
trunk/FixedAssetItems.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/Manufacturers.php
trunk/PDFPriceList.php
trunk/PO_Items.php
trunk/SalesCategories.php
trunk/SelectCreditItems.php
trunk/SelectProduct.php
trunk/StockClone.php
trunk/StockDispatch.php
trunk/Stocks.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/Z_ChangeStockCode.php
trunk/Z_ItemsWithoutPicture.php
trunk/doc/Change.log
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/ContractBOM.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -370,10 +370,19 @@
$k=1;
}
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
+ $ImageSource = _('No Image');
}
echo '<td>' . $myrow['stockid'] . '</td>
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Contracts.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -110,16 +110,20 @@
echo '<a href="'. $RootPath . '/SelectContract.php">' . _('Back to Contract Selection'). '</a><br />';
+$SupportedImgExt = array('png','jpg','jpeg');
+
//attempting to upload the drawing image file
if (isset($_FILES['Drawing']) AND $_FILES['Drawing']['name'] !='' AND $_SESSION['Contract'.$identifier]->ContractRef!='') {
$result = $_FILES['Drawing']['error'];
+ $ImgExt = pathinfo($_FILES['Drawing']['name'], PATHINFO_EXTENSION);
+
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.jpg';
+ $filename = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.' . $ImgExt;
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['Drawing']['name']),mb_strlen($_FILES['Drawing']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['Drawing']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -127,12 +131,15 @@
} elseif ( $_FILES['Drawing']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($filename)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($filename);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -913,9 +920,14 @@
<td>' . _('Contract Description') . ':</td>
<td><textarea name="ContractDescription" style="width:100%" required="required" title="' . _('A description of the contract is required') . '" minlength="5" rows="5" cols="40">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
</tr><tr>
- <td>' . _('Drawing File') . ' .jpg' . ' ' . _('format only') .':</td>
- <td><input type="file" id="Drawing" name="Drawing" /></td>
- </tr>';
+ <td>' . _('Drawing File') . ' ' . implode(", ", $SupportedImgExt) . ' ' . _('format only') .':</td>
+ <td><input type="file" id="Drawing" name="Drawing" />
+
+ </td>';
+
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ echo '<td> ' . $imagefile . '</td>';
+ echo '</tr>';
if (!isset($_SESSION['Contract'.$identifier]->RequiredDate)) {
$_SESSION['Contract'.$identifier]->RequiredDate = DateAdd(date($_SESSION['DefaultDateFormat']),'m',1);
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/FixedAssetItems.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -27,15 +27,17 @@
$AssetID = '';
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') {
+ $ImgExt = pathinfo($_FILES['ItemPicture']['name'], PATHINFO_EXTENSION);
$result = $_FILES['ItemPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.jpg';
-
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ $filename = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ImgExt;
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -43,12 +45,15 @@
} elseif ( $_FILES['ItemPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($filename)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($filename);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -367,6 +372,14 @@
$result=DB_query($sql, _('Could not delete the asset record'),'',true);
$result = DB_Txn_Commit();
+
+ // Delete the AssetImage
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ unlink($file);
+ }
+ }
prnMsg(_('Deleted the asset record for asset number' ) . ' ' . $AssetID );
unset($_POST['LongDescription']);
@@ -482,22 +495,23 @@
if (!isset($New) ) { //ie not new at all!
echo '<tr>
- <td>' . _('Image File (.jpg)') . ':</td>
- <td><input type="file" id="ItemPicture" name="ItemPicture" /></td>';
+ <td>' . _('Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
+ <td><input type="file" id="ItemPicture" name="ItemPicture" />
+ <br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').'
+ </td>';
- if (function_exists('imagecreatefromjpg')){
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
$AssetImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&AssetID='.urlencode($AssetID).
+ '&StockID='.urlencode('ASSET_' . $AssetID).
'&text='.
'&width=64'.
'&height=64'.
'" />';
+ } else if (file_exists ($imagefile)) {
+ $AssetImgLink = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- if( isset($AssetID) and file_exists($_SESSION['part_pics_dir'] . '/ASSET_' .$AssetID.'.jpg') ) {
- $AssetImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/ASSET_' .$AssetID.'.jpg" />';
- } else {
- $AssetImgLink = _('No Image');
- }
+ $AssetImgLink = _('No Image');
}
if ($AssetImgLink!=_('No Image')) {
@@ -509,6 +523,22 @@
// EOR Add Image upload for New Item - by Ori
} //only show the add image if the asset already exists - otherwise AssetID will not be set - and the image needs the AssetID to save
+if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($file);
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $AssetImgLink = _('No Image');
+ }
+ }
+ }
+}
+
+
echo '<tr>
<td>' . _('Asset Category') . ':</td>
<td><select name="AssetCategoryID">';
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/GetStockImage.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -2,7 +2,7 @@
/* $Id$*/
-//include ('includes/session.inc');
+include ('includes/session.inc');
/*
http://127.0.0.1/~brink/webERP/GetStockImage.php
?automake=1&width=81&height=74&stockid=&textcolor=FFFFF0&bevel=3&text=aa&bgcolor=007F00
@@ -49,13 +49,6 @@
return array('red' => $Red, 'green' => $Green, 'blue' => $Blue );
}
-if (!function_exists('imagecreatefrompng')){
- $Title = _('Image Manipulation Script Problem');
- include('includes/header.inc');
- prnMsg(_('This script requires the gd image functions to be available to php - this needs to be enabled in your server php version before this script can be used'),'error');
- include('includes/footer.inc');
- exit;
-}
$DefaultImage = 'webERPsmall.png';
$FilePath = $_SESSION['part_pics_dir'] . '/';
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/GoodsReceived.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -182,8 +182,15 @@
//Now Display LineItem
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if ($imagefile) {
+ $ImageLink = '<a href="' . $imagefile . '" target="_blank">' . $LnItm->StockID . '</a>';
+ } else {
+ $ImageLink = $LnItm->StockID;
+ }
- echo '<td><a href="' . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.jpg" target="_blank">' . $LnItm->StockID . '</a></td>
+ echo '<td>' . $ImageLink . '</td>
<td>' . $LnItm->Suppliers_PartNo . '</td>
<td>' . $LnItm->ItemDescription . '</td>
<td class="number">' . $DisplaySupplierQtyOrd . '</td>
Modified: trunk/Manufacturers.php
===================================================================
--- trunk/Manufacturers.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Manufacturers.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -15,6 +15,8 @@
$SelectedManufacturer = $_POST['SelectedManufacturer'];
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($_POST['submit'])) {
@@ -30,11 +32,13 @@
$result = $_FILES['BrandPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg';
+
+ $ImgExt = pathinfo($_FILES['BrandPicture']['name'], PATHINFO_EXTENSION);
+ $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ImgExt;
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['BrandPicture']['name']),mb_strlen($_FILES['BrandPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['BrandPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -42,12 +46,15 @@
} elseif ( $_FILES['BrandPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -60,13 +67,30 @@
}
}
if( isset($_POST['ManufacturersImage'])){
- if (file_exists($_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg') ) {
- $_POST['ManufacturersImage'] = 'BRAND-' . $SelectedManufacturer . '.jpg';
- } else {
- $_POST['ManufacturersImage'] = '';
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ $_POST['ManufacturersImage'] = 'BRAND-' . $SelectedManufacturer;
+ break;
+ } else {
+ $_POST['ManufacturersImage'] = '';
+ }
}
+
}
-
+ if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ @unlink($file);
+ $_POST['ManufacturersImage'] = '';
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ }
+ }
+ }
+ }
+
$sql = "UPDATE manufacturers SET manufacturers_name='" . $_POST['ManufacturersName'] . "',
manufacturers_url='" . $_POST['ManufacturersURL'] . "'";
if (isset($_POST['ManufacturersImage'])){
@@ -102,11 +126,13 @@
$result = $_FILES['BrandPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.jpg';
+
+ $ImgExt = pathinfo($_FILES['BrandPicture']['name'], PATHINFO_EXTENSION);
+ $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.' . $ImgExt;
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['BrandPicture']['name']),mb_strlen($_FILES['BrandPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['BrandPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -114,19 +140,25 @@
} elseif ( $_FILES['BrandPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
if ($UploadTheFile=='Yes'){
$result = move_uploaded_file($_FILES['BrandPicture']['tmp_name'], $FileName);
$message = ($result)?_('File url') . '<a href="' . $FileName .'">' . $FileName . '</a>' : _('Something is wrong with uploading a file');
- DB_query("UPDATE manufacturers SET manufacturers_image='" . $FileName . "'");
+ DB_query("UPDATE manufacturers
+ SET manufacturers_image='" . 'BRAND-' . $_SESSION['LastInsertId'] . "'
+ WHERE manufacturers_id = '" . $_SESSION['LastInsertId'] . "'
+ ");
}
}
@@ -138,7 +170,6 @@
unset($SelectedManufacturer);
}
-
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
@@ -155,10 +186,13 @@
}
if (!$CancelDelete) {
-
+
$result = DB_query("DELETE FROM manufacturers WHERE manufacturers_id='" . $SelectedManufacturer . "'");
- if( file_exists($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg') ) {
- unlink($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg');
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ @unlink($file);
+ }
}
prnMsg( _('Manufacturer') . ' ' . $SelectedManufacturer . ' ' . _('has been deleted') . '!', 'success');
unset ($SelectedManufacturer);
@@ -205,16 +239,25 @@
$k=1;
}
- if( file_exists($_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.jpg') ) {
- $BrandImgLink = '<img width="120" height="120" src="' . $_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.jpg" />';
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists($imagefile)){
+ $BrandImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode('/BRAND-' . $myrow['manufacturers_id']).
+ '&text='.
+ '&width=120'.
+ '&height=120'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $BrandImgLink = '<img src="' . $imagefile . '" height="120" width="120" />';
} else {
$BrandImgLink = _('No Image');
}
+
printf('<td>%s</td>
<td>%s</td>
<td><a target="_blank" href="%s">%s</a></td>
<td>%s</td>
- <td><a href="%sSelectedManufacturer=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedManufacturer=%s&edit=1">' . _('Edit') . '</a></td>
<td><a href="%sSelectedManufacturer=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this brand?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['manufacturers_id'],
@@ -297,13 +340,33 @@
<td><input type="text" name="ManufacturersURL" value="' . $_POST['ManufacturersURL'] . '" size="50" maxlength="50" /></td>
</tr>
<tr>
- <td>' . _('Brand Image File (.jpg)') . ':</td>
- <td><input type="file" id="BrandPicture" name="BrandPicture" /></td>
+ <td>' . _('Brand Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
+ <td><input type="file" id="BrandPicture" name="BrandPicture" />';
+
+ if (isset ($_GET['edit']) ) {
+ echo ' <br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').' ';
+ }
+
+ echo ' </td>
</tr>';
if (isset($SelectedManufacturer)){
- if(file_exists($_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg') ) {
- echo '</tr><td colspan="2"><img width="100" height="100" src="' . $_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg" /></tr></tr>';
- }
+
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('xgd') && function_exists('gd_info') && file_exists($imagefile)){
+ $BrandImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode('/BRAND-' . $SelectedManufacturer).
+ '&text='.
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ } else {
+ if( isset($SelectedManufacturer) AND !empty($SelectedManufacturer) AND file_exists($imagefile) ) {
+ $BrandImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
+ } else {
+ $BrandImgLink = _('No Image');
+ }
+ }
+ echo '<tr><td colspan="2">' . $BrandImgLink . '</td></tr>';
}
echo '</table>
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/PDFPriceList.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -230,14 +230,14 @@
$YPos -= $FontSize;
// Prints item image:
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $PriceList['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
$YPosImage = $YPos;// Initializes the image bottom $YPos.
- if(file_exists($_SESSION['part_pics_dir'] . '/' .$PriceList['stockid'].'.jpg') ) {
- $img = imagecreatefromjpeg($_SESSION['part_pics_dir'] . '/' . $PriceList['stockid'] . '.jpg');
+ if (file_exists($imagefile) ) {
if($YPos-36 < $Bottom_Margin) {// If the image bottom reaches the bottom margin, do PageHeader().
PageHeader();
}
- $LeftOvers = $pdf->Image($_SESSION['part_pics_dir'] . '/'.$PriceList['stockid'].'.jpg',
- $Left_Margin+3, $Page_Height-$YPos, 36, 36);
+ $LeftOvers = $pdf->Image($imagefile,$Left_Margin+3, $Page_Height-$YPos, 36, 36);
$YPosImage = $YPos-36;// Stores the $YPos of the image bottom (see bottom).
}
// Prints stockmaster.longdescription:
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/PO_Items.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -1147,7 +1147,7 @@
echo '</select></td>
<td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>
- <tr><td>' . _('Only items defined as from this Supplier') . ' <input type="checkbox" name="SupplierItemsOnly" ';
+ <tr><td>' . _('Only items defined as from this Supplier') . ' <input type="checkbox" checked name="SupplierItemsOnly" ';
if (isset($_POST['SupplierItemsOnly']) AND $_POST['SupplierItemsOnly']=='on'){
echo 'checked';
}
@@ -1207,11 +1207,19 @@
$k=1;
}
- $FileName = $myrow['stockid'] . '.jpg';
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
- $ImageSource = '<img src="'.$RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" width="50" height="50" />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
+ $ImageSource = _('No Image');
}
/*Get conversion factor and supplier units if any */
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SalesCategories.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -32,29 +32,36 @@
$EditName = $_POST['EditName'];
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($SelectedCategory) AND isset($_FILES['CategoryPicture']) AND $_FILES['CategoryPicture']['name'] !='') {
-
+ $ImgExt = pathinfo($_FILES['CategoryPicture']['name'], PATHINFO_EXTENSION);
+
$result = $_FILES['CategoryPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
// Stock is always capatalized so there is no confusion since "cat_" is lowercase
- $FileName = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg';
+ $FileName = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ImgExt;
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['CategoryPicture']['name']),mb_strlen($_FILES['CategoryPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
- } elseif ( $_FILES['CategoryPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
+ } else if ( $_FILES['CategoryPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
$UploadTheFile ='No';
- } elseif ( $_FILES['CategoryPicture']['type'] == 'text/plain' ) { //File Type Check
+ } else if ( $_FILES['CategoryPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ //prnMsg(_('Attempting to overwrite an existing item image'.$FileName),'warn');
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -65,8 +72,21 @@
/* EOR Add Image upload for New Item - by Ori */
}
+if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($file);
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $AssetImgLink = _('No Image');
+ }
+ }
+ }
+}
-
if (isset($_POST['submit']) AND isset($EditName) ) { // Creating or updating a category
//initialise no input errors assumed initially before we test
@@ -110,7 +130,6 @@
$result = DB_query($sql);
prnMsg($msg,'success');
}
-
unset ($SelectedCategory);
unset($_POST['SalesCatName']);
unset($_POST['Active']);
@@ -138,9 +157,18 @@
$result = DB_query($sql);
prnMsg(_('The sales category') . ' ' . $SelectedCategory . ' ' . _('has been deleted') .
' !','success');
- if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg') ) {
- unlink($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg');
+
+ //if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg') ) {
+ // unlink($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg');
+ //}
+
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ unlink($file);
+ }
}
+
unset (...
[truncated message content] |
|
From: <dai...@us...> - 2016-04-25 10:01:30
|
Revision: 7495
http://sourceforge.net/p/web-erp/reponame/7495
Author: daintree
Date: 2016-04-25 10:01:27 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Jan Bakke: improvements to google maps api v 3
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Change.log
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-04-25 09:53:53 UTC (rev 7494)
+++ trunk/SelectCustomer.php 2016-04-25 10:01:27 UTC (rev 7495)
@@ -25,6 +25,17 @@
if (!isset($_SESSION['CustomerType'])) { //initialise if not already done
$_SESSION['CustomerType'] = '';
}
+
+if (isset($_POST['JustSelectedACustomer']) ) {
+ if (isset ($_POST['SubmitCustomerSelection'])) {
+ foreach ($_POST['SubmitCustomerSelection'] AS $CustomerID=>$BranchCode)
+ $_SESSION['CustomerID'] = $CustomerID;
+ $_SESSION['BranchCode'] = $BranchCode;
+ } else {
+ prnMsg(_('Unable to identify the selected customer'), 'error');
+ }
+}
+
// only run geocode if integration is turned on AND customer has been selected
if ($_SESSION['geocode_integration'] == 1 AND $_SESSION['CustomerID'] != "") {
$sql = "SELECT * FROM geocode_param WHERE 1";
@@ -36,41 +47,106 @@
custbranch.branchcode,
custbranch.brname,
custbranch.lat,
- custbranch.lng
+ custbranch.lng,
+ braddress1,
+ braddress2,
+ braddress3,
+ braddress4
FROM debtorsmaster LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
WHERE debtorsmaster.debtorno = '" . $_SESSION['CustomerID'] . "'
+ AND custbranch.branchcode = '" . $_SESSION['BranchCode'] . "'
ORDER BY debtorsmaster.debtorno";
$ErrMsg = _('An error occurred in retrieving the information');
$result2 = DB_query($sql, $ErrMsg);
$myrow2 = DB_fetch_array($result2);
- $Lattitude = $myrow2['lat'];
- $Longitude = $myrow2['lng'];
+ $Lat = $myrow2['lat'];
+ $Lng = $myrow2['lng'];
$API_Key = $myrow['geocode_key'];
$center_long = $myrow['center_long'];
$center_lat = $myrow['center_lat'];
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $API_Key . '"';
- echo ' type="text/javascript"></script>';
- echo ' <script type="text/javascript">';
- echo 'function load() {
- if (GBrowserIsCompatible()) {
- var map = new GMap2(document.getElementById("map"));
- map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());';
- echo 'map.setCenter(new GLatLng(' . $Lattitude . ', ' . $Longitude . '), 11);';
- echo 'var marker = new GMarker(new GLatLng(' . $Lattitude . ', ' . $Longitude . '));';
- echo 'map.addOverlay(marker);
- GEvent.addListener(marker, "click", function() {
- marker.openInfoWindowHtml(WINDOW_HTML);
- });
- marker.openInfoWindowHtml(WINDOW_HTML);
+
+ if ($Lat == 0 && $myrow2["braddress1"] !='' && $_SESSION['BranchCode'] !='' ) {
+ $delay = 0;
+ $base_url = "https://" . $map_host . "/maps/api/geocode/xml?address=";
+
+ $geocode_pending = true;
+ while ($geocode_pending) {
+ $address = urlencode($myrow2["braddress1"] . "," . $myrow2["braddress2"] . "," . $myrow2["braddress3"] . "," . $myrow2["braddress4"]);
+ $id = $myrow2["branchcode"];
+ $debtorno =$myrow2["debtorno"];
+ $request_url = $base_url . $address . ',&sensor=true';
+
+ $buffer = file_get_contents($request_url) or die("url not loading");
+ $xml = simplexml_load_string($buffer);
+ //echo $xml->asXML();
+
+ $status = $xml->status;
+ if (strcmp($status, "OK") == 0) {
+ $geocode_pending = false;
+
+ $Lat = $xml->result->geometry->location->lat;
+ $Lng = $xml->result->geometry->location->lng;
+
+ $query = sprintf("UPDATE custbranch " .
+ " SET lat = '%s', lng = '%s' " .
+ " WHERE branchcode = '%s' " .
+ " AND debtorno = '%s' LIMIT 1;",
+ ($Lat),
+ ($Lng),
+ ($id),
+ ($debtorno));
+ $update_result = DB_query($query);
+
+ if ($update_result==1) {
+ prnMsg( _('GeoCode has been updated for CustomerID') . ': ' . $id . ' - ' . _('Latitude') . ': ' . $Lat . ' ' . _('Longitude') . ': ' . $Lng ,'info');
+ }
+ } else {
+ $geocode_pending = false;
+ prnMsg(_('Unable to update GeoCode for CustomerID') . ': ' . $id . ' - ' . _('Received status') . ': ' . $status , 'error');
+ }
+ usleep($delay);
}
+ }
+
+ echo '
+ <script src="https://' . $map_host . '/maps/api/js?v=3.exp&key=' . $API_Key . '" type="text/javascript"></script>
+ <script type="text/javascript">
+ function initialize() {
+ var latlng = new google.maps.LatLng('.$Lat.','.$Lng.');
+ var map = new google.maps.Map(
+ document.getElementById("map"), {
+ center: latlng,
+ zoom: 12,
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ });
+ var marker = new google.maps.Marker({
+ position: latlng,
+ map: map
+ });
+ var contentString =
+ "<div style=\"overflow: auto;\">" +
+ "<div><b>'.$myrow2['brname'].'</b></div>" +
+ "<div>'.$myrow2['braddress1'].'</div>" +
+ "<div>'.$myrow2['braddress2'].'</div>" +
+ "<div>'.$myrow2['braddress3'].'</div>" +
+ "<div>'.$myrow2['braddress4'].'</div>" +
+ "</div>";
+
+ var infowindow = new google.maps.InfoWindow({
+ content: contentString,
+ MaxWidth: 250
+ });
+ google.maps.event.addListener(marker, "click", function() {
+ infowindow.open(map,marker);
+ });
}
- </script>';
- echo '<body onload="load()" onunload="GUnload()">';
+ google.maps.event.addDomListener(window, "load", initialize);
+ </script>';
+
} //end if geocode integration is turned on AND a customer is selected
unset($result);
@@ -167,21 +243,6 @@
}
} //end of if search
-if (isset($_POST['JustSelectedACustomer'])) {
- /*Need to figure out the number of the form variable that the user clicked on */
- for ($i = 0; $i < count($_POST); $i++) { //loop through the returned customers
- if (isset($_POST['SubmitCustomerSelection' . $i])) {
- break;
- }
- } //end loop through $_POST array
- if ($i == count($_POST)) {
- prnMsg(_('Unable to identify the selected customer'), 'error');
- } else {
- $_SESSION['CustomerID'] = $_POST['SelectedCustomer' . $i];
- $_SESSION['BranchCode'] = $_POST['SelectedBranch' . $i];
- }
-} // end if Just Selected A Customer
-
if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
if (!isset($_SESSION['BranchCode'])) {
$SQL = "SELECT debtorsmaster.name,
@@ -193,7 +254,8 @@
} //!isset($_SESSION['BranchCode'])
else {
$SQL = "SELECT debtorsmaster.name,
- custbranch.phoneno
+ custbranch.phoneno,
+ custbranch.brname
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'
@@ -204,10 +266,12 @@
if ($myrow = DB_fetch_array($result)) {
$CustomerName = htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false);
$PhoneNo = $myrow['phoneno'];
+ $BranchName = $myrow['brname'];
} //$myrow = DB_fetch_array($result)
unset($result);
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '<br>';
+
echo '<div class="page_help_text">' . _('Select a menu option to operate using this customer') . '.</div><br />';
echo '<table cellpadding="4" width="90%" class="selection">
@@ -287,9 +351,9 @@
<td>' . _('Enter a partial Phone Number') . ':</td>
<td>';
if (isset($_POST['CustPhone'])) {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
+ echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
} else {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" maxlength="18" />';
+ echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" maxlength="18" />';
}
echo '</td>';
echo '<td><b>' . _('OR') . '</b></td>
@@ -452,9 +516,9 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="SubmitCustomerSelection' . $i . '" value="' . htmlspecialchars($myrow['debtorno'] . ' ' . $myrow['branchcode'], ENT_QUOTES, 'UTF-8', false) . '" />
- <input type="hidden" name="SelectedCustomer' . $i . '" value="' . $myrow['debtorno'] . '" />
- <input type="hidden" name="SelectedBranch' . $i . '" value="' . $myrow['branchcode'] . '" /></td>
+ echo '<td>
+ <button type="submit" name="SubmitCustomerSelection['.htmlspecialchars($myrow['debtorno'], ENT_QUOTES, 'UTF-8', false).']" value="' . htmlspecialchars($myrow['branchcode'], ENT_QUOTES, 'UTF-8', false) . '" >' . $myrow['debtorno'] . ' ' . $myrow['branchcode'] . '</button>
+ </td>
<td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td>' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td>' . $myrow['contactname'] . '</td>
@@ -495,31 +559,30 @@
}
echo '</div>
- </form>';
+ </form>';
// Only display the geocode map if the integration is turned on, AND there is a latitude/longitude to display
if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
echo '<br />';
- if ($Lattitude == 0) {
+ if ($Lat == 0) {
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
} else {
echo '<tr>
<td colspan="2">
- <table width="45%" cellpadding="4">
+ <table style="width: 45%;" cellpadding="4">
<tr>
- <th style="width:33%">' . _('Customer Mapping') . '</th>
+ <th style="width:auto">' . _('Customer Mapping') . '</th>
</tr>
</td>
<th valign="top">
- <div class="centre">' . _('Mapping is enabled, Map will display below.') . '
- </div>
- <div align="center" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px">
- </div>
+ <div class="centre">' . _('Mapping is enabled, Map will display below.') . '</div>
+ <div class="center" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px; margin: 0 auto;"></div>
<br />
</th>
</tr>
</table>';
}
+
} //end if Geocode integration is turned on
// Extended Customer Info only if selected in Configuration
if ($_SESSION['Extended_CustomerInfo'] == 1) {
@@ -556,8 +619,8 @@
AND type !=12";
$Total1Result = DB_query($SQL);
$row = DB_fetch_array($Total1Result);
- echo '<table width="45%" cellpadding="4">';
- echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
+ echo '<table style="width: 45%;" cellpadding="4">';
+ echo '<tr><th style="width:auto" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">';
/* Customer Data */
if ($myrow['lastpaiddate'] == 0) {
@@ -604,9 +667,10 @@
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY contid";
$result = DB_query($sql);
+
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
- echo '<br /><table width="45%">';
+ echo '<br /><table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Name') . '</th>
<th class="ascending">' . _('Role') . '</th>
@@ -636,6 +700,23 @@
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
+
+ // Customer Branch Contacts if selected
+ if (isset ($_SESSION['BranchCode']) && $_SESSION['BranchCode'] != '') {
+ $sql = "SELECT branchcode, brname, contactname, phoneno, email FROM custbranch
+ WHERE debtorno='" . $_SESSION['CustomerID'] . "'
+ AND branchcode='" . $_SESSION['BranchCode'] . "'";
+ $result2 = DB_query($sql);
+ $BranchContact = DB_fetch_row($result2);
+
+ echo '<tr class="EvenTableRows">
+ <td>' . $BranchContact[2] . '</td>
+ <td>' . _('Branch Contact') . ' ' . $BranchContact[0] . '</td>
+ <td>' . $BranchContact[3] . '</td>
+ <td><a href="mailto:' . $BranchContact[4] . '">' . $BranchContact[4] . '</a></td>
+ <td colspan="3"></td>
+ </tr>';
+ }
echo '</table>';
} //end if there are contact rows returned
else {
@@ -656,7 +737,7 @@
$result = DB_query($sql);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" />' . ' ' . _('Customer Notes') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Date') . '</th>
<th>' . _('Note') . '</th>
@@ -685,7 +766,7 @@
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
- } //end if there are customer notes to display
+ } //end if there are customer notes to display
else {
if ($_SESSION['CustomerID'] != '') {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" /><a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note for this Customer') . '</a></div>';
@@ -698,16 +779,16 @@
$result = DB_query($sql);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/folder_add.png" title="' . _('Customer Type (Group) Notes') . '" alt="" />' . ' ' . _('Customer Type (Group) Notes for:' . '<b> ' . $CustomerTypeName . '</b>') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Date') . '</th>
- <th>' . _('Note') . '</th>
- <th>' . _('File Link / Reference / URL') . '</th>
- <th class="ascending">' . _('Priority') . '</th>
- <th>' . _('Edit') . '</th>
- <th>' . _('Delete') . '</th>
- <th><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . _('Add New Group Note') . '</a></th>
- </tr>';
+ <th>' . _('Note') . '</th>
+ <th>' . _('File Link / Reference / URL') . '</th>
+ <th class="ascending">' . _('Priority') . '</th>
+ <th>' . _('Edit') . '</th>
+ <th>' . _('Delete') . '</th>
+ <th><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . _('Add New Group Note') . '</a></th>
+ </tr>';
$k = 0; //row colour counter
while ($myrow = DB_fetch_array($result)) {
if ($k == 1) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-25 09:53:53 UTC (rev 7494)
+++ trunk/doc/Change.log 2016-04-25 10:01:27 UTC (rev 7495)
@@ -1,5 +1,6 @@
webERP Change Log
+25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-(
25/4/16 Jan Bakke: Improvements to allow .png and .gif images
15/04/16 PaulT: add missing } causing error.
12/04/16 Exson: add cost security token to make price security and cost security separated to cope with different situation.
|
|
From: <rc...@us...> - 2016-04-25 21:15:11
|
Revision: 7496
http://sourceforge.net/p/web-erp/reponame/7496
Author: rchacon
Date: 2016-04-25 21:15:09 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext. Improve code.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-04-25 10:01:27 UTC (rev 7495)
+++ trunk/Payments.php 2016-04-25 21:15:09 UTC (rev 7496)
@@ -3,43 +3,42 @@
/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
+
include('includes/session.inc');
-
$Title = _('Payment Entry');
-
-if (isset($_GET['SupplierID'])) {
+if(isset($_GET['SupplierID'])) {
$ViewTopic = 'AccountsPayable';
$BookMark = 'SupplierPayments';
} else {
$ViewTopic= 'GeneralLedger';
$BookMark = 'BankAccountPayments';
}
+include('includes/header.inc');
-include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['PaymentCancelled'])) {
+if(isset($_POST['PaymentCancelled'])) {
prnMsg(_('Payment Cancelled since cheque was not printed'), 'warning');
include('includes/footer.inc');
exit();
}
-if (empty($_GET['identifier'])){
+if(empty($_GET['identifier'])) {
/*unique session identifier to ensure that there is no conflict with other order enty session on the same machine */
$identifier=date('U');
-}else{
+} else {
$identifier=$_GET['identifier'];//edit GLItems
}
-if (isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes'){
- unset($_SESSION['PaymentDetail' . $identifier]->GLItems);
- unset($_SESSION['PaymentDetail' . $identifier]);
+if(isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes') {
+ unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
+ unset($_SESSION['PaymentDetail'.$identifier]);
}
-if (!isset($_SESSION['PaymentDetail' . $identifier])){
- $_SESSION['PaymentDetail' . $identifier] = new Payment;
- $_SESSION['PaymentDetail' . $identifier]->GLItemCounter = 1;
+if(!isset($_SESSION['PaymentDetail'.$identifier])) {
+ $_SESSION['PaymentDetail'.$identifier] = new Payment;
+ $_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
}
-if ((isset($_POST['UpdateHeader'])
+if((isset($_POST['UpdateHeader'])
AND $_POST['BankAccount']=='')
OR (isset($_POST['Process']) AND $_POST['BankAccount']=='')) {
@@ -50,22 +49,21 @@
$BankAccountEmpty=false;
}
-echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Payments Entry')
-. '" alt="" />' . ' ' . _('Bank Account Payments Entry') . '
- </p>';
-echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account. <br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="',// Icon image.
+ _('Bank Account Payments Entry'), '" /> ',// Icon title.
+ _('Bank Account Payments Entry'), '</p>';// Page title.
+echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
<br />';
-if (isset($_GET['SupplierID'])){
+if(isset($_GET['SupplierID'])) {
/*The page was called with a supplierID check it is valid and default the inputs for Supplier Name and currency of payment */
- unset($_SESSION['PaymentDetail' . $identifier]->GLItems);
- unset($_SESSION['PaymentDetail' . $identifier]);
- $_SESSION['PaymentDetail' . $identifier] = new Payment;
- $_SESSION['PaymentDetail' . $identifier]->GLItemCounter = 1;
+ unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
+ unset($_SESSION['PaymentDetail'.$identifier]);
+ $_SESSION['PaymentDetail'.$identifier] = new Payment;
+ $_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
-
$SQL= "SELECT suppname,
address1,
address2,
@@ -79,26 +77,26 @@
WHERE supplierid='" . $_GET['SupplierID'] . "'";
$Result = DB_query($SQL);
- if (DB_num_rows($Result)==0){
+ if(DB_num_rows($Result)==0) {
prnMsg( _('The supplier code that this payment page was called with is not a currently defined supplier code') . '. ' . _('If this page is called from the selectSupplier page then this assures that a valid supplier is selected'),'warn');
include('includes/footer.inc');
exit;
} else {
$myrow = DB_fetch_array($Result);
- if ($myrow['factorcompanyid'] == 0) {
- $_SESSION['PaymentDetail' . $identifier]->SuppName = $myrow['suppname'];
- $_SESSION['PaymentDetail' . $identifier]->Address1 = $myrow['address1'];
- $_SESSION['PaymentDetail' . $identifier]->Address2 = $myrow['address2'];
- $_SESSION['PaymentDetail' . $identifier]->Address3 = $myrow['address3'];
- $_SESSION['PaymentDetail' . $identifier]->Address4 = $myrow['address4'];
- $_SESSION['PaymentDetail' . $identifier]->Address5 = $myrow['address5'];
- $_SESSION['PaymentDetail' . $identifier]->Address6 = $myrow['address6'];
- $_SESSION['PaymentDetail' . $identifier]->SupplierID = $_GET['SupplierID'];
- $_SESSION['PaymentDetail' . $identifier]->Currency = $myrow['currcode'];
- $_POST['Currency'] = $_SESSION['PaymentDetail' . $identifier]->Currency;
+ if($myrow['factorcompanyid'] == 0) {
+ $_SESSION['PaymentDetail'.$identifier]->SuppName = $myrow['suppname'];
+ $_SESSION['PaymentDetail'.$identifier]->Address1 = $myrow['address1'];
+ $_SESSION['PaymentDetail'.$identifier]->Address2 = $myrow['address2'];
+ $_SESSION['PaymentDetail'.$identifier]->Address3 = $myrow['address3'];
+ $_SESSION['PaymentDetail'.$identifier]->Address4 = $myrow['address4'];
+ $_SESSION['PaymentDetail'.$identifier]->Address5 = $myrow['address5'];
+ $_SESSION['PaymentDetail'.$identifier]->Address6 = $myrow['address6'];
+ $_SESSION['PaymentDetail'.$identifier]->SupplierID = $_GET['SupplierID'];
+ $_SESSION['PaymentDetail'.$identifier]->Currency = $myrow['currcode'];
+ $_POST['Currency'] = $_SESSION['PaymentDetail'.$identifier]->Currency;
} else {
- $factorsql= "SELECT coyname,
+ $factorsql = "SELECT coyname,
address1,
address2,
address3,
@@ -110,26 +108,26 @@
$FactorResult = DB_query($factorsql);
$myfactorrow = DB_fetch_array($FactorResult);
- $_SESSION['PaymentDetail' . $identifier]->SuppName = $myrow['suppname'] . ' ' . _('care of') . ' ' . $myfactorrow['coyname'];
- $_SESSION['PaymentDetail' . $identifier]->Address1 = $myfactorrow['address1'];
- $_SESSION['PaymentDetail' . $identifier]->Address2 = $myfactorrow['address2'];
- $_SESSION['PaymentDetail' . $identifier]->Address3 = $myfactorrow['address3'];
- $_SESSION['PaymentDetail' . $identifier]->Address4 = $myfactorrow['address4'];
- $_SESSION['PaymentDetail' . $identifier]->Address5 = $myfactorrow['address5'];
- $_SESSION['PaymentDetail' . $identifier]->Address6 = $myfactorrow['address6'];
- $_SESSION['PaymentDetail' . $identifier]->SupplierID = $_GET['SupplierID'];
- $_SESSION['PaymentDetail' . $identifier]->Currency = $myrow['currcode'];
- $_POST['Currency'] = $_SESSION['PaymentDetail' . $identifier]->Currency;
+ $_SESSION['PaymentDetail'.$identifier]->SuppName = $myrow['suppname'] . ' ' . _('care of') . ' ' . $myfactorrow['coyname'];
+ $_SESSION['PaymentDetail'.$identifier]->Address1 = $myfactorrow['address1'];
+ $_SESSION['PaymentDetail'.$identifier]->Address2 = $myfactorrow['address2'];
+ $_SESSION['PaymentDetail'.$identifier]->Address3 = $myfactorrow['address3'];
+ $_SESSION['PaymentDetail'.$identifier]->Address4 = $myfactorrow['address4'];
+ $_SESSION['PaymentDetail'.$identifier]->Address5 = $myfactorrow['address5'];
+ $_SESSION['PaymentDetail'.$identifier]->Address6 = $myfactorrow['address6'];
+ $_SESSION['PaymentDetail'.$identifier]->SupplierID = $_GET['SupplierID'];
+ $_SESSION['PaymentDetail'.$identifier]->Currency = $myrow['currcode'];
+ $_POST['Currency'] = $_SESSION['PaymentDetail'.$identifier]->Currency;
}
- if (isset($_GET['Amount']) AND is_numeric($_GET['Amount'])){
- $_SESSION['PaymentDetail' . $identifier]->Amount = filter_number_format($_GET['Amount']);
+ if(isset($_GET['Amount']) AND is_numeric($_GET['Amount'])) {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = filter_number_format($_GET['Amount']);
}
}
}
-if (isset($_POST['BankAccount']) AND $_POST['BankAccount']!=''){
+if(isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
- $_SESSION['PaymentDetail' . $identifier]->Account=$_POST['BankAccount'];
+ $_SESSION['PaymentDetail'.$identifier]->Account=$_POST['BankAccount'];
/*Get the bank account currency and set that too */
$ErrMsg = _('Could not get the currency of the bank account');
$result = DB_query("SELECT currcode,
@@ -140,40 +138,40 @@
$ErrMsg);
$myrow = DB_fetch_array($result);
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $myrow['currcode']) {
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $myrow['currcode']) {
//then we'd better update the functional exchange rate
$DefaultFunctionalRate = true;
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $myrow['currcode'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
+ $_SESSION['PaymentDetail'.$identifier]->AccountCurrency = $myrow['currcode'];
+ $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
} else {
$DefaultFunctionalRate = false;
}
} else {
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
+ $_SESSION['PaymentDetail'.$identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
+ $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
}
-if (isset($_POST['DatePaid']) AND $_POST['DatePaid']!='' AND Is_Date($_POST['DatePaid'])){
- $_SESSION['PaymentDetail' . $identifier]->DatePaid = $_POST['DatePaid'];
+if(isset($_POST['DatePaid']) AND $_POST['DatePaid']!='' AND Is_Date($_POST['DatePaid'])) {
+ $_SESSION['PaymentDetail'.$identifier]->DatePaid = $_POST['DatePaid'];
}
-if (isset($_POST['ExRate']) AND $_POST['ExRate']!=''){
- $_SESSION['PaymentDetail' . $identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
+if(isset($_POST['ExRate']) AND $_POST['ExRate']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
}
-if (isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!=''){
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
+if(isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
}
-if (isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Paymenttype = $_POST['Paymenttype'];
+if(isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Paymenttype = $_POST['Paymenttype'];
}
-if (isset($_POST['Currency']) AND $_POST['Currency']!=''){
+if(isset($_POST['Currency']) AND $_POST['Currency']!='') {
/* Payment currency is the currency that is being paid */
- $_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; // Payment currency
+ $_SESSION['PaymentDetail'.$identifier]->Currency=$_POST['Currency']; // Payment currency
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']) {
$_POST['FunctionalExRate']=1;
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate=1;
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=1;
$SuggestedFunctionalExRate =1;
} else {
@@ -187,22 +185,22 @@
*/
/*Get suggested FunctionalExRate - between bank account and home functional currency */
- $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . "'");
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . "'");
$myrow = DB_fetch_row($result);
$SuggestedFunctionalExRate = $myrow[0];
- if ($DefaultFunctionalRate) {
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
+ if($DefaultFunctionalRate) {
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
}
}
- if ($_POST['Currency']==$_SESSION['PaymentDetail' . $identifier]->AccountCurrency){
+ if($_POST['Currency']==$_SESSION['PaymentDetail'.$identifier]->AccountCurrency) {
/* if the currency being paid is the same as the bank account currency then default ex rate to 1 */
$_POST['ExRate']=1;
- $_SESSION['PaymentDetail' . $identifier]->ExRate = 1; //ex rate between payment currency and account currency is 1 if they are the same!!
+ $_SESSION['PaymentDetail'.$identifier]->ExRate = 1; //ex rate between payment currency and account currency is 1 if they are the same!!
$SuggestedExRate=1;
} elseif(isset($_POST['Currency'])) {
/*Get the exchange rate between the bank account currency and the payment currency*/
- $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->Currency . "'");
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency . "'");
$myrow = DB_fetch_row($result);
$TableExRate = $myrow[0]; //this is the rate of exchange between the functional currency and the payment currency
/*Calculate cross rate to suggest appropriate exchange rate between payment currency and account currency */
@@ -210,57 +208,85 @@
}
}
-if (isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!=''){ // Reference on Bank Transactions Inquiry
- $_SESSION['PaymentDetail' . $identifier]->BankTransRef=$_POST['BankTransRef'];
+// Reference in banking transactions:
+if(isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->BankTransRef = $_POST['BankTransRef'];
}
-if (isset($_POST['Narrative']) AND $_POST['Narrative']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Narrative=$_POST['Narrative'];
+// Narrative in general ledger transactions:
+if(isset($_POST['Narrative']) AND $_POST['Narrative']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Narrative = $_POST['Narrative'];
}
-if (isset($_POST['Amount']) AND $_POST['Amount']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Amount=filter_number_format($_POST['Amount']);
+// Supplier narrative in general ledger transactions:
+if(isset($_POST['gltrans_narrative'])) {
+ if($_POST['gltrans_narrative']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative = $_POST['Narrative'];// If blank, it uses the bank narrative.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative = $_POST['gltrans_narrative'];
+ }
+}
+// Supplier reference in supplier transactions:
+if(isset($_POST['supptrans_suppreference'])) {
+ if($_POST['supptrans_suppreference']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_suppreference = $_POST['Paymenttype'];// If blank, it uses the payment type.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_suppreference = $_POST['supptrans_suppreference'];
+ }
+}
+// Transaction text in supplier transactions:
+if(isset($_POST['supptrans_transtext'])) {
+ if($_POST['supptrans_transtext']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext = $_POST['Narrative'];// If blank, it uses the narrative.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext = $_POST['supptrans_transtext'];
+ }
+}
+
+if(isset($_POST['Amount']) AND $_POST['Amount']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = filter_number_format($_POST['Amount']);
} else {
- if (!isset($_SESSION['PaymentDetail' . $identifier]->Amount)) {
- $_SESSION['PaymentDetail' . $identifier]->Amount=0;
+ if(!isset($_SESSION['PaymentDetail'.$identifier]->Amount)) {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = 0;
}
}
-if (isset($_POST['Discount']) AND $_POST['Discount']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Discount=filter_number_format($_POST['Discount']);
+
+if(isset($_POST['Discount']) AND $_POST['Discount']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Discount = filter_number_format($_POST['Discount']);
} else {
- if (!isset($_SESSION['PaymentDetail' . $identifier]->Discount)) {
- $_SESSION['PaymentDetail' . $identifier]->Discount=0;
- }
+ if(!isset($_SESSION['PaymentDetail'.$identifier]->Discount)) {
+ $_SESSION['PaymentDetail'.$identifier]->Discount = 0;
+ }
}
-if (isset($_POST['CommitBatch'])){
+if(isset($_POST['CommitBatch'])) {
- /* once the GL analysis of the payment is entered (if the Creditors_GLLink is active),
- process all the data in the session cookie into the DB creating a banktrans record for
- the payment in the batch and SuppTrans record for the supplier payment if a supplier was selected
- A GL entry is created for each GL entry (only one for a supplier entry) and one for the bank
- account credit.
+ /* once the GL analysis of the payment is entered (if the Creditors_GLLink is active),
+ process all the data in the session cookie into the DB creating a banktrans record for
+ the payment in the batch and SuppTrans record for the supplier payment if a supplier was selected
+ A GL entry is created for each GL entry (only one for a supplier entry) and one for the bank
+ account credit.
- NB allocations against supplier payments are a separate exercice
+ NB allocations against supplier payments are a separate exercise
- if GL integrated then
- first off run through the array of payment items $_SESSION['Payment']->GLItems and
- create GL Entries for the GL payment items
- */
+ if GL integrated then
+ first off run through the array of payment items $_SESSION['Payment']->GLItems and
+ create GL Entries for the GL payment items
+ */
- /*First off check we have an amount entered as paid ?? */
- $TotalAmount =0;
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems AS $PaymentItem) {
+ /*First off check we have an amount entered as paid ?? */
+ $TotalAmount = 0;
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems AS $PaymentItem) {
$TotalAmount += $PaymentItem->Amount;
}
- if ($TotalAmount==0 AND
- ($_SESSION['PaymentDetail' . $identifier]->Discount + $_SESSION['PaymentDetail' . $identifier]->Amount)/$_SESSION['PaymentDetail' . $identifier]->ExRate ==0){
+ if($TotalAmount==0 AND
+ ($_SESSION['PaymentDetail'.$identifier]->Discount + $_SESSION['PaymentDetail'.$identifier]->Amount)/$_SESSION['PaymentDetail'.$identifier]->ExRate ==0) {
prnMsg( _('This payment has no amounts entered and will not be processed'),'warn');
include('includes/footer.inc');
exit;
}
- if ($_POST['BankAccount']=='') {
+ if($_POST['BankAccount']=='') {
prnMsg( _('No bank account has been selected so this payment cannot be processed'),'warn');
include('includes/footer.inc');
exit;
@@ -275,21 +301,21 @@
$BankAccounts = array();
$i=0;
- while ($Act = DB_fetch_row($result)){
+ while($Act = DB_fetch_row($result)) {
$BankAccounts[$i]= $Act[0];
$i++;
}
- $PeriodNo = GetPeriod($_SESSION['PaymentDetail' . $identifier]->DatePaid,$db);
+ $PeriodNo = GetPeriod($_SESSION['PaymentDetail'.$identifier]->DatePaid,$db);
- $sql="SELECT usepreprintedstationery
+ $sql = "SELECT usepreprintedstationery
FROM paymentmethods
- WHERE paymentname='" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype ."'";
+ WHERE paymentname='" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype ."'";
$result=DB_query($sql);
$myrow=DB_fetch_row($result);
// first time through commit if supplier cheque then print it first
- if ((!isset($_POST['ChequePrinted']))
+ if((!isset($_POST['ChequePrinted']))
AND (!isset($_POST['PaymentCancelled']))
AND ($myrow[0] == 1)) {
// it is a supplier payment by cheque and haven't printed yet so print cheque
@@ -300,7 +326,7 @@
<br />';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Has the cheque been printed') . '?
<br />
@@ -310,9 +336,9 @@
<input type="submit" name="ChequePrinted" value="' . _('Yes / Continue') . '" />
<input type="submit" name="PaymentCancelled" value="' . _('No / Cancel Payment') . '" />';
- echo '<br />Payment amount = ' . $_SESSION['PaymentDetail' . $identifier]->Amount;
- echo '</div>
- </form>';
+ echo '<br />Payment amount = ' . $_SESSION['PaymentDetail'.$identifier]->Amount;
+ echo '</div>
+ </form>';
} else {
@@ -321,55 +347,58 @@
$result = DB_Txn_Begin();
- if ($_SESSION['PaymentDetail' . $identifier]->SupplierID=='') {
+ if($_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
//its a nominal bank transaction type 1
$TransNo = GetNextTransNo( 1, $db);
$TransType = 1;
- if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then enter GLTrans */
+ if($_SESSION['CompanyRecord']['gllink_creditors']==1) { /* then enter GLTrans */
$TotalAmount=0;
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems as $PaymentItem) {
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems as $PaymentItem) {
/*The functional currency amount will be the
- payment currenct amount / the bank account currency exchange rate - to get to the bank account currency
+ payment currenct amount / the bank account currency exchange rate - to get to the bank account currency
then / the functional currency exchange rate to get to the functional currency */
- if ($PaymentItem->Cheque=='') {
+ if($PaymentItem->Cheque=='') {
$PaymentItem->Cheque=0;
}
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount,
- chequeno,
- tag)
- VALUES (1,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $PaymentItem->GLCode . "',
- '" . $PaymentItem->Narrative . "',
- '" . ($PaymentItem->Amount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "',
- '". $PaymentItem->Cheque ."',
- '" . $PaymentItem->Tag . "')";
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount,
+ chequeno,
+ tag
+ ) VALUES (
+ 1,'" .
+ $TransNo . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $PeriodNo . "','" .
+ $PaymentItem->GLCode . "','" .
+ $PaymentItem->Narrative . "','" .
+ ($PaymentItem->Amount/$_SESSION['PaymentDetail'.$identifier]->ExRate/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate) . "','".
+ $PaymentItem->Cheque ."','" .
+ $PaymentItem->Tag .
+ "')";
$ErrMsg = _('Cannot insert a GL entry for the payment using the SQL');
$result = DB_query($SQL,$ErrMsg,_('The SQL that failed was'),true);
$TotalAmount += $PaymentItem->Amount;
}
- $_SESSION['PaymentDetail' . $identifier]->Amount = $TotalAmount;
- $_SESSION['PaymentDetail' . $identifier]->Discount=0;
+ $_SESSION['PaymentDetail'.$identifier]->Amount = $TotalAmount;
+ $_SESSION['PaymentDetail'.$identifier]->Discount=0;
}
//Run through the GL postings to check to see if there is a posting to another bank account (or the same one) if there is then a receipt needs to be created for this account too
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems as $PaymentItem) {
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems as $PaymentItem) {
- if (in_array($PaymentItem->GLCode, $BankAccounts)) {
+ if(in_array($PaymentItem->GLCode, $BankAccounts)) {
/*Need to deal with the case where the payment from one bank account could be to a bank account in another currency */
@@ -383,15 +412,15 @@
$TrfToBankCurrCode = $TrfToBankRow['currcode'];
$TrfToBankExRate = $TrfToBankRow['rate'];
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency == $TrfToBankCurrCode){
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency == $TrfToBankCurrCode) {
/*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */
- $TrfToBankExRate = $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate;
+ $TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
}
/*Consider an example
functional currency NZD
bank account in AUD - 1 NZD = 0.90 AUD (FunctionalExRate)
- paying USD - 1 AUD = 0.85 USD (ExRate)
+ paying USD - 1 AUD = 0.85 USD (ExRate)
to a bank account in EUR - 1 NZD = 0.52 EUR
oh yeah - now we are getting tricky!
@@ -409,124 +438,128 @@
the receipt record will read
amount 100 (USD)
- exrate (1 EUR = (0.85 x 0.90)/0.52 USD)
+ exrate (1 EUR = (0.85 x 0.90)/0.52 USD)
(ExRate x FunctionalExRate) / USD Functional ExRate
- functionalexrate = (1NZD = EUR 0.52)
+ functionalexrate = (1NZD = EUR 0.52)
*/
$ReceiptTransNo = GetNextTransNo( 2, $db);
- $SQL= "INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
- VALUES ('" . $ReceiptTransNo . "',
- 2,
- '" . $PaymentItem->GLCode . "',
- '" . _('Act Transfer From ') . $_SESSION['PaymentDetail' . $identifier]->Account . ' - ' . $PaymentItem->Narrative . "',
- '" . (($_SESSION['PaymentDetail' . $identifier]->ExRate * $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate)/$TrfToBankExRate). "',
- '" . $TrfToBankExRate . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . $PaymentItem->Amount . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "'
- )";
+ $SQL = "INSERT INTO banktrans (
+ transno,
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode
+ ) VALUES ('" .
+ $ReceiptTransNo . "',
+ 2,'" .
+ $PaymentItem->GLCode . "','" .
+ _('Act Transfer From ') . $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" .
+ (($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfToBankExRate). "','" .
+ $TrfToBankExRate . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "','" .
+ $PaymentItem->Amount . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Currency .
+ "')";
$ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction with the SQL');
+ $DbgMsg = _('Cannot insert a bank transaction with the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
-
}
}
} else {
- /*Its a supplier payment type 22 */
- $CreditorTotal = (($_SESSION['PaymentDetail' . $identifier]->Discount + $_SESSION['PaymentDetail' . $identifier]->Amount)/$_SESSION['PaymentDetail' . $identifier]->ExRate)/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate;
+ /*Its a supplier payment type 22 */
+ $CreditorTotal = (($_SESSION['PaymentDetail'.$identifier]->Discount + $_SESSION['PaymentDetail'.$identifier]->Amount)/$_SESSION['PaymentDetail'.$identifier]->ExRate)/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
$TransNo = GetNextTransNo(22, $db);
$TransType = 22;
/* Create a SuppTrans entry for the supplier payment */
- $SQL = "INSERT INTO supptrans (transno,
- type,
- supplierno,
- trandate,
- inputdate,
- suppreference,
- rate,
- ovamount,
- transtext) ";
- $SQL = $SQL . "valueS ('" . $TransNo . "',
- 22,
- '" . $_SESSION['PaymentDetail' . $identifier]->SupplierID . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . date('Y-m-d H-i-s') . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . ($_SESSION['PaymentDetail' . $identifier]->FunctionalExRate * $_SESSION[...
[truncated message content] |
|
From: <dai...@us...> - 2016-04-26 07:59:23
|
Revision: 7497
http://sourceforge.net/p/web-erp/reponame/7497
Author: daintree
Date: 2016-04-26 07:59:21 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
committed Tims change to report writer to allow to work with PHP7
Modified Paths:
--------------
trunk/doc/Change.log
trunk/reportwriter/WriteReport.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-25 21:15:09 UTC (rev 7496)
+++ trunk/doc/Change.log 2016-04-26 07:59:21 UTC (rev 7497)
@@ -1,5 +1,6 @@
webERP Change Log
+26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext.
25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-(
25/4/16 Jan Bakke: Improvements to allow .png and .gif images
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-04-25 21:15:09 UTC (rev 7496)
+++ trunk/reportwriter/WriteReport.inc 2016-04-26 07:59:21 UTC (rev 7497)
@@ -303,10 +303,15 @@
$ThisMonth = mb_substr($Today,5,2);
$ThisYear = mb_substr($Today,0,4);
// find total number of days in this month
- if ($ThisMonth==04 OR $ThisMonth==06 OR $ThisMonth==09 OR $ThisMonth==11) { $TotalDays=30; }
- elseif ($ThisMonth==02 AND date('L', $t)) { $TotalDays=29; } // Leap year
- elseif ($ThisMonth==02 AND !date('L', $t)) { $TotalDays=28; }
- else { $TotalDays=31; }
+ if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
+ $TotalDays=30;
+ } elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year
+ $TotalDays=29;
+ } elseif ($ThisMonth==02 AND !date('L', $t)) {
+ $TotalDays=28;
+ } else {
+ $TotalDays=31;
+ }
// Calculate date range
$DateArray=explode(':',$Prefs['DateListings']['params']);
switch ($DateArray[0]) { // based on the date choice selected
|
|
From: <rc...@us...> - 2016-04-28 02:53:17
|
Revision: 7499
http://sourceforge.net/p/web-erp/reponame/7499
Author: rchacon
Date: 2016-04-28 02:53:14 +0000 (Thu, 28 Apr 2016)
Log Message:
-----------
Code improvement: Replace with cal_days_in_month().
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/reportwriter/WriteReport.inc
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-04-26 16:24:36 UTC (rev 7498)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-28 02:53:14 UTC (rev 7499)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-04-26 09:51-0600\n"
-"PO-Revision-Date: 2016-04-26 10:00-0600\n"
+"PO-Revision-Date: 2016-04-26 10:53-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15568,7 +15568,7 @@
#: GoodsReceived.php:107
msgid "Supplier's Reference"
-msgstr ""
+msgstr "Referencia del proveedor"
#: GoodsReceived.php:115 PO_Items.php:721
msgid "Supplier Units"
@@ -22863,7 +22863,7 @@
#: Payments.php:976
msgid "Narrative in general ledger transactions"
-msgstr ""
+msgstr "Descripción en las transacciones del libro mayor"
#: Payments.php:993
msgid "General Ledger Payment Analysis Entry"
@@ -22915,32 +22915,38 @@
#: Payments.php:1187
msgid "Supplier Narrative"
-msgstr ""
+msgstr "Descripción de proveedores"
#: Payments.php:1188
msgid ""
"Supplier narrative in general ledger transactions. If blank, it uses the "
"bank narrative."
msgstr ""
+"Descripción de proveedores en las transacciones del libro mayor. Si está en "
+"blanco, se usa la descripción de bancos."
#: Payments.php:1195
msgid "Supplier Reference"
-msgstr ""
+msgstr "Referencia de proveedores"
#: Payments.php:1196
msgid ""
"Supplier reference in supplier transactions. If blank, it uses the payment "
"type."
msgstr ""
+"Referencia de proveedores en las transacciones con los proveedores. Si está "
+"en blanco, se usa el tipo de pago."
#: Payments.php:1203
msgid "Transaction Text"
-msgstr ""
+msgstr "Texto de la transacción"
#: Payments.php:1204
msgid ""
"Transaction text in supplier transactions. If blank, it uses the narrative."
msgstr ""
+"Texto de la transacción en las transacciones con los proveedores. Si está en "
+"blanco, se usa la descripción de bancos."
#: Payments.php:1209
msgid "Amount of Payment"
@@ -26255,7 +26261,7 @@
#: ReverseGRN.php:398
msgid "Supplier' Ref"
-msgstr ""
+msgstr "Referencia del proveedor"
#: ReverseGRN.php:404
msgid "Quantity To"
@@ -33672,7 +33678,7 @@
#: SuppInvGRNs.php:120 SuppInvGRNs.php:261 includes/PDFGrnHeader.inc:21
msgid "Supplier's Ref"
-msgstr ""
+msgstr "Referencia del proveedor"
#: SuppInvGRNs.php:123
msgid "Quantity Yet To Inv"
@@ -35085,7 +35091,7 @@
#: SupplierInvoice.php:666
msgid "Supplier Ref"
-msgstr ""
+msgstr "Referencia de proveedores"
#: SupplierInvoice.php:669
msgid "Quantity Charged"
@@ -51600,7 +51606,7 @@
#: reportwriter/languages/en_US/reports.php:215
msgid "Name to Display"
-msgstr ""
+msgstr "Nombre a mostrar"
#: reportwriter/languages/en_US/reports.php:217
msgid "Report Filter Description"
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-04-26 16:24:36 UTC (rev 7498)
+++ trunk/reportwriter/WriteReport.inc 2016-04-28 02:53:14 UTC (rev 7499)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
require_once($PathPrefix .'/includes/class.pdf.php');
class PDF extends Cpdf {
@@ -303,7 +305,7 @@
$ThisMonth = mb_substr($Today,5,2);
$ThisYear = mb_substr($Today,0,4);
// find total number of days in this month
- if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
+/* if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
$TotalDays=30;
} elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year
$TotalDays=29;
@@ -311,7 +313,8 @@
$TotalDays=28;
} else {
$TotalDays=31;
- }
+ }//********** To replace. */
+ $TotalDays = cal_days_in_month(CAL_GREGORIAN, $ThisMonth, $ThisYear);//********** To test !
// Calculate date range
$DateArray=explode(':',$Prefs['DateListings']['params']);
switch ($DateArray[0]) { // based on the date choice selected
|
|
From: <rc...@us...> - 2016-05-01 15:05:37
|
Revision: 7502
http://sourceforge.net/p/web-erp/reponame/7502
Author: rchacon
Date: 2016-05-01 15:05:34 +0000 (Sun, 01 May 2016)
Log Message:
-----------
Fix directory name and default language file name.
Modified Paths:
--------------
trunk/Z_poAddLanguage.php
trunk/doc/Change.log
Modified: trunk/Z_poAddLanguage.php
===================================================================
--- trunk/Z_poAddLanguage.php 2016-04-29 23:57:28 UTC (rev 7501)
+++ trunk/Z_poAddLanguage.php 2016-05-01 15:05:34 UTC (rev 7502)
@@ -1,5 +1,6 @@
<?php
/* $Id$*/
+/* Allows a new language po file to be created */
/* Steve Kitchen/Kaill */
@@ -20,9 +21,9 @@
$ViewTopic = "SpecialUtilities";
$BookMark = "Z_poAddLanguage";// Anchor's id in the manual's html document.
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/maintenance.png" title="' .
- _('Add a New Language to the System') . '" />' . ' ' .
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Add a New Language to the System') . '" />' . ' ' .
_('Add a New Language to the System') . '</p>';
/* Your webserver user MUST have read/write access to here, otherwise you'll be wasting your time */
@@ -32,7 +33,7 @@
echo '<br /> ' . _('Current language is') . ' ' . $_SESSION['Language'];
$DefaultLanguage = 'en_GB';// The default language is English-United Kingdom (British English).
-$PathToDefault = './locale/' . $DefaultLanguage . '/LC_MESSAGES/messages.po';
+$PathToDefault = './locale/' . $DefaultLanguage . '.utf8/LC_MESSAGES/messages.pot';
if (isset($_POST['submit']) AND isset($_POST['NewLanguage'])) {
@@ -57,8 +58,8 @@
if (!file_exists('./locale/' . $_POST['NewLanguage'])) {
prnMsg (_('Attempting to create the new language file') . '.....<br />', 'info', ' ');
- $Result = mkdir('./locale/' . $_POST['NewLanguage']);
- $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '/LC_MESSAGES');
+ $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '.utf8');
+ $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '.utf8/LC_MESSAGES');
} else {
prnMsg(_('This language cannot be added because it already exists!'),'error');
echo '</form>';
@@ -67,7 +68,7 @@
exit;
}
- $PathToNewLanguage = './locale/' . $_POST['NewLanguage'] . '/LC_MESSAGES/messages.po';
+ $PathToNewLanguage = './locale/' . $_POST['NewLanguage'] . '.utf8/LC_MESSAGES/messages.po';
$Result = copy($PathToDefault, $PathToNewLanguage);
prnMsg (_('Done. You should now change to your newly created language from the user settings link above. Then you can edit the new language file header and use the language module editor to translate the system strings'), 'info');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-29 23:57:28 UTC (rev 7501)
+++ trunk/doc/Change.log 2016-05-01 15:05:34 UTC (rev 7502)
@@ -1,5 +1,6 @@
webERP Change Log
+01/05/2016 RChacon: In Z_poAddLanguage.php, fix directory name and default language file name.
29/4/16 RChacon: In includes/DateFunctions.inc, add year in long date and time in locale format.
26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext.
|
|
From: <ex...@us...> - 2016-05-06 03:06:36
|
Revision: 7504
http://sourceforge.net/p/web-erp/reponame/7504
Author: exsonqu
Date: 2016-05-06 03:06:34 +0000 (Fri, 06 May 2016)
Log Message:
-----------
05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
Modified Paths:
--------------
trunk/BOMs.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-05-01 15:17:08 UTC (rev 7503)
+++ trunk/BOMs.php 2016-05-06 03:06:34 UTC (rev 7504)
@@ -73,6 +73,7 @@
global $ParentMBflag;
$sql = "SELECT bom.sequence,
bom.component,
+ stockcategory.categorydescription,
stockmaster.description as itemdescription,
stockmaster.units,
locations.locationname,
@@ -90,6 +91,8 @@
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockcategory.categoryid = stockmaster.categoryid
INNER JOIN locations ON
bom.loccode = locations.loccode
INNER JOIN workcentres
@@ -143,26 +146,55 @@
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
}
$TextIndent= $Level . 'em';
+ if (!empty($myrow['remark'])) {
+ $myrow['remark'] = ' **' . ' ' . $myrow['remark'];
+ }
+ $StockID = $myrow['component'];
+ if (function_exists('imagecreatefromjpeg')){
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=100'.
+ '&eight=100'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ }
+ } else {
+ if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
- printf('<td class="number" style="text-align:left;text-indent:' . $textindent . ';" >%s</td>
+ printf('<td class="number" style="text-align:left;text-indent:' . $Textindent . ';" >%s</td>
<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
+ <td class="noprint">%s</td>
+ <td class="noprint">%s</td>
+ <td class="noprint">%s</td>
<td class="number noprint">%s</td>
<td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
<td class="noprint">' . $DrillText . '</td>
<td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
- </tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td>
+ </tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td><td>%s</td>
</tr>',
$Level1,
$myrow['sequence'],
+ $myrow['categorydescription'],
$myrow['component'],
$myrow['itemdescription'],
$myrow['locationname'],
@@ -184,7 +216,8 @@
$UltimateParent,
$myrow['loccode'],
$myrow['workcentrecode'],
- $myrow['remark']
+ $myrow['remark'],
+ $StockImgLink
);
} //END WHILE LIST LOOP
@@ -268,12 +301,14 @@
$Errors[$i] = 'Quantity';
$i++;
}
+ /* Comment this out to make substittute material can be recorded in the BOM
if (filter_number_format($_POST['Quantity'])==0) {
$InputError = 1;
prnMsg(_('The quantity entered cannot be zero'),'error');
$Errors[$i] = 'Quantity';
$i++;
}
+ */
if(!Date1GreaterThanDate2($_POST['EffectiveTo'], $_POST['EffectiveAfter'])){
$InputError = 1;
prnMsg(_('The effective to date must be a date after the effective after date') . '<br />' . _('The effective to date is') . ' ' . DateDiff($_POST['EffectiveTo'], $_POST['EffectiveAfter'], 'd') . ' ' . _('days before the effective after date') . '! ' . _('No updates have been performed') . '.<br />' . _('Effective after was') . ': ' . $_POST['EffectiveAfter'] . ' ' . _('and effective to was') . ': ' . $_POST['EffectiveTo'],'error');
@@ -556,10 +591,34 @@
</tr>
</table>';
}
+ $StockID = $SelectedParent;
+ if (function_exists('imagecreatefromjpeg')){
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=100'.
+ '&eight=100'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ }
+ } else {
+ if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
+ <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b>' . $StockImgLink . '</div></th>
</tr>';
echo '</table><div id="Report"><table class="selection">';
@@ -572,15 +631,16 @@
$TableHeader = '<tr>
<th>' . _('Level') . '</th>
<th>' . _('Sequence') . '</th>
+ <th>' . _('Category Description') . '</th>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Location') . '</th>
<th>' . _('Work Centre') . '</th>
<th>' . _('Quantity') . '</th>
<th>' . _('UOM') . '</th>
- <th>' . _('Effective After') . '</th>
- <th>' . _('Effective To') . '</th>
- <th>' . _('Auto Issue') . '</th>
+ <th class="noprint">' . _('Effective After') . '</th>
+ <th class="noprint">' . _('Effective To') . '</th>
+ <th class="noprint">' . _('Auto Issue') . '</th>
<th class="noprint">' . _('Qty On Hand') . '</th>
</tr>';
echo $TableHeader;
@@ -607,7 +667,9 @@
DisplayBOMItems($UltimateParent, $Parent, $Component, $Level, $db);
}
}
- echo '</table></div>
+ echo '</table>
+ </div>
+ <div class="onlyprint1;">' . _('Print Date') . ' :' . date($_SESSION['DefaultDateFormat']) . '</div>
<br />';
/* We do want to show the new component entry form in any case - it is a lot of work to get back to it otherwise if we need to add */
@@ -712,7 +774,7 @@
}
echo '<tr>
<td>' . _('Sequence in BOM') . ':</td>
- <td><input type="text" class="integer" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
+ <td><input type="text" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('Location') . ': </td>
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-01 15:17:08 UTC (rev 7503)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-06 03:06:34 UTC (rev 7504)
@@ -55,6 +55,7 @@
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
INSERT INTO securitytokens VALUES(18,'Cost authority');
+ALTER table bom change sequence sequence double not null default 0;
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <ex...@us...> - 2016-05-06 03:25:40
|
Revision: 7506
http://sourceforge.net/p/web-erp/reponame/7506
Author: exsonqu
Date: 2016-05-06 03:25:37 +0000 (Fri, 06 May 2016)
Log Message:
-----------
05/06/16 Exson: Modify Z_RePostGLFromPeriod.php to make this feature still reliable with previous version of GLPostings.inc. Rework the new GLPostings.inc.
Modified Paths:
--------------
trunk/Z_RePostGLFromPeriod.php
trunk/includes/GLPostings.inc
Added Paths:
-----------
trunk/includes/GLPostingsZero.inc
Modified: trunk/Z_RePostGLFromPeriod.php
===================================================================
--- trunk/Z_RePostGLFromPeriod.php 2016-05-06 03:07:16 UTC (rev 7505)
+++ trunk/Z_RePostGLFromPeriod.php 2016-05-06 03:25:37 UTC (rev 7506)
@@ -53,9 +53,9 @@
/*Now repost the lot */
- include('includes/GLPostings.inc');
+ include('includes/GLPostingsZero.inc');
prnMsg(_('All general ledger postings have been reposted from period') . ' ' . $_POST['FromPeriod'],'success');
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/GLPostings.inc
===================================================================
--- trunk/includes/GLPostings.inc 2016-05-06 03:07:16 UTC (rev 7505)
+++ trunk/includes/GLPostings.inc 2016-05-06 03:25:37 UTC (rev 7506)
@@ -88,7 +88,7 @@
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;
+ $sql = "UPDATE chartdetails SET bfwd=(SELECT t.bfwd FROM (SELECT bfwd+actual as bfwd FROM chartdetails WHERE accountcode='" . $Account . "' AND period='" . ($Period - 1) . "') AS t) WHERE accountcode='" . $Account . "' AND period>= " . $Period;
$ErrMsg = _('Failed to update the bfwd amount');
$BfwdResult = DB_query($sql,$ErrMsg);
}
Added: trunk/includes/GLPostingsZero.inc
===================================================================
--- trunk/includes/GLPostingsZero.inc (rev 0)
+++ trunk/includes/GLPostingsZero.inc 2016-05-06 03:25:37 UTC (rev 7506)
@@ -0,0 +1,126 @@
+<?php
+
+/* $Id: GLPostings.inc 6945 2014-10-27 07:20:48Z daintree $*/
+
+/* This file contains the code to post GL transactions.
+
+This file can be included on any page that needs GL postings to be posted eg inquiries or GL reports
+GL posting thus becomes an invisible/automatic process to the user
+
+The logic of GL posting consists of:
+
+
+Then looping through all unposted GL transactions in GLTrans table and
+
+1. Debit amounts increase the charge in the period for the account and credit amounts decrease the charge.
+2. Chart Details records for all following periods have the b/fwd balance increased for debit amounts and decreased for credits.
+3. Once these updates are done the GLTrans record is flagged as posted.
+
+
+Notes:
+
+ChartDetail records should already exist - they are created (from includes/DateFunctions.in GetPeriod) when a new period is created or when a new GL account is created for all periods in the periods table. However, we may need to create new ones if the user posts back to a period before periods are currently set up - which is not actually possible with the config parameter ProhibitGLPostingsBefore set (However, is a problem when it is not set)
+*/
+
+
+$FirstPeriodResult = DB_query("SELECT MIN(periodno) FROM periods");
+$FirstPeriodRow = DB_fetch_row($FirstPeriodResult);
+$CreateFrom = $FirstPeriodRow[0];
+
+if (is_null($FirstPeriodRow[0])){
+ //There are no periods defined
+ $InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (-1,'" . Date('Y-m-d',mktime(0,0,0,Date('m')-1,0,Date('Y'))) . "')",_('Could not insert first period'));
+ $InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (0,'" . Date('Y-m-d',mktime(0,0,0,Date('m')+1,0,Date('Y'))) . "')",_('Could not insert first period'));
+ $InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (1,'" . Date('Y-m-d',mktime(0,0,0,Date('m')+2,0,Date('Y'))) . "')",_('Could not insert second period'));
+ $CreateFrom=-1;
+}
+
+$LastPeriodResult = DB_query("SELECT MAX(periodno) FROM periods");
+$LastPeriodRow = DB_fetch_row($LastPeriodResult);
+
+
+$CreateTo = $LastPeriodRow[0];
+
+/*First off see if there are in fact any chartdetails */
+
+$sql = "SELECT chartmaster.accountcode, MIN(periods.periodno) AS startperiod
+ 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.actual IS NULL
+ GROUP BY chartmaster.accountcode";
+
+$ChartDetailsNotSetUpResult = DB_query($sql,_('Could not test to see that all chart detail records properly initiated'));
+
+if(DB_num_rows($ChartDetailsNotSetUpResult)>0){
+
+ /*Now insert the chartdetails records that do not already exist */
+ $sql = "INSERT INTO chartdetails (accountcode, period)
+ 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.accountcode IS NULL";
+
+ $ErrMsg = _('Inserting new chart details records required failed because');
+ $InsChartDetailsRecords = 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++ ) {
+ //get all the unposted transactions for the first and successive periods ordered by account
+ $sql = "SELECT counterindex,
+ periodno,
+ account,
+ amount
+ FROM gltrans
+ WHERE posted=0
+ AND periodno='" . $CurrPeriod . "'
+ ORDER BY account";
+
+ $UnpostedTransResult = DB_query($sql);
+
+ $TransStart = DB_Txn_Begin();
+ $CurrentAccount='0';
+ $TotalAmount=0;
+ while ($UnpostedTrans=DB_fetch_array($UnpostedTransResult)) {
+ if($CurrentAccount != $UnpostedTrans['account'] AND $CurrentAccount!='0') {
+ $sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period= '" . $CurrPeriod . "'";
+ $PostPrd = DB_query($sql);
+ /*Update the BFwd for all following ChartDetail records */
+ $sql = "UPDATE chartdetails SET bfwd = bfwd + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period > '" . $CurrPeriod . "'";
+ $PostBFwds = DB_query($sql);
+ $TotalAmount = 0;
+ }
+ $CurrentAccount = $UnpostedTrans['account'];
+ $TotalAmount += $UnpostedTrans['amount'];
+ }
+ // There will be one account still to post after the loop
+ if($CurrentAccount != 0) {
+ $sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period= '" . $CurrPeriod . "'";
+ $PostPrd = DB_query($sql);
+ /*Update the BFwd for all following ChartDetail records */
+ $sql = "UPDATE chartdetails SET bfwd = bfwd + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period > '" . $CurrPeriod . "'";
+ $PostBFwds = DB_query($sql);
+ }
+
+ $sql = "UPDATE gltrans SET posted = 1 WHERE periodno = '" . $CurrPeriod . "' AND posted=0";
+ $Posted = DB_query($sql);
+
+ $TransCommit = DB_Txn_Commit();
+}
+
+?>
\ No newline at end of file
|
|
From: <rc...@us...> - 2016-05-08 15:59:09
|
Revision: 7512
http://sourceforge.net/p/web-erp/reponame/7512
Author: rchacon
Date: 2016-05-08 15:59:07 +0000 (Sun, 08 May 2016)
Log Message:
-----------
Clean up code.
Modified Paths:
--------------
trunk/includes/Login.php
trunk/reportwriter/WriteReport.inc
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2016-05-07 22:48:34 UTC (rev 7511)
+++ trunk/includes/Login.php 2016-05-08 15:59:07 UTC (rev 7512)
@@ -1,16 +1,15 @@
<?php
/* $Id$*/
+// Display demo user name and password within login form if $AllowDemoMode is true
-// Display demo user name and password within login form if $AllowDemoMode is true
//include ('LanguageSetup.php');
if ((isset($AllowDemoMode)) AND ($AllowDemoMode == True) AND (!isset($demo_text))) {
$demo_text = _('Login as user') .': <i>' . _('admin') . '</i><br />' ._('with password') . ': <i>' . _('weberp') . '</i>';
} elseif (!isset($demo_text)) {
$demo_text = '';
}
-echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>webERP Login screen</title>
@@ -19,8 +18,8 @@
<link rel="stylesheet" href="css/<?php echo $Theme;?>/login.css" type="text/css" />
</head>
<body>
+<?php
-<?php
if (get_magic_quotes_gpc()){
echo '<p style="background:white">';
echo _('Your webserver is configured to enable Magic Quotes. This may cause problems if you use punctuation (such as quotes) when doing data entry. You should contact your webmaster to disable Magic Quotes');
@@ -28,7 +27,6 @@
}
?>
-
<div id="container">
<div id="login_logo"></div>
<div id="login_box">
@@ -36,7 +34,8 @@
<div>
<input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" />
<span>
- <?php
+<?php
+
if (isset($CompanyList) AND is_array($CompanyList)) {
foreach ($CompanyList as $key => $CompanyEntry){
if ($DefaultDatabase == $CompanyEntry['database']) {
@@ -91,7 +90,8 @@
echo '</select>';
}
} //end provision for backward compat
- ?>
+
+?>
</span>
<br />
<span><?php echo _('User name'); ?>:</span><br />
@@ -99,11 +99,13 @@
<span><?php echo _('Password'); ?>:</span><br />
<input type="password" required="required" name="Password" placeholder="<?php echo _('Password'); ?>" /><br />
<div id="demo_text">
- <?php
+<?php
+
if (isset($demo_text)){
echo $demo_text;
}
- ?>
+
+?>
</div>
<input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" />
</div>
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-05-07 22:48:34 UTC (rev 7511)
+++ trunk/reportwriter/WriteReport.inc 2016-05-08 15:59:07 UTC (rev 7512)
@@ -301,20 +301,11 @@
// fetch date filter info
$df = $Prefs['DateListings']['fieldname'];
$Today = date('Y-m-d', time());
- $ThisDay = mb_substr($Today,8,2);
- $ThisMonth = mb_substr($Today,5,2);
- $ThisYear = mb_substr($Today,0,4);
- // find total number of days in this month
-/* if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
- $TotalDays=30;
- } elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year
- $TotalDays=29;
- } elseif ($ThisMonth==02 AND !date('L', $t)) {
- $TotalDays=28;
- } else {
- $TotalDays=31;
- }//********** To replace. */
- $TotalDays = cal_days_in_month(CAL_GREGORIAN, $ThisMonth, $ThisYear);//********** To test !
+ $ThisDay = date('d');
+ $ThisMonth = date('m');
+ $ThisYear = date('Y');
+ // Find total number of days in this month:
+ $TotalDays = cal_days_in_month(CAL_GREGORIAN, $ThisMonth, $ThisYear);
// Calculate date range
$DateArray=explode(':',$Prefs['DateListings']['params']);
switch ($DateArray[0]) { // based on the date choice selected
|
|
From: <rc...@us...> - 2016-05-11 21:29:30
|
Revision: 7515
http://sourceforge.net/p/web-erp/reponame/7515
Author: rchacon
Date: 2016-05-11 21:29:23 +0000 (Wed, 11 May 2016)
Log Message:
-----------
Include translation to hebrew, thanks to Hagay Mandel.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-09 03:13:54 UTC (rev 7514)
+++ trunk/doc/Change.log 2016-05-11 21:29:23 UTC (rev 7515)
@@ -1,6 +1,7 @@
webERP Change Log
-09/05/16 Exson: Tidy Code Up to remove redundant code according to Tim's guide.
+11/05/16 RChacon: Include translation to hebrew, thanks to Hagay Mandel.
+09/05/16 Exson: Tidy Code Up to remove redundant code according to Tim's guide.
05/06/16 Exson: Modify Z_RePostGLFromPeriod.php to make this feature still reliable with prev
05/06/16: Exson: Remove the $db which is not needed now. Reported by Tim. ious version of GLPostings.inc. Rework the new GLPostings.inc.
05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2016-05-09 03:13:54 UTC (rev 7514)
+++ trunk/includes/LanguagesArray.php 2016-05-11 21:29:23 UTC (rev 7515)
@@ -64,6 +64,11 @@
$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fr_FR.utf8']['ThousandsSeparator'] = ' ';
+$LanguagesArray['he_IL.utf8']['LanguageName'] = 'עברית';
+$LanguagesArray['he_IL.utf8']['WindowsLocale'] = 'hebrew';
+$LanguagesArray['he_IL.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['he.IL.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['hi_IN.utf8']['LanguageName'] = 'हिन्दी, हिंदी';
$LanguagesArray['hi_IN.utf8']['WindowsLocale'] = 'hindi';
$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
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-05-09 03:13:54 UTC (rev 7514)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-11 21:29:23 UTC (rev 7515)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-04-26 09:51-0600\n"
-"PO-Revision-Date: 2016-04-26 10:53-0600\n"
+"PO-Revision-Date: 2016-05-09 08:56-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -7947,7 +7947,7 @@
#: Credit_Invoice.php:25
msgid "Please select an invoice first"
-msgstr "Seleccione primero una Pedidos"
+msgstr "Seleccione primero una Pedidos"
#: Credit_Invoice.php:25
msgid "from the customer inquiry screen click the link to credit an invoice"
@@ -8339,7 +8339,7 @@
#: Currencies.php:116
msgid "The currency definition record has been updated"
-msgstr "la moneda funcional ha sido actualizada"
+msgstr "la moneda funcional ha sido actualizada"
#: Currencies.php:136
msgid "The currency definition record has been added"
@@ -8408,7 +8408,7 @@
#: Currencies.php:278
msgid "The currency definition record has been deleted"
-msgstr "la definición de moneda ha sido eliminada"
+msgstr "la definición de moneda ha sido eliminada"
#: Currencies.php:305
msgid "ISO4217 Code"
@@ -8469,7 +8469,7 @@
#: Currencies.php:414
msgid "Show all currency definitions"
-msgstr "Mostrar todas las monedas"
+msgstr "Mostrar todas las monedas"
#: Currencies.php:437 geo_displaymap_customers.php:12
#: geo_displaymap_suppliers.php:12
@@ -8878,7 +8878,7 @@
#: CustLoginSetup.php:48 SuppLoginSetup.php:48 WWW_Users.php:72
msgid "The user ID entered must be at least 4 characters long"
-msgstr "El identificador de usuario debe tener al menos 4 caracteres"
+msgstr "El identificador de usuario debe tener al menos 4 caracteres"
#: CustLoginSetup.php:51 SuppLoginSetup.php:51 WWW_Users.php:75
msgid "User names cannot contain any of the following characters"
@@ -8887,7 +8887,7 @@
#: CustLoginSetup.php:55 SuppLoginSetup.php:54 UserSettings.php:42
#: WWW_Users.php:79
msgid "The password entered must be at least 5 characters long"
-msgstr "La clave debe tener al menos 5 caracteres"
+msgstr "La clave debe tener al menos 5 caracteres"
#: CustLoginSetup.php:59 SuppLoginSetup.php:57 UserSettings.php:45
#: WWW_Users.php:83
@@ -9106,7 +9106,7 @@
#: CustWhereAlloc.php:129 SuppWhereAlloc.php:127
msgid "Transaction Total"
-msgstr "Total de la Transacción"
+msgstr "Total de la transacción"
#: CustWhereAlloc.php:138 CustomerTransInquiry.php:106 SuppWhereAlloc.php:136
#: SupplierTransInquiry.php:115 Z_CheckAllocs.php:65
@@ -11550,7 +11550,7 @@
#: DeliveryDetails.php:298
msgid "The freight charge has been updated"
-msgstr "El costo por transporte ha sido actualizado"
+msgstr "El costo por transporte ha sido actualizado"
#: DeliveryDetails.php:298
msgid ""
@@ -11655,7 +11655,7 @@
#: DeliveryDetails.php:844
msgid "Select A Different Order"
-msgstr "Seleccione una orden distinta"
+msgstr "Seleccione una orden distinta"
#: DeliveryDetails.php:856 GoodsReceived.php:130 Shipments.php:489
#: SpecialOrder.php:627
@@ -11785,7 +11785,7 @@
#: DeliveryDetails.php:1170
msgid "Recalc Freight Cost"
-msgstr "Recalcular Costo transporte"
+msgstr "Recalcular Costo transporte"
#: DeliveryDetails.php:1179
msgid "Freight/Shipper Method"
@@ -12052,7 +12052,7 @@
#: DiscountMatrix.php:37
msgid "The discount rate must be entered as a positive number"
-msgstr "La taza de Descuento debe ser positiva"
+msgstr "La taza de Descuento debe ser positiva"
#: DiscountMatrix.php:43
msgid ""
@@ -12066,11 +12066,11 @@
#: DiscountMatrix.php:64
msgid "The discount matrix record has been added"
-msgstr "El registro de la matriz de descuento ha sido creado"
+msgstr "El registro de la matriz de descuento ha sido creado"
#: DiscountMatrix.php:80
msgid "The discount matrix record has been deleted"
-msgstr "El registro de la matrz de descuento ha sido eliminado"
+msgstr "El registro de la matrz de descuento ha sido eliminado"
#: DiscountMatrix.php:97 PriceMatrix.php:184
msgid "Customer Price List"
@@ -14244,7 +14244,7 @@
#: FreightCosts.php:281
msgid "Show all freight costs for"
-msgstr "Mostrar todos los Costos de transporte"
+msgstr "Mostrar todos los Costos de transporte"
#: FreightCosts.php:338
msgid "For Deliveries From"
@@ -14264,7 +14264,7 @@
#: FreightCosts.php:356
msgid "Rate per Cubic Metre"
-msgstr "Tarifa por metro cubico"
+msgstr "Tarifa por metro cubico"
#: FreightCosts.php:358
msgid "Rate Per KG"
@@ -22911,7 +22911,7 @@
#: Payments.php:1178
msgid "Supplier Transactions Payment Entry"
-msgstr ""
+msgstr "Registro de pago en transacciones con proveedores"
#: Payments.php:1187
msgid "Supplier Narrative"
@@ -22934,8 +22934,8 @@
"Supplier reference in supplier transactions. If blank, it uses the payment "
"type."
msgstr ""
-"Referencia de proveedores en las transacciones con los proveedores. Si está "
-"en blanco, se usa el tipo de pago."
+"Referencia de proveedores en las transacciones con proveedores. Si está en "
+"blanco, se usa el tipo de pago."
#: Payments.php:1203
msgid "Transaction Text"
@@ -22945,7 +22945,7 @@
msgid ""
"Transaction text in supplier transactions. If blank, it uses the narrative."
msgstr ""
-"Texto de la transacción en las transacciones con los proveedores. Si está en "
+"Texto de la transacción en las transacciones con proveedores. Si está en "
"blanco, se usa la descripción de bancos."
#: Payments.php:1209
@@ -29295,7 +29295,7 @@
#: SelectSupplier.php:167 SelectSupplier.php:207
msgid "Supplier Transactions"
-msgstr "Transacciones de proveedores"
+msgstr "Transacciones con proveedores"
#: SelectSupplier.php:168 SelectSupplier.php:208 Suppliers.php:5
msgid "Supplier Maintenance"
@@ -33563,8 +33563,8 @@
"To enter supplier transactions the supplier must first be selected from the "
"supplier selection screen"
msgstr ""
-"Para ingresar de las transacciones de proveedores, primero el proveedor debe "
-"ser seleccionado desde la pantalla de selección de proveedores"
+"Para ingresar transacciones con proveedores, primero el proveedor debe ser "
+"seleccionado desde la pantalla de selección de proveedores"
#: SuppFixedAssetChgs.php:22 SuppShiptChgs.php:27
msgid ""
@@ -34317,7 +34317,7 @@
#: SupplierAllocations.php:447
msgid "Transaction total"
-msgstr "Transacción total"
+msgstr "Total de la transacción"
#: SupplierAllocations.php:457
msgid "Supp"
@@ -34985,7 +34985,7 @@
#: SupplierInquiry.php:138
msgid "The Supplier Transactions could not be updated because"
-msgstr "Las Transacciones de proveedores no se pudieron actualizar, porque"
+msgstr "Las transacciones con proveedores no se pudieron actualizar porque"
#: SupplierInquiry.php:266
msgid "Click to view payments"
@@ -35601,15 +35601,15 @@
#: SupplierTransInquiry.php:6
msgid "Supplier Transactions Inquiry"
-msgstr "Consultar Transacciones del proveedor"
+msgstr "Consultar transacciones con proveedores"
#: SupplierTransInquiry.php:102
msgid ""
"The supplier transactions for the selected criteria could not be retrieved "
"because"
msgstr ""
-"No se pudo obtener las transacciones del proveedor para el criterio indicado "
-"porque"
+"No se pudo obtener las transacciones con proveedores para el criterio "
+"indicado porque"
#: SupplierTransInquiry.php:110
msgid "Supp Ref"
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-09 03:13:54 UTC (rev 7514)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-11 21:29:23 UTC (rev 7515)
@@ -1,93 +1,96 @@
-# webERP - HEBREW Translation File.
-# Copyright (C) 2004 weberp.org
-# This file is distributed under the same license as the webERP package.
-# Hagay Mandel <ma...@ne...>, 2016.
+# webERP - Hebrew Translation File.
+# Copyright (C) 2016 Hagay Mandel
+# This file is NOT distributed under the same license as the webERP package.
+# For details see http://www.gnu.org/licenses/info/GPLv2.html
+# First Author Karl Schmidt <ka...@xt...>, 2007
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-01 08:48-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL...@li...>\n"
+"POT-Creation-Date: 2015-05-17 13:40+1200\n"
+"PO-Revision-Date: 2016-05-11 01:58+0200\n"
+"Last-Translator: Hagay Mandel <ma...@ne...>\n"
+"Language-Team: WebERP Translation Team <web-erp-translation@lists."
+"sourceforge.net>\n"
"Language: he_IL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:391
msgid "Account Groups"
-msgstr ""
+msgstr "קבוצות חשבון"
#: AccountGroups.php:19
msgid ""
"An error occurred in retrieving the account groups of the parent account "
"group during the check for recursion"
-msgstr ""
+msgstr "קבוצות חשבון"
#: AccountGroups.php:20
msgid ""
"The SQL that was used to retrieve the account groups of the parent account "
"group and that failed in the process was"
-msgstr ""
+msgstr "קבוצות חשבון"
#: AccountGroups.php:46
msgid "An error occurred in moving the account group"
-msgstr ""
+msgstr "שגיאה בהעברת קבוצת חשבון"
#: AccountGroups.php:47
msgid "The SQL that was used to move the account group was"
-msgstr ""
+msgstr "להעברת הקבוצה היתה SQL-פקודת ה"
#: AccountGroups.php:49 AccountGroups.php:331
msgid "Review Account Groups"
-msgstr ""
+msgstr "בדיקת קבוצות החשבון"
#: AccountGroups.php:50
msgid "All accounts in the account group:"
-msgstr ""
+msgstr "כל החשבונות בקבוצת החשבון"
#: AccountGroups.php:50
msgid "have been changed to the account group:"
-msgstr ""
+msgstr "שונה לקבוצת החשבון"
#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:208
#: AccountGroups.php:243
msgid "The SQL that was used to retrieve the information was"
-msgstr ""
+msgstr "לשליפת המידע היתה SQL-פקודת ה"
#: AccountGroups.php:70
msgid "Could not check whether the group exists because"
-msgstr ""
+msgstr "לא ניתן לבדוק אם הקבוצה קיימת מכיוון ש"
#: AccountGroups.php:77
msgid "The account group name already exists in the database"
-msgstr ""
+msgstr "שם קבוצת החשבון כבר קיים במסד הנתונים"
#: AccountGroups.php:83
msgid "The account group name cannot contain the character"
-msgstr ""
+msgstr "שם מסד הנתונים לא יכלול תווים לא חוקיים"
#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:32
msgid "or the character"
-msgstr ""
+msgstr "או התו"
#: AccountGroups.php:89
msgid "The account group name must be at least one character long"
-msgstr ""
+msgstr "שם קבוצת החשבון חייב להיות בן תו אחד לפחות"
#: AccountGroups.php:96
msgid ""
"The parent account group selected appears to result in a recursive account "
"structure - select an alternative parent account group or make this group a "
"top level account group"
-msgstr ""
+msgstr "שם קבוצת החשבון חייב להיות בן תו אחד לפחות"
#: AccountGroups.php:107
msgid "Could not check whether the group is recursive because"
-msgstr ""
+msgstr "לא ניתן היה לבדוק האם הקבוצה היא רקורסיבית כי"
#: AccountGroups.php:115
msgid ""
@@ -96,288 +99,285 @@
"appears in the balance sheet or profit and loss account are all properties "
"inherited from the parent account group. Any changes made to these fields "
"will have no effect."
-msgstr ""
+msgstr "לא ניתן היה לבדוק האם הקבוצה היא רקורסיבית כי"
#: AccountGroups.php:120
msgid "The section in accounts must be an integer"
-msgstr ""
+msgstr "הקטע בחשבונות חייב להיות מספר שלם"
#: AccountGroups.php:126
msgid "The sequence in the trial balance must be an integer"
-msgstr ""
+msgstr "הסדר במאזן הנסוי חייב להיות מספר שלם"
#: AccountGroups.php:132
msgid "The sequence in the TB must be numeric and less than"
-msgstr ""
+msgstr "חייב להיות ספרתי וקטן מ TB-בסדר ב"
#: AccountGroups.php:148
msgid "An error occurred in renaming the account group"
-msgstr ""
+msgstr "שגיאה בשינוי שם קבוצת החשבון"
#: AccountGroups.php:149
msgid "The SQL that was used to rename the account group was"
-msgstr ""
+msgstr "לשינוי שם הקבוצה היתה SQL-פקודת ה"
#: AccountGroups.php:168
msgid "An error occurred in updating the account group"
-msgstr ""
+msgstr "שגיאה בעדכון קבוצת החשבון"
#: AccountGroups.php:169
msgid "The SQL that was used to update the account group was"
-msgstr ""
+msgstr "לעדכון הקבוצה היתה SQL-פקודת ה"
#: AccountGroups.php:171 AccountSections.php:98 PaymentMethods.php:84
msgid "Record Updated"
-msgstr ""
+msgstr "רשומה עודכנה"
#: AccountGroups.php:187
msgid "An error occurred in inserting the account group"
-msgstr ""
+msgstr "שגיאה בהכנסת קבוצת החשבון"
#: AccountGroups.php:188
msgid "The SQL that was used to insert the account group was"
-msgstr ""
+msgstr "להכנסת הקבוצה היתה SQL-פקודת ה"
#: AccountGroups.php:189 AccountSections.php:108
msgid "Record inserted"
-msgstr ""
+msgstr "רשומה הוכנסה"
#: AccountGroups.php:207
msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr ""
+msgstr "שגיאה בשליפת מידע הקבוצה "
#: AccountGroups.php:212
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
-msgstr ""
+msgstr "שגיאה בשליפת מידע הקבוצה "
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
-#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
-#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:91 WorkCentres.php:97
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
msgid "There are"
-msgstr ""
+msgstr "ישנם"
#: AccountGroups.php:213
msgid "general ledger accounts that refer to this account group"
-msgstr ""
+msgstr "חשבונות חשבונות ראשים המתייחסים לקבוצת חשבון זה"
#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:404
msgid "Parent Group"
-msgstr ""
+msgstr "קבוצת אב"
#: AccountGroups.php:236
msgid "Move Group"
-msgstr ""
+msgstr "העברת קבומה"
#: AccountGroups.php:242
msgid "An error occurred in retrieving the parent group information"
-msgstr ""
+msgstr "שגיאה באיחזור מידע קבוצת האב"
#: AccountGroups.php:247
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
-msgstr ""
+msgstr "שגיאה באיחזור מידע קבוצת האב"
#: AccountGroups.php:248
msgid "account groups that have this group as its/there parent account group"
-msgstr ""
+msgstr "קבוצות החשבון שלהן קבוצת האב הנוכחית"
#: AccountGroups.php:252
msgid "An error occurred in deleting the account group"
-msgstr ""
+msgstr "שגיאה במחיקת קבוצת החשבון"
#: AccountGroups.php:253
msgid "The SQL that was used to delete the account group was"
-msgstr ""
+msgstr "למחיקת הקבוצה היתה SQL-פקודת ה"
#: AccountGroups.php:255
msgid "group has been deleted"
-msgstr ""
+msgstr "הקבוצה נמחקה"
#: AccountGroups.php:279
msgid "The sql that was used to retrieve the account group information was "
-msgstr ""
+msgstr "לאיחזור מידע קבוצת החשבון היתה SQL-פקודת ה"
#: AccountGroups.php:280
msgid "Could not get account groups because"
-msgstr ""
+msgstr "לא ניתן למצוא את קבוצת החשבון כי"
-#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
-#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
-#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
-#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:244 BOMs.php:908
-#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
-#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
+#: AccountGroups.php:282 AccountSections.php:169 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276
+#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:249
+#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
+#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
-#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PriceMatrix.php:16
-#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:331 SelectGLAccount.php:77
-#: SelectOrderItems.php:559 SelectOrderItems.php:1469
-#: SelectOrderItems.php:1569 SelectProduct.php:522 SelectQASamples.php:45
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:14 SupplierPriceList.php:224
-#: SupplierPriceList.php:394 SupplierPriceList.php:398
-#: SupplierPriceList.php:449 SupplierPriceList.php:499
-#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
-#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
-#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
-#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:29
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
+#: SupplierPriceList.php:224 SupplierPriceList.php:394
+#: SupplierPriceList.php:398 SupplierPriceList.php:449
+#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
+#: SupplierTenderCreate.php:664 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:217
msgid "Search"
-msgstr ""
+msgstr "חיפוש"
#: AccountGroups.php:286
msgid "Group Name"
-msgstr ""
+msgstr "שם הקבוצה"
#: AccountGroups.php:287 EDIMessageFormat.php:129 EDIMessageFormat.php:208
msgid "Section"
-msgstr ""
+msgstr "קטע"
#: AccountGroups.php:288 AccountGroups.php:458
msgid "Sequence In TB"
-msgstr ""
+msgstr "TB-הסדר ב"
#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
-#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
+#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:187
+#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
msgid "Profit and Loss"
-msgstr ""
+msgstr "רווח והפסד"
#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
-#: AccountGroups.php:447 BOMs.php:129 BOMs.php:813 BOMs.php:815
+#: AccountGroups.php:447 BOMs.php:128 BOMs.php:802 BOMs.php:804
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:212 DeliveryDetails.php:1158
-#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
-#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
-#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
-#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
-#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
-#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
-#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
-#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
-#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
-#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
-#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
-#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
-#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
-#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
-#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:230
-#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:41...
[truncated message content] |
|
From: <rc...@us...> - 2016-05-12 17:05:04
|
Revision: 7516
http://sourceforge.net/p/web-erp/reponame/7516
Author: rchacon
Date: 2016-05-12 17:04:59 +0000 (Thu, 12 May 2016)
Log Message:
-----------
Fix blank line caused by reverse character RTL. Clean up code.
Modified Paths:
--------------
trunk/UserSettings.php
trunk/doc/Manual/ManualGettingStarted.html
trunk/includes/LanguagesArray.php
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2016-05-11 21:29:23 UTC (rev 7515)
+++ trunk/UserSettings.php 2016-05-12 17:04:59 UTC (rev 7516)
@@ -1,13 +1,17 @@
<?php
-
/* $Id$*/
+/* Allows the user to change system wide defaults for the theme - appearance, the number of records to show in searches and the language to display messages in */
include('includes/session.inc');
$Title = _('User Settings');
+$ViewTopic = 'GettingStarted';
+$BookMark = 'UserSettings';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/user.png" title="' .
- _('User Settings') . '" alt="" />' . ' ' . _('User Settings') . '</p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/user.png" title="',// Icon image.
+ _('User Settings'), '" /> ',// Icon title.
+ _('User Settings'), '</p>';// Page title.
$PDFLanguages = array(_('Latin Western Languages - Times'),
_('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
@@ -123,26 +127,24 @@
<td><input type="text" class="integer" required="required" title="'._('The input must be positive integer').'" name="DisplayRecordsMax" size="3" maxlength="3" value="' . $_POST['DisplayRecordsMax'] . '" /></td>
</tr>';
-
+// Select language:
echo '<tr>
- <td>' . _('Language') . ':</td>
+ <td>', _('Language'), ':</td>
<td><select name="Language">';
-
-if (!isset($_POST['Language'])){
- $_POST['Language']=$_SESSION['Language'];
+if(!isset($_POST['Language'])) {
+ $_POST['Language'] = $_SESSION['Language'];
}
-
-foreach ($LanguagesArray as $LanguageEntry => $LanguageName){
- if (isset($_POST['Language']) AND $_POST['Language'] == $LanguageEntry){
- echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
- } elseif (!isset($_POST['Language']) AND $LanguageEntry == $DefaultLanguage) {
- echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
- } else {
- echo '<option value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
+foreach($LanguagesArray as $LanguageEntry => $LanguageName) {
+ echo '<option ';
+ if(isset($_POST['Language']) AND $_POST['Language'] == $LanguageEntry) {
+ echo 'selected="selected" ';
}
+ echo 'value="', $LanguageEntry, '">', $LanguageName['LanguageName'], '</option>';
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
+// Select theme:
echo '<tr>
<td>' . _('Theme') . ':</td>
<td><select name="Theme">';
@@ -217,4 +219,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2016-05-11 21:29:23 UTC (rev 7515)
+++ trunk/doc/Manual/ManualGettingStarted.html 2016-05-12 17:04:59 UTC (rev 7516)
@@ -331,7 +331,7 @@
<div class="floatright">
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>Themes and GUI Modification</h2>
+<h2><a id="UserSettings">Themes and GUI Modification</a></h2>
<p>Often what visually appeals to one does not appeal to another. Whilst accounting software is primarily about function - appearances do matter! Some flexibility is available with the colour scheme and font sizes of the GUI using cascading style sheets (css).</p>
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2016-05-11 21:29:23 UTC (rev 7515)
+++ trunk/includes/LanguagesArray.php 2016-05-12 17:04:59 UTC (rev 7516)
@@ -67,7 +67,7 @@
$LanguagesArray['he_IL.utf8']['LanguageName'] = 'עברית';
$LanguagesArray['he_IL.utf8']['WindowsLocale'] = 'hebrew';
$LanguagesArray['he_IL.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['he.IL.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['he_IL.utf8']['ThousandsSeparator'] = ',';
$LanguagesArray['hi_IN.utf8']['LanguageName'] = 'हिन्दी, हिंदी';
$LanguagesArray['hi_IN.utf8']['WindowsLocale'] = 'hindi';
@@ -184,5 +184,5 @@
$LanguagesArray['zh_TW.utf8']['DecimalPoint'] = '.';
$LanguagesArray['zh_TW.utf8']['ThousandsSeparator'] = ',';
-asort($LanguagesArray);
+/*asort($LanguagesArray);*/
?>
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-11 21:29:23 UTC (rev 7515)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-12 17:04:59 UTC (rev 7516)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-17 13:40+1200\n"
+"POT-Creation-Date: 2016-05-12 10:59-0600\n"
"PO-Revision-Date: 2016-05-11 01:58+0200\n"
"Last-Translator: Hagay Mandel <ma...@ne...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
@@ -20,7 +20,7 @@
"X-Generator: Poedit 1.5.4\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:391
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
msgid "Account Groups"
msgstr "קבוצות חשבון"
@@ -165,17 +165,17 @@
#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
-#: Locations.php:343 Locations.php:351 Manufacturers.php:154
+#: Locations.php:343 Locations.php:351 Manufacturers.php:185
#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
-#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147
+#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166
#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
-#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
-#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
-#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
+#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
+#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
+#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
msgid "There are"
msgstr "ישנם"
@@ -225,12 +225,13 @@
msgid "Could not get account groups because"
msgstr "לא ניתן למצוא את קבוצת החשבון כי"
-#: AccountGroups.php:282 AccountSections.php:169 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276
-#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:249
-#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
-#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
+#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
+#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
+#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:277 BOMs.php:970
+#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
+#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
#: CustItem.php:120 CustItem.php:210 CustItem.php:238
@@ -242,8 +243,8 @@
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
-#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
@@ -253,25 +254,24 @@
#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
-#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
-#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559
-#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:331 SelectGLAccount.php:77 SelectOrderItems.php:559
+#: SelectOrderItems.php:1469 SelectOrderItems.php:1569 SelectProduct.php:522
#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
-#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:29
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
-#: SupplierPriceList.php:224 SupplierPriceList.php:394
-#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
-#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
-#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
-#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: SupplierPriceList.php:14 SupplierPriceList.php:224
+#: SupplierPriceList.php:394 SupplierPriceList.php:398
+#: SupplierPriceList.php:449 SupplierPriceList.php:499 Suppliers.php:304
+#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
+#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
+#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
+#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:217
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "חיפוש"
@@ -288,30 +288,31 @@
msgstr "TB-הסדר ב"
#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:187
-#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
+#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
+#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
msgid "Profit and Loss"
msgstr "רווח והפסד"
#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
-#: AccountGroups.php:447 BOMs.php:128 BOMs.php:802 BOMs.php:804
+#: AccountGroups.php:447 BOMs.php:132 BOMs.php:875 BOMs.php:877
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:156 DeliveryDetails.php:1157
-#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
-#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
-#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683
-#: Locations.php:685 Locations.php:701 MRPCalendar.php:224 MRP.php:554
-#: MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
-#: PaymentMethods.php:275 PaymentMethods.php:282 PaymentMethods.php:289
-#: PaymentMethods.php:296 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
-#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
+#: DailyBankTransactions.php:212 DeliveryDetails.php:1158
+#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
+#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
+#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
+#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
+#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
+#: MRP.php:566 MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602
+#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134
#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
@@ -327,17 +328,17 @@
#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
-#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectProduct.php:229 SelectProduct.php:354
+#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
+#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:230 SelectProduct.php:368
#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
-#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
-#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
+#: StockClone.php:938 StockClone.php:940 StockClone.php:963 StockClone.php:965
+#: Stocks.php:1266 Stocks.php:1268 Stocks.php:1291 Stocks.php:1293
#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
@@ -347,35 +348,37 @@
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:310
-#: TaxGroups.php:313 TaxGroups.php:364 TestPlanResults.php:304
+#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
+#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
-#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
-#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706
+#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
+#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536
+#: WWW_Users.php:707 WWW_Users.php:709 WWW_Users.php:722 WWW_Users.php:724
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "כן"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
-#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:134 BOMs.php:874
+#: BOMs.php:878 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:158 DeliveryDetails.php:1158
-#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
-#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
-#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688
-#: Locations.php:690 Locations.php:702 MRPCalendar.php:226 MRP.php:552
-#: MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 NoSalesItems.php:191
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:276 PaymentMethods.php:283
-#: PaymentMethods.php:290 PaymentMethods.php:297 PcAuthorizeExpenses.php:246
-#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
-#: PDFWOPrint.php:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
+#: DailyBankTransactions.php:214 DeliveryDetails.php:1159
+#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
+#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
+#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
+#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
+#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
+#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
+#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603
+#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
@@ -390,18 +393,18 @@
#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
-#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
-#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:231
-#: SelectProduct.php:356 SelectQASamples.php:426 SelectQASamples.php:523
+#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304
+#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:232
+#: SelectProduct.php:370 SelectQASamples.php:426 SelectQASamples.php:523
#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
-#: ShopParameters.php:498 StockClone.php:917 StockClone.php:919
-#: StockClone.php:942 StockClone.php:944 Stocks.php:1251 Stocks.php:1253
-#: Stocks.php:1276 Stocks.php:1278 SuppContractChgs.php:92
+#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
+#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
+#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
@@ -411,18 +414,20 @@
#: SystemParameters.php:1103 SystemParameters.php:1157
#: SystemParameters.php:1167 SystemParameters.php:1171
#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:366 TestPlanResults.php:306
+#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
+#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
-#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
-#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
-#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
+#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
+#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537
+#: WWW_Users.php:706 WWW_Users.php:710 WWW_Users.php:721 WWW_Users.php:725
+#: includes/PDFLowGPPageHeader.inc:44
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "לא"
-#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
+#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
+#: BankAccounts.php:243 BOMs.php:190 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
@@ -431,23 +436,24 @@
#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
-#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
-#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
-#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
+#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
-#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
-#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
-#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417
+#: SelectCustomer.php:680 SelectCustomer.php:699 SelectCustomer.php:746
+#: SelectCustomer.php:764 SelectCustomer.php:788 SelectCustomer.php:805
+#: SelectGLAccount.php:130 SelectGLAccount.php:145 SelectQASamples.php:417
#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
-#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
-#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:368
#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "עריכה"
@@ -456,44 +462,45 @@
msgid "Are you sure you wish to delete this account group?"
msgstr "?האם למחוק את קבוצת החשבון"
-#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
+#: AccountGroups.php:323 AccountSections.php:200 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:192 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
+#: CustomerReceipt.php:993 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:431 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
+#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:211 Payments.php:1112 PaymentTerms.php:206
-#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
-#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
+#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1156 PaymentTerms.php:206
+#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
-#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
-#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
-#: SelectCustomer.php:616 SelectCustomer.php:635 SelectCustomer.php:665
-#: SelectCustomer.php:683 SelectCustomer.php:707 SelectCustomer.php:724
-#: SelectOrderItems.php:1379 SelectQASamples.php:418
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
+#: SelectCustomer.php:681 SelectCustomer.php:700 SelectCustomer.php:747
+#: SelectCustomer.php:765 SelectCustomer.php:789 SelectCustomer.php:806
+#: SelectOrderItems.php:1381 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
-#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
+#: WorkCentres.php:146 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "מחיקה"
@@ -556,27 +563,28 @@
"ledger accounts should display in the trial balance"
msgstr "קטע בחשבונות"
-#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
+#: AccountGroups.php:462 AccountSections.php:268 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAc...
[truncated message content] |
|
From: <rc...@us...> - 2016-05-13 04:47:10
|
Revision: 7518
http://sourceforge.net/p/web-erp/reponame/7518
Author: rchacon
Date: 2016-05-13 04:47:08 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Completes and standardise tables; clean up code.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2016-05-12 17:07:21 UTC (rev 7517)
+++ trunk/AccountGroups.php 2016-05-13 04:47:08 UTC (rev 7518)
@@ -1,12 +1,12 @@
<?php
/* $Id$*/
+/* Defines the groupings of general ledger accounts */
include('includes/session.inc');
-
$Title = _('Account Groups');
-$ViewTopic= 'GeneralLedger';// Filename in ManualContents.php's TOC.
-$BookMark = 'AccountGroups';// Anchor's id in the manual's html document.
-include('includes/header.inc');// Manual links before header.inc.
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'AccountGroups';
+include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -260,12 +260,12 @@
if (!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
-/* An account group could be posted when one has been edited and is being updated or GOT when selected for modification
- SelectedAccountGroup will exist because it was sent with the page in a GET .
- If its the first time the page has been displayed with no parameters
-then none of the above are true and the list of account groups will be displayed with
-links to delete or edit each. These will call the same page again and allow update/input
-or deletion of the records*/
+/* An account group could be posted when one has been edited and is being updated or GOT when selected for modification
+ SelectedAccountGroup will exist because it was sent with the page in a GET .
+ If its the first time the page has been displayed with no parameters
+ then none of the above are true and the list of account groups will be displayed with
+ links to delete or edit each. These will call the same page again and allow update/input
+ or deletion of the records*/
$sql = "SELECT groupname,
sectionname,
@@ -364,11 +364,16 @@
$_POST['PandL'] = $myrow['pandl'];
$_POST['ParentGroupName'] = $myrow['parentgroupname'];
- echo '<table class="selection">';
- echo '<tr>
- <th colspan="2">' . _('Edit Account Group Details') . '</th>
- </tr>';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
+ echo '<table class="selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('Edit Account Group Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input name="SelectedAccountGroup" type="hidden" value="', $_GET['SelectedAccountGroup'], '" /></td>
+ </tr>';
} elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
@@ -388,29 +393,33 @@
$_POST['PandL']='';
}
- echo '<br /><table class="selection">';
- echo '<tr>
- <th colspan="2">' . _('New Account Group Details') . '</th>
+ echo '<br />
+ <table class="selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('New Account Group Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
- </tr>';
}
echo '<tr>
- <td>' . _('Account Group Name') . ':' . '</td>
- <td><input tabindex="1" autofocus="autofocus" required="required" data-type="no-illegal-chars" placeholder="' . _('Enter the account group name') . '" ' . (in_array('GroupName',$Errors) ? '"class=inputerror"' : '' ) . ' type="text" name="GroupName" size="30" minlength="3" maxlength="30" value="' . $_POST['GroupName'] . '" title="' . _('A unique name for the account group must be entered - at least 3 characters long and less than 30 characters long. Only alpha numeric characters can be used.') . '" /></td>
+ <td>', _('Account Group Name'), ':</td>
+ <td><input autofocus="autofocus" data-type="no-illegal-chars" placeholder="' . _('Enter the account group name') . '" ' . (in_array('GroupName',$Errors) ? '"class=inputerror" ' : '' ) . 'maxlength="30" minlength="3" name="GroupName" required="required" size="30" tabindex="1" type="text" value="' . $_POST['GroupName'] . '" title="' . _('A unique name for the account group must be entered - at least 3 characters long and less than 30 characters long. Only alpha numeric characters can be used.') . '" /></td>
</tr>
<tr>
- <td>' . _('Parent Group') . ':' . '</td>
- <td><select tabindex="2" ' . (in_array('ParentGroupName',$Errors) ? 'class="selecterror"' : '' ) . ' name="ParentGroupName">';
+ <td>', _('Parent Group'), ':</td>
+ <td><select ',
+ ( in_array('ParentGroupName',$Errors) ? 'class="selecterror" ' : '' ),
+ 'name="ParentGroupName" tabindex="2">';
$sql = "SELECT groupname FROM accountgroups";
$groupresult = DB_query($sql,$ErrMsg,$DbgMsg);
- if (!isset($_POST['ParentGroupName'])){
- echo '<option selected="selected" value="">' ._('Top Level Group') . '</option>';
- } else {
- echo '<option value="">' ._('Top Level Group') . '</option>';
- }
+ echo '<option ',
+ ( !isset($_POST['ParentGroupName']) ? 'selected="selected" ' : '' ),
+ 'value="">', _('Top Level Group'), '</option>';
while ( $grouprow = DB_fetch_array($groupresult) ) {
@@ -423,8 +432,10 @@
echo '</select></td>
</tr>
<tr>
- <td>' . _('Section In Accounts') . ':' . '</td>
- <td><select tabindex="3" ' . (in_array('SectionInAccounts',$Errors) ? 'class="selecterror"' : '' ) . ' name="SectionInAccounts">';
+ <td>', _('Section In Accounts'), ':</td>
+ <td><select ',
+ ( in_array('SectionInAccounts',$Errors) ? 'class="selecterror" ' : '' ),
+ 'name="SectionInAccounts" tabindex="3">';
$sql = "SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid";
$secresult = DB_query($sql,$ErrMsg,$DbgMsg);
@@ -438,8 +449,8 @@
echo '</select></td>
</tr>
<tr>
- <td>' . _('Profit and Loss') . ':' . '</td>
- <td><select tabindex="4" name="PandL" title="' . _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account') . '">';
+ <td>', _('Profit and Loss'), ':</td>
+ <td><select name="PandL" tabindex="4" title="', _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account'), '">';
if ($_POST['PandL']!=0 ) {
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
@@ -455,17 +466,18 @@
echo '</select></td>
</tr>
<tr>
- <td>' . _('Sequence In TB') . ':' . '</td>
- <td><input tabindex="5" type="text" maxlength="4" name="SequenceInTB" required="required" class="number" value="' . $_POST['SequenceInTB'] . '" title="' . _('Enter the sequence number that this account group and its child general ledger accounts should display in the trial balance') . '" /></td>
+ <td>', _('Sequence In TB'), ':</td>
+ <td><input class="number" maxlength="4" name="SequenceInTB" required="required" tabindex="5" type="text" value="', $_POST['SequenceInTB'], '" title="', _('Enter the sequence number that this account group and its child general ledger accounts should display in the trial balance'), '" /></td>
</tr>
<tr>
- <td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
+ <td class="centre" colspan="2"><input name="submit" tabindex="6" type="submit" value="', _('Enter Information'), '" /></td>
</tr>
- </table>
- <br />
+ </tbody>
+ </table>
+ <br />
</div>
</form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2016-05-12 17:07:21 UTC (rev 7517)
+++ trunk/AccountSections.php 2016-05-13 04:47:08 UTC (rev 7518)
@@ -1,6 +1,6 @@
<?php
/* $Id$*/
-/* Defines the sections in the general ledger reports. */
+/* Defines the sections in the general ledger reports */
include('includes/session.inc');
$Title = _('Account Sections');
@@ -90,7 +90,7 @@
if(isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) {
- /*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
+ /*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
$sql = "UPDATE accountsection SET sectionname='" . $_POST['SectionName'] . "'
WHERE sectionid = '" . $_POST['SelectedSectionID'] . "'";
@@ -126,9 +126,9 @@
$myrow = DB_fetch_array($result);
if($myrow['sections']>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<div>';
- echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
- echo '</div>';
+ echo '<div>',
+ '<br />', _('There are'), ' ', $myrow['sections'], ' ', _('general ledger accounts groups that refer to this account section'),
+ '</div>';
} else {
//Fetch section name
@@ -151,13 +151,13 @@
if(!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) {
-/* An account section could be posted when one has been edited and is being updated
- or GOT when selected for modification
- SelectedSectionID will exist because it was sent with the page in a GET .
- If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of account groups will be displayed with
- links to delete or edit each. These will call the same page again and allow update/input
- or deletion of the records*/
+/* An account section could be posted when one has been edited and is being updated
+ or GOT when selected for modification
+ SelectedSectionID will exist because it was sent with the page in a GET .
+ If its the first time the page has been displayed with no parameters
+ then none of the above are true and the list of account groups will be displayed with
+ links to delete or edit each. These will call the same page again and allow update/input
+ or deletion of the records*/
$sql = "SELECT sectionid,
sectionname
@@ -191,15 +191,17 @@
$k++;
}
- echo '<td class="number">', $myrow['sectionid'], '</td>
+ echo '<td class="number">', $myrow['sectionid'], '</td>
<td class="text">', $myrow['sectionname'], '</td>
- <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'), '</a></td>';
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'].'?SelectedSectionID='.urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'), '</a></td>
+ <td class="noprint">';
if( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
- echo '<td class="noprint"><b>', _('Restricted'), '</b></td>';
+ echo '<b>', _('Restricted'), '</b>';
} else {
- echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), '">', _('Delete'), '</a></td>';
+ echo '<a href="', htmlspecialchars($_SERVER['PHP_SELF'].'?SelectedSectionID='.urlencode($myrow['sectionid']).'&delete=1', ENT_QUOTES, 'UTF-8'), '">', _('Delete'), '</a>';
}
- echo '</tr>';
+ echo '</td>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table>';
/* echo '</div>';// End div id="Report".*/
@@ -212,9 +214,9 @@
if(! isset($_GET['delete'])) {
- echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">';
- echo '<div class="noprint"><br />';
- echo '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />';
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">',
+ '<div class="noprint"><br />',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />';
if(isset($_GET['SelectedSectionID'])) {
//editing an existing section
@@ -232,17 +234,23 @@
$myrow = DB_fetch_array($result);
$_POST['SectionID'] = $myrow['sectionid'];
- $_POST['SectionName'] = $myrow['sectionname'];
+ $_POST['SectionName'] = $myrow['sectionname'];
- echo '<input type="hidden" name="SelectedSectionID" value="' . $_POST['SectionID'] . '" />';
- echo '<table class="selection">
+ echo '<input name="SelectedSectionID" type="hidden" value="', $_POST['SectionID'], '" />
+ <table class="selection">
+ <thead>
<tr>
- <td>' . _('Section Number') . ':' . '</td>
- <td>' . $_POST['SectionID'] . '</td>
+ <th colspan="2">', _('Edit Account Section Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>', _('Section Number'), ':</td>
+ <td>', $_POST['SectionID'], '</td>
</tr>';
}
- } else {
+ } else {
if(!isset($_POST['SelectedSectionID'])) {
$_POST['SelectedSectionID']='';
@@ -254,24 +262,33 @@
$_POST['SectionName']='';
}
echo '<table class="selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('New Account Section Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>', _('Section Number'), ':</td>
+ <td><input autofocus="autofocus" ',
+ ( in_array('SectionID',$Errors) ? 'class="inputerror number"' : 'class="number" ' ),
+ 'maxlength="4" name="SectionID" required="required" size="4" tabindex="1" type="text" value="', $_POST['SectionID'], '" /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td>', _('Section Description'), ':</td>
+ <td><input ',
+ ( in_array('SectionName',$Errors) ? 'class="inputerror text" ' : 'class="text" ' ),
+ 'maxlength="30" name="SectionName" required="required" size="30" tabindex="2" type="text" value="', $_POST['SectionName'], '" /></td>
+ </tr>
<tr>
- <td>' . _('Section Number') . ':' . '</td>
- <td><input tabindex="1" ' . (in_array('SectionID',$Errors) ? 'class="inputerror"' : '' ) .' type="text" autofocus="autofocus" required="required" name="SectionID" class="number" size="4" maxlength="4" value="' . $_POST['SectionID'] . '" /></td>
- </tr>';
- }
- echo '<tr>
- <td>' . _('Section Description') . ':' . '</td>
- <td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="SectionName" required="required" size="30" maxlength="30" value="' . $_POST['SectionName'] . '" /></td>
- </tr>';
-
- echo '<tr>
- <td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
- </tr>
+ <td class="centre" colspan="2"><input name="submit" tabindex="3" type="submit" value="', _('Enter Information'), '" /></td>
+ </tr>
+ </tbody>
</table>
<br />
</div>
</form>';
-
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
|
|
From: <rc...@us...> - 2016-05-13 16:10:07
|
Revision: 7519
http://sourceforge.net/p/web-erp/reponame/7519
Author: rchacon
Date: 2016-05-13 16:10:04 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Add classes to print and table heads. Improve code.
Modified Paths:
--------------
trunk/AddCustomerContacts.php
trunk/doc/Change.log
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2016-05-13 04:47:08 UTC (rev 7518)
+++ trunk/AddCustomerContacts.php 2016-05-13 16:10:04 UTC (rev 7519)
@@ -1,10 +1,13 @@
<?php
-
/* $Id$*/
+/* Adds customer contacts */
include('includes/session.inc');
$Title = _('Customer Contacts');
+$ViewTopic = 'AccountsReceivable';
+$BookMark = 'AddCustomerContacts';
include('includes/header.inc');
+
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['Id'])){
@@ -17,7 +20,7 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Customers') . '</a><br />';
+echo '<a class="noprint" href="' . $RootPath . '/Customers.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Customers') . '</a><br />';
$SQLname="SELECT name FROM debtorsmaster WHERE debtorno='" . $DebtorNo . "'";
$Result = DB_query($SQLname);
$row = DB_fetch_array($Result);
@@ -56,7 +59,7 @@
email='" . $_POST['ContactEmail'] . "'
WHERE debtorno ='".$DebtorNo."'
AND contid='".$Id."'";
- $msg = _('Customer Contacts') . ' ' . $DebtorNo . ' ' . _('has been updated');
+ $msg = _('Customer Contacts') . ' ' . $DebtorNo . ' ' . _('has been updated');
} elseif ($InputError !=1) {
$sql = "INSERT INTO custcontacts (debtorno,
@@ -123,11 +126,12 @@
echo '<table class="selection">';
echo '<tr>
- <th>' . _('Name') . '</th>
- <th>' . _('Role') . '</th>
- <th>' . _('Phone no') . '</th>
- <th>' . _('Email') . '</th>
- <th>' . _('Notes') . '</th>
+ <th class="text">', _('Name'), '</th>
+ <th class="text">', _('Role'), '</th>
+ <th class="text">', _('Phone no'), '</th>
+ <th class="text">', _('Email'), '</th>
+ <th class="text">', _('Notes'), '</th>
+ <th class="noprint" colspan="2"> </th>
</tr>';
$k=0; //row colour counter
@@ -140,13 +144,13 @@
echo '<tr class="EvenTableRows">';
$k=1;
}
- printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="mailto:%s">%s</a></td>
- <td>%s</td>
- <td><a href="%sId=%s&DebtorNo=%s">' . _('Edit') . '</a></td>
- <td><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">' . _('Delete'). '</a></td></tr>',
+ printf('<td class="text">%s</td>
+ <td class="text">%s</td>
+ <td class="text">%s</td>
+ <td class="text"><a href="mailto:%s">%s</a></td>
+ <td class="text">%s</td>
+ <td class="noprint"><a href="%sId=%s&DebtorNo=%s">' . _('Edit') . '</a></td>
+ <td class="noprint"><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">' . _('Delete'). '</a></td></tr>',
$myrow['contactname'],
$myrow['role'],
$myrow['phoneno'],
@@ -170,12 +174,11 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">',
+ '<div>',
+ '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($Id)) {
-
+ if (isset($Id)) {// Edit Customer Contact Details.
$sql = "SELECT contid,
debtorno,
contactname,
@@ -191,78 +194,88 @@
$myrow = DB_fetch_array($result);
$_POST['Con_ID'] = $myrow['contid'];
- $_POST['ContactName'] = $myrow['contactname'];
- $_POST['ContactRole'] = $myrow['role'];
+ $_POST['ContactName'] = $myrow['contactname'];
+ $_POST['ContactRole'] = $myrow['role'];
$_POST['ContactPhone'] = $myrow['phoneno'];
$_POST['ContactEmail'] = $myrow['email'];
$_POST['ContactNotes'] = $myrow['notes'];
- $_POST['DebtorNo'] = $myrow['debtorno'];
- echo '<input type="hidden" name="Id" value="'. $Id .'" />';
- echo '<input type="hidden" name="Con_ID" value="' . $_POST['Con_ID'] . '" />';
- echo '<input type="hidden" name="DebtorNo" value="' . $_POST['DebtorNo'] . '" />';
- echo '<br />
+ $_POST['DebtorNo'] = $myrow['debtorno'];
+ echo '<input type="hidden" name="Id" value="'. $Id .'" />',
+ '<input type="hidden" name="Con_ID" value="' . $_POST['Con_ID'] . '" />',
+ '<input type="hidden" name="DebtorNo" value="' . $_POST['DebtorNo'] . '" />',
+ '<br />
<table class="selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('Edit Customer Contact Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>
<tr>
- <td>' . _('Contact Code').':</td>
- <td>' . $_POST['Con_ID'] . '</td>
+ <td>', _('Contact Code'), ':</td>
+ <td>', $_POST['Con_ID'], '</td>
</tr>';
- } else {
- echo '<table class="selection">';
+ } else {// New Customer Contact Details.
+ echo '<table class="noprint selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('New Customer Contact Details'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
}
-
+ // Contact name:
echo '<tr>
- <td>' . _('Contact Name') . '</td>';
- if (isset($_POST['ContactName'])) {
- echo '<td><input type="text" autofocus="autofocus" required="required" name="ContactName" value="' . $_POST['ContactName']. '" size="35" maxlength="40" /></td>
- </tr>';
- } else {
- echo '<td><input type="text" required="required" name="ContactName" size="35" maxlength="40" /></td>
- </tr>';
- }
+ <td>', _('Contact Name'), '</td>
+ <td><input maxlength="40" name="ContactName" required="required" size="35" type="text" ';
+ if( isset($_POST['ContactName']) ) {
+ echo 'autofocus="autofocus" value="', $_POST['ContactName'], '" ';
+ }
+ echo '/></td>
+ </tr>';
+ // Role:
echo '<tr>
- <td>' . _('Role') . '</td>';
- if (isset($_POST['ContactRole'])) {
- echo '<td><input type="text" name="ContactRole" value="'. $_POST['ContactRole']. '" size="35" maxlength="40" /></td>
- </tr>';
- } else {
- echo '<td><input type="text" name="ContactRole" size="35" maxlength="40" /></td>
- </tr>';
- }
+ <td>', _('Role'), '</td>
+ <td><input maxlength="40" name="ContactRole" size="35" type="text" ';
+ if( isset($_POST['ContactRole']) ) {
+ echo 'value="', $_POST['ContactRole'], '" ';
+ }
+ echo '/></td>
+ </tr>';
+ // Phone:
echo '<tr>
- <td>' . _('Phone') . '</td>';
- if (isset($_POST['ContactPhone'])) {
- echo '<td><input type="tel" name="ContactPhone" value="' . $_POST['ContactPhone'] . '" size="35" maxlength="40" /></td>
- </tr>';
- } else {
- echo '<td><input type="tel" name="ContactPhone" size="35" maxlength="40" /></td>
- </tr>';
- }
+ <td>', _('Phone'), '</td>
+ <td><input maxlength="40" name="ContactPhone" size="35" type="tel" ';
+ if( isset($_POST['ContactPhone']) ) {
+ echo 'value="', $_POST['ContactPhone'], '" ';
+ }
+ echo '/></td>
+ </tr>';
+ // Email:
echo '<tr>
- <td>' . _('Email') . '</td>';
- if (isset($_POST['ContactEmail'])) {
- echo '<td><input type="email" name="ContactEmail" value="' . $_POST['ContactEmail'] . '" size="55" maxlength="55" /></td>
- </tr>';
- } else {
- echo '<td><input type="email" name="ContactEmail" size="55" maxlength="55" /></td>
- </tr>';
- }
+ <td>', _('Email'), '</td>
+ <td><input maxlength="55" name="ContactEmail" size="55" type="email" ';
+ if( isset($_POST['ContactEmail']) ) {
+ echo 'value="', $_POST['ContactEmail'], '" ';
+ }
+ echo '/></td>
+ </tr>';
+ // Notes:
echo '<tr>
- <td>' . _('Notes') . '</td>';
- if (isset($_POST['ContactNotes'])) {
- echo '<td><textarea name="ContactNotes" rows="3" cols="40">' . $_POST['ContactNotes'] . '</textarea></td>';
- } else {
- echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
- }
- echo '</tr>';
- echo '<tr>
- <td colspan="2">
- <div class="centre">
- <input type="submit" name="submit" value="'. _('Enter Information') . '" />
- </div>
+ <td>', _('Notes'), '</td>
+ <td><textarea cols="40" name="ContactNotes" rows="3">',
+ ( isset($_POST['ContactNotes']) ? $_POST['ContactNotes'] : '' ),
+ '</textarea></td>
+ </tr>',
+
+ '<tr>
+ <td class="centre" colspan="2">
+ <input name="submit" type="submit" value="', _('Enter Information'), '" />
</td>
</tr>
+ <tbody>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-13 04:47:08 UTC (rev 7518)
+++ trunk/doc/Change.log 2016-05-13 16:10:04 UTC (rev 7519)
@@ -1,5 +1,6 @@
webERP Change Log
+13/05/16 RChacon: In AddCustomerContacts.php, add classes to print and table heads. Clean up code.
12/05/16 RChacon: Fix blank line caused by reverse character RTL. Clean up code.
11/05/16 RChacon: Include translation to hebrew, thanks to Hagay Mandel.
09/05/16 Exson: Tidy Code Up to remove redundant code according to Tim's guide.
|
|
From: <rc...@us...> - 2016-05-15 05:17:03
|
Revision: 7521
http://sourceforge.net/p/web-erp/reponame/7521
Author: rchacon
Date: 2016-05-15 05:17:01 +0000 (Sun, 15 May 2016)
Log Message:
-----------
Fix use of Google Maps JavaScript API V3, unpaired html tags and other bugs.
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Change.log
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-05-13 16:11:48 UTC (rev 7520)
+++ trunk/SelectCustomer.php 2016-05-15 05:17:01 UTC (rev 7521)
@@ -1,18 +1,29 @@
<?php
-
/* $Id$*/
+/* Selection of customer - from where all customer related maintenance, transactions and inquiries start */
include('includes/session.inc');
$Title = _('Search Customers');
+$ViewTopic = 'AccountsReceivable';
+$BookMark = 'SelectCustomer';
include('includes/header.inc');
+
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/customer.png" title="',// Icon image.
+ _('Customer'), '" /> ',// Icon title.
+ _('Customers'), '</p>';// Page title.
+
include('includes/SQL_CommonFunctions.inc');
-if (isset($_GET['Select'])) {
+
+if(isset($_GET['Select'])) {
$_SESSION['CustomerID'] = $_GET['Select'];
}
-if (!isset($_SESSION['CustomerID'])) { //initialise if not already done
+
+if(!isset($_SESSION['CustomerID'])) {// initialise if not already done
$_SESSION['CustomerID'] = '';
}
-if (isset($_GET['Area'])) {
+
+if(isset($_GET['Area'])) {
$_POST['Area'] = $_GET['Area'];
$_POST['Search'] = 'Search';
$_POST['Keywords'] = '';
@@ -21,14 +32,14 @@
$_POST['CustAdd'] = '';
$_POST['CustType'] = '';
}
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customers') . '</p>';
-if (!isset($_SESSION['CustomerType'])) { //initialise if not already done
+
+if(!isset($_SESSION['CustomerType'])) {// initialise if not already done
$_SESSION['CustomerType'] = '';
}
-if (isset($_POST['JustSelectedACustomer']) ) {
- if (isset ($_POST['SubmitCustomerSelection'])) {
- foreach ($_POST['SubmitCustomerSelection'] AS $CustomerID=>$BranchCode)
+if(isset($_POST['JustSelectedACustomer'])) {
+ if(isset ($_POST['SubmitCustomerSelection'])) {
+ foreach ($_POST['SubmitCustomerSelection'] as $CustomerID => $BranchCode)
$_SESSION['CustomerID'] = $CustomerID;
$_SESSION['BranchCode'] = $BranchCode;
} else {
@@ -36,140 +47,29 @@
}
}
-// only run geocode if integration is turned on AND customer has been selected
-if ($_SESSION['geocode_integration'] == 1 AND $_SESSION['CustomerID'] != "") {
- $sql = "SELECT * FROM geocode_param WHERE 1";
- $ErrMsg = _('An error occurred in retrieving the information');
- $result = DB_query($sql, $ErrMsg);
- $myrow = DB_fetch_array($result);
- $sql = "SELECT debtorsmaster.debtorno,
- debtorsmaster.name,
- custbranch.branchcode,
- custbranch.brname,
- custbranch.lat,
- custbranch.lng,
- braddress1,
- braddress2,
- braddress3,
- braddress4
- FROM debtorsmaster LEFT JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- WHERE debtorsmaster.debtorno = '" . $_SESSION['CustomerID'] . "'
- AND custbranch.branchcode = '" . $_SESSION['BranchCode'] . "'
- ORDER BY debtorsmaster.debtorno";
- $ErrMsg = _('An error occurred in retrieving the information');
- $result2 = DB_query($sql, $ErrMsg);
- $myrow2 = DB_fetch_array($result2);
- $Lat = $myrow2['lat'];
- $Lng = $myrow2['lng'];
- $API_Key = $myrow['geocode_key'];
- $center_long = $myrow['center_long'];
- $center_lat = $myrow['center_lat'];
- $map_height = $myrow['map_height'];
- $map_width = $myrow['map_width'];
- $map_host = $myrow['map_host'];
+$msg = '';
- if ($Lat == 0 && $myrow2["braddress1"] !='' && $_SESSION['BranchCode'] !='' ) {
- $delay = 0;
- $base_url = "https://" . $map_host . "/maps/api/geocode/xml?address=";
-
- $geocode_pending = true;
- while ($geocode_pending) {
- $address = urlencode($myrow2["braddress1"] . "," . $myrow2["braddress2"] . "," . $myrow2["braddress3"] . "," . $myrow2["braddress4"]);
- $id = $myrow2["branchcode"];
- $debtorno =$myrow2["debtorno"];
- $request_url = $base_url . $address . ',&sensor=true';
-
- $buffer = file_get_contents($request_url) or die("url not loading");
- $xml = simplexml_load_string($buffer);
- //echo $xml->asXML();
-
- $status = $xml->status;
- if (strcmp($status, "OK") == 0) {
- $geocode_pending = false;
-
- $Lat = $xml->result->geometry->location->lat;
- $Lng = $xml->result->geometry->location->lng;
-
- $query = sprintf("UPDATE custbranch " .
- " SET lat = '%s', lng = '%s' " .
- " WHERE branchcode = '%s' " .
- " AND debtorno = '%s' LIMIT 1;",
- ($Lat),
- ($Lng),
- ($id),
- ($debtorno));
- $update_result = DB_query($query);
-
- if ($update_result==1) {
- prnMsg( _('GeoCode has been updated for CustomerID') . ': ' . $id . ' - ' . _('Latitude') . ': ' . $Lat . ' ' . _('Longitude') . ': ' . $Lng ,'info');
- }
- } else {
- $geocode_pending = false;
- prnMsg(_('Unable to update GeoCode for CustomerID') . ': ' . $id . ' - ' . _('Received status') . ': ' . $status , 'error');
- }
- usleep($delay);
- }
- }
-
- echo '
- <script src="https://' . $map_host . '/maps/api/js?v=3.exp&key=' . $API_Key . '" type="text/javascript"></script>
- <script type="text/javascript">
- function initialize() {
- var latlng = new google.maps.LatLng('.$Lat.','.$Lng.');
- var map = new google.maps.Map(
- document.getElementById("map"), {
- center: latlng,
- zoom: 12,
- mapTypeId: google.maps.MapTypeId.ROADMAP
- });
- var marker = new google.maps.Marker({
- position: latlng,
- map: map
- });
- var contentString =
- "<div style=\"overflow: auto;\">" +
- "<div><b>'.$myrow2['brname'].'</b></div>" +
- "<div>'.$myrow2['braddress1'].'</div>" +
- "<div>'.$myrow2['braddress2'].'</div>" +
- "<div>'.$myrow2['braddress3'].'</div>" +
- "<div>'.$myrow2['braddress4'].'</div>" +
- "</div>";
-
- var infowindow = new google.maps.InfoWindow({
- content: contentString,
- MaxWidth: 250
- });
- google.maps.event.addListener(marker, "click", function() {
- infowindow.open(map,marker);
- });
- }
- google.maps.event.addDomListener(window, "load", initialize);
- </script>';
-
-} //end if geocode integration is turned on AND a customer is selected
-
-unset($result);
-$msg = '';
-if (isset($_POST['Go1']) OR isset($_POST['Go2'])) {
+if(isset($_POST['Go1']) OR isset($_POST['Go2'])) {
$_POST['PageOffset'] = (isset($_POST['Go1']) ? $_POST['PageOffset1'] : $_POST['PageOffset2']);
$_POST['Go'] = '';
}
-if (!isset($_POST['PageOffset'])) {
+
+if(!isset($_POST['PageOffset'])) {
$_POST['PageOffset'] = 1;
} else {
- if ($_POST['PageOffset'] == 0) {
+ if($_POST['PageOffset'] == 0) {
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Search']) OR isset($_POST['CSV']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+
+if(isset($_POST['Search']) OR isset($_POST['CSV']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
unset($_POST['JustSelectedACustomer']);
- if (isset($_POST['Search'])) {
+ if(isset($_POST['Search'])) {
$_POST['PageOffset'] = 1;
}
- if (($_POST['Keywords'] == '') AND ($_POST['CustCode'] == '') AND ($_POST['CustPhone'] == '') AND ($_POST['CustType'] == 'ALL') AND ($_POST['Area'] == 'ALL') AND ($_POST['CustAdd'] == '')) {
- //no criteria set then default to all customers
+ if(($_POST['Keywords'] == '') AND ($_POST['CustCode'] == '') AND ($_POST['CustPhone'] == '') AND ($_POST['CustType'] == 'ALL') AND ($_POST['Area'] == 'ALL') AND ($_POST['CustAdd'] == '')) {
+ // no criteria set then default to all customers
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
@@ -215,43 +115,48 @@
AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";//If there is no custbranch set, the phoneno in custbranch will be null, so we add IS NULL condition otherwise those debtors without custbranches setting will be no searchable and it will make a inconsistence with customer receipt interface.
+ OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";// If there is no custbranch set, the phoneno in custbranch will be null, so we add IS NULL condition otherwise those debtors without custbranches setting will be no searchable and it will make a inconsistence with customer receipt interface.
- if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType'] != 'ALL') {
+ if(mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType'] != 'ALL') {
$SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
}
- if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area'] != 'ALL') {
+
+ if(mb_strlen($_POST['Area']) > 0 AND $_POST['Area'] != 'ALL') {
$SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
}
- } //one of keywords OR custcode OR custphone was more than a zero length string
- if ($_SESSION['SalesmanLogin'] != '') {
+
+ }// one of keywords OR custcode OR custphone was more than a zero length string
+
+ if($_SESSION['SalesmanLogin'] != '') {
$SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
}
+
$SQL .= " ORDER BY debtorsmaster.name";
$ErrMsg = _('The searched customer records requested cannot be retrieved because');
$result = DB_query($SQL, $ErrMsg);
- if (DB_num_rows($result) == 1) {
+ if(DB_num_rows($result) == 1) {
$myrow = DB_fetch_array($result);
$_SESSION['CustomerID'] = $myrow['debtorno'];
$_SESSION['BranchCode'] = $myrow['branchcode'];
unset($result);
unset($_POST['Search']);
- } elseif (DB_num_rows($result) == 0) {
+ } elseif(DB_num_rows($result) == 0) {
prnMsg(_('No customer records contain the selected text') . ' - ' . _('please alter your search criteria AND try again'), 'info');
echo '<br />';
}
-} //end of if search
+}// end of if search
-if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
- if (!isset($_SESSION['BranchCode'])) {
+if($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
+ if(!isset($_SESSION['BranchCode'])) {
$SQL = "SELECT debtorsmaster.name,
- custbranch.phoneno
+ custbranch.phoneno,
+ custbranch.brname
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'";
- } //!isset($_SESSION['BranchCode'])
+ }// !isset($_SESSION['BranchCode'])
else {
$SQL = "SELECT debtorsmaster.name,
custbranch.phoneno,
@@ -263,75 +168,98 @@
}
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $ErrMsg);
- if ($myrow = DB_fetch_array($result)) {
+ if($myrow = DB_fetch_array($result)) {
$CustomerName = htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false);
$PhoneNo = $myrow['phoneno'];
$BranchName = $myrow['brname'];
- } //$myrow = DB_fetch_array($result)
+ }// $myrow = DB_fetch_array($result)
unset($result);
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '<br>';
-
- echo '<div class="page_help_text">' . _('Select a menu option to operate using this customer') . '.</div><br />';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/customer.png" title="',// Icon image.
+ _('Customer'), '" /> ',// Icon title.
+ _('Customer'), ' : ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, _(' has been selected'), '</p>';// Page title.
- echo '<table cellpadding="4" width="90%" class="selection">
+ echo '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>
+ <br />
+ <table cellpadding="4" width="90%" class="selection">
+ <thead>
<tr>
- <th style="width:33%">' . _('Customer Inquiries') . '</th>
- <th style="width:33%">' . _('Customer Transactions') . '</th>
- <th style="width:33%">' . _('Customer Maintenance') . '</th>
- </tr>';
- echo '<tr><td valign="top" class="select">';
- /* Customer Inquiry Options */
- echo '<a href="' . $RootPath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Transaction Inquiries') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustomerAccount.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Account statement on screen') . '</a><br />';
- echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
- echo '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
- echo '<a href="' . $RootPath . '/EmailCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Email Customer Statement') . '</a><br />';
- echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustomerPurchases.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Show purchases from this customer') . '</a><br />';
+ <th style="width:33%">', _('Customer Inquiries'), '</th>
+ <th style="width:33%">', _('Customer Transactions'), '</th>
+ <th style="width:33%">', _('Customer Maintenance'), '</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td valign="top" class="select">';
+ // Customer inquiries options:
+ echo '<a href="', $RootPath, '/CustomerInquiry.php?CustomerID=', urlencode($_SESSION['CustomerID']), '">' . _('Customer Transaction Inquiries') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustomerAccount.php?CustomerID=', urlencode($_SESSION['CustomerID']), '">' . _('Customer Account statement on screen') . '</a><br />';
+ echo '<a href="', $RootPath, '/Customers.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '&Modify=No">' . _('View Customer Details') . '</a><br />';
+ echo '<a href="', $RootPath, '/PrintCustStatements.php?FromCust=', urlencode($_SESSION['CustomerID']), '&ToCust=', urlencode($_SESSION['CustomerID']), '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
+ echo '<a href="', $RootPath, '/EmailCustStatements.php?FromCust=', urlencode($_SESSION['CustomerID']), '&ToCust=', urlencode($_SESSION['CustomerID']), '&PrintPDF=Yes">' . _('Email Customer Statement') . '</a><br />';
+ echo '<a href="', $RootPath, '/SelectCompletedOrder.php?SelectedCustomer=', urlencode($_SESSION['CustomerID']), '">' . _('Order Inquiries') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustomerPurchases.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Show purchases from this customer') . '</a><br />';
wikiLink('Customer', $_SESSION['CustomerID']);
echo '</td><td valign="top" class="select">';
- echo '<a href="' . $RootPath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts OR Credit Notes') . '</a><br />';
- if (isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])) {
- echo '<a href="' . $RootPath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ // Customer transactions options:
+ echo '<a href="', $RootPath, '/SelectSalesOrder.php?SelectedCustomer=', urlencode($_SESSION['CustomerID']), '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustomerAllocations.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Allocate Receipts OR Credit Notes') . '</a><br />';
+ if(isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])) {
+ echo '<a href="', $RootPath, '/CounterSales.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
}
echo '</td><td valign="top" class="select">';
- echo '<a href="' . $RootPath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
- echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustomerBranches.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Add/Modify/Delete Customer Branches') . '</a><br />';
- echo '<a href="' . $RootPath . '/SelectProduct.php">' . _('Special Customer Prices') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustEDISetup.php">' . _('Customer EDI Configuration') . '</a><br />';
- echo '<a href="' . $RootPath . '/CustLoginSetup.php">' . _('Customer Login Configuration') . '</a>';
- echo '</td>';
- echo '</tr></table><br />';
-} //$_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])
-else {
- echo '<table width="90%">
+ // Customer maintenance options:
+ echo '<a href="', $RootPath, '/Customers.php">' . _('Add a New Customer') . '</a><br />';
+ echo '<a href="', $RootPath, '/Customers.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Modify Customer Details') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustomerBranches.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Add/Modify/Delete Customer Branches') . '</a><br />';
+ echo '<a href="', $RootPath, '/SelectProduct.php">' . _('Special Customer Prices') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustEDISetup.php">' . _('Customer EDI Configuration') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustLoginSetup.php">' . _('Customer Login Configuration'), '</a><br />';
+ echo '<a href="', $RootPath, '/AddCustomerContacts.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">', _('Add a customer contact'), '</a><br />';
+ echo '<a href="', $RootPath, '/AddCustomerNotes.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">', _('Add a note on this customer'), '</a>';
+ echo '</td>
+ </tr>
+ <tbody>
+ </table>';
+} else {
+ echo '<table cellpadding="4" width="90%" class="selection">
+ <thead>
<tr>
- <th style="width:33%">' . _('Customer Inquiries') . '</th>
- <th style="width:33%">' . _('Customer Transactions') . '</th>
- <th style="width:33%">' . _('Customer Maintenance') . '</th>
- </tr>';
+ <th style="width:33%">', _('Customer Inquiries'), '</th>
+ <th style="width:33%">', _('Customer Transactions'), '</th>
+ <th style="width:33%">', _('Customer Maintenance'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
echo '<tr>
<td class="select"></td>
<td class="select"></td>
<td class="select">';
- if (!isset($_SESSION['SalesmanLogin']) OR $_SESSION['SalesmanLogin'] == '') {
- echo '<a href="' . $RootPath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
+ if(!isset($_SESSION['SalesmanLogin']) OR $_SESSION['SalesmanLogin'] == '') {
+ echo '<a href="', $RootPath, '/Customers.php">' . _('Add a New Customer') . '</a><br />';
}
- echo '</td></tr></table>';
+ echo '</td>
+ </tr>
+ <tbody>
+ </table>';
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (mb_strlen($msg) > 1) {
+
+// Search for customers:
+echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
+ '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
+if(mb_strlen($msg) > 1) {
prnMsg($msg, 'info');
}
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Customers') . '</p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/magnifier.png" title="',// Icon image.
+ _('Search'), '" /> ',// Icon title.
+ _('Search for Customers'), '</p>';// Page title.
+
echo '<table cellpadding="3" class="selection">';
echo '<tr><td colspan="2">' . _('Enter a partial Name') . ':</td><td>';
-if (isset($_POST['Keywords'])) {
+if(isset($_POST['Keywords'])) {
echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
} else {
echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
@@ -339,10 +267,10 @@
echo '</td>
<td><b>' . _('OR') . '</b></td><td>' . _('Enter a partial Code') . ':</td>
<td>';
-if (isset($_POST['CustCode'])) {
- echo '<input type="text" name="CustCode" pattern="[\w-]*" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
+if(isset($_POST['CustCode'])) {
+ echo '<input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" value="', $_POST['CustCode'], '" />';
} else {
- echo '<input type="text" name="CustCode" pattern="[\w-]*" size="15" maxlength="18" />';
+ echo '<input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" />';
}
echo '</td>
</tr>
@@ -350,30 +278,30 @@
<td><b>' . _('OR') . '</b></td>
<td>' . _('Enter a partial Phone Number') . ':</td>
<td>';
-if (isset($_POST['CustPhone'])) {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
+if(isset($_POST['CustPhone'])) {
+ echo '<input maxlength="18" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" type="tel" value="', $_POST['CustPhone'], '" />';
} else {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" maxlength="18" />';
+ echo '<input maxlength="18" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" type="tel" />';
}
echo '</td>';
echo '<td><b>' . _('OR') . '</b></td>
<td>' . _('Enter part of the Address') . ':</td>
<td>';
-if (isset($_POST['CustAdd'])) {
- echo '<input type="text" name="CustAdd" value="' . $_POST['CustAdd'] . '" size="20" maxlength="25" />';
+if(isset($_POST['CustAdd'])) {
+ echo '<input maxlength="25" name="CustAdd" size="20" type="text" value="', $_POST['CustAdd'], '" />';
} else {
- echo '<input type="text" name="CustAdd" size="20" maxlength="25" />';
+ echo '<input maxlength="25" name="CustAdd" size="20" type="text" />';
}
echo '</td></tr>';
echo '<tr>
<td><b>' . _('OR') . '</b></td>
<td>' . _('Choose a Type') . ':</td>
<td>';
-if (isset($_POST['CustType'])) {
+if(isset($_POST['CustType'])) {
// Show Customer Type drop down list
$result2 = DB_query("SELECT typeid, typename FROM debtortype ORDER BY typename");
// Error if no customer types setup
- if (DB_num_rows($result2) == 0) {
+ if(DB_num_rows($result2) == 0) {
$DataError = 1;
echo '<a href="CustomerTypes.php" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
@@ -382,21 +310,21 @@
echo '<select name="CustType">
<option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
- if ($_POST['CustType'] == $myrow['typename']) {
+ if($_POST['CustType'] == $myrow['typename']) {
echo '<option selected="selected" value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- } //$_POST['CustType'] == $myrow['typename']
+ }// $_POST['CustType'] == $myrow['typename']
else {
echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
}
- } //end while loop
+ }// end while loop
DB_data_seek($result2, 0);
echo '</select></td>';
}
-} else { //CustType is not set
+} else {// CustType is not set
// No option selected="selected" yet, so show Customer Type drop down list
$result2 = DB_query("SELECT typeid, typename FROM debtortype ORDER BY typename");
// Error if no customer types setup
- if (DB_num_rows($result2) == 0) {
+ if(DB_num_rows($result2) == 0) {
$DataError = 1;
echo '<a href="CustomerTypes.php" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
@@ -406,7 +334,7 @@
<option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- } //end while loop
+ }// end while loop
DB_data_seek($result2, 0);
echo '</select></td>';
}
@@ -417,7 +345,7 @@
<td>' . _('Choose an Area') . ':</td><td>';
$result2 = DB_query("SELECT areacode, areadescription FROM areas");
// Error if no sales areas setup
-if (DB_num_rows($result2) == 0) {
+if(DB_num_rows($result2) == 0) {
$DataError = 1;
echo '<a href="Areas.php" target="_parent">' . _('Setup Areas') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Sales Areas defined'), 'error') . '</td></tr>';
@@ -426,47 +354,47 @@
echo '<select name="Area">';
echo '<option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
- if (isset($_POST['Area']) AND $_POST['Area'] == $myrow['areacode']) {
+ if(isset($_POST['Area']) AND $_POST['Area'] == $myrow['areacode']) {
echo '<option selected="selected" value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
} else {
echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
- } //end while loop
+ }// end while loop
DB_data_seek($result2, 0);
echo '</select></td></tr>';
}
echo '</table><br />';
echo '<div class="centre">
- <input type="submit" name="Search" value="' . _('Search Now') . '" />
- <input type="submit" name="CSV" value="' . _('CSV Format') . '" />
+ <input name="Search" type="submit" value="', _('Search Now'), '" />
+ <input name="CSV" type="submit" value="', _('CSV Format'), '" />
</div>';
-if (isset($_SESSION['SalesmanLogin']) AND $_SESSION['SalesmanLogin'] != '') {
+if(isset($_SESSION['SalesmanLogin']) AND $_SESSION['SalesmanLogin'] != '') {
prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
}
-if (isset($result)) {
+if(isset($result)) {
unset($_SESSION['CustomerID']);
$ListCount = DB_num_rows($result);
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
- if (!isset($_POST['CSV'])) {
- if (isset($_POST['Next'])) {
- if ($_POST['PageOffset'] < $ListPageMax) {
+ if(!isset($_POST['CSV'])) {
+ if(isset($_POST['Next'])) {
+ if($_POST['PageOffset'] < $ListPageMax) {
$_POST['PageOffset'] = $_POST['PageOffset'] + 1;
}
}
- if (isset($_POST['Previous'])) {
- if ($_POST['PageOffset'] > 1) {
+ if(isset($_POST['Previous'])) {
+ if($_POST['PageOffset'] > 1) {
$_POST['PageOffset'] = $_POST['PageOffset'] - 1;
}
}
echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
- if ($ListPageMax > 1) {
+ if($ListPageMax > 1) {
echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset1">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
- if ($ListPage == $_POST['PageOffset']) {
+ if($ListPage == $_POST['PageOffset']) {
echo '<option value="' . $ListPage . '" selected="selected">' . $ListPage . '</option>';
} else {
echo '<option value="' . $ListPage . '">' . $ListPage . '</option>';
@@ -479,121 +407,248 @@
<input type="submit" name="Next" value="' . _('Next') . '" />';
echo '</div>';
}
- echo '<br />
- <table cellpadding="2" class="selection">';
-
- echo '<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Customer Name') . '</th>
- <th class="ascending">' . _('Branch') . '</th>
- <th class="ascending">' . _('Contact') . '</th>
- <th class="ascending">' . _('Type') . '</th>
- <th class="ascending">' . _('Phone') . '</th>
- <th class="ascending">' . _('Fax') . '</th>
- <th class="ascending">' . _('Email') . '</th>
- </tr>';
- $k = 0; //row counter to determine background colour
+ echo '<table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Customer Name') . '</th>
+ <th class="ascending">' . _('Branch') . '</th>
+ <th class="ascending">' . _('Contact') . '</th>
+ <th class="ascending">' . _('Type') . '</th>
+ <th class="ascending">' . _('Phone') . '</th>
+ <th class="ascending">' . _('Fax') . '</th>
+ <th class="ascending">' . _('Email') . '</th>
+ </tr>
+ </thead>';
+ $k = 0;// row counter to determine background colour
$RowIndex = 0;
- } //end if NOT producing a CSV file
- if (DB_num_rows($result) <> 0) {
- if (isset($_POST['CSV'])) { //producing a CSV file of customers
- $FileName = $_SESSION['reports_dir'] . '/Customer_Listing_' . Date('Y-m-d') . '.csv';
+ }// end if NOT producing a CSV file
+ if(DB_num_rows($result) <> 0) {
+ if(isset($_POST['CSV'])) {// producing a CSV file of customers
+ $FileName = $_SESSION['reports_dir'] . '/Customer_Listing_' . date('Y-m-d') . '.csv';
echo '<br /><p class="page_title_text"><a href="' . $FileName . '">' . _('Click to view the csv Search Result') . '</p>';
$fp = fopen($FileName, 'w');
while ($myrow2 = DB_fetch_array($result)) {
fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2[...
[truncated message content] |
|
From: <ex...@us...> - 2016-05-15 09:46:37
|
Revision: 7522
http://sourceforge.net/p/web-erp/reponame/7522
Author: exsonqu
Date: 2016-05-15 09:46:15 +0000 (Sun, 15 May 2016)
Log Message:
-----------
15/05/16 Exson: Add sequence digitals to make BOM sequences can be adjusted flexible and avoid any uncertainty of the number stored in SQL. Thanks Tim's suggestion.
Modified Paths:
--------------
trunk/BOMs.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-05-15 05:17:01 UTC (rev 7521)
+++ trunk/BOMs.php 2016-05-15 09:46:15 UTC (rev 7522)
@@ -16,7 +16,9 @@
// retrive all children of parent
$c_result = DB_query("SELECT parent,
- component
+ component,
+ sequence/pow(10,digitals)
+ AS sequence
FROM bom
WHERE parent='" . $Parent. "'
ORDER BY sequence ASC");
@@ -72,6 +74,7 @@
global $ParentMBflag;
$sql = "SELECT bom.sequence,
+ bom.digitals,
bom.component,
stockcategory.categorydescription,
stockmaster.description as itemdescription,
@@ -193,7 +196,7 @@
</tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td><td>%s</td>
</tr>',
$Level1,
- $myrow['sequence'],
+ locale_number_format($myrow['sequence']/pow(10,$myrow['digitals']),'Variable'),
$myrow['categorydescription'],
$myrow['component'],
$myrow['itemdescription'],
@@ -335,9 +338,11 @@
}
if (isset($SelectedParent) AND isset($SelectedComponent) AND $InputError != 1) {
-
-
- $sql = "UPDATE bom SET sequence='" . $_POST['Sequence'] . "',
+ $Sequence = filter_number_format($_POST['Sequence']);
+ $Digitals = GetDigitals($_POST['Sequence']);
+ $Sequence = $Sequence * pow(10,$Digitals);
+ $sql = "UPDATE bom SET sequence='" . $Sequence . "',
+ digitals = '" . $Digitals . "',
workcentreadded='" . $_POST['WorkCentreAdded'] . "',
loccode='" . $_POST['LocCode'] . "',
effectiveafter='" . $EffectiveAfterSQL . "',
@@ -377,8 +382,12 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg);
if (DB_num_rows($result)==0) {
+ $Sequence = filter_number_format($_POST['Sequence']);
+ $Digitals = GetDigitals($_POST['Sequence']);
+ $Sequence = $Sequence * pow(10,$Digitals);
$sql = "INSERT INTO bom (sequence,
+ digitals,
parent,
component,
workcentreadded,
@@ -388,7 +397,8 @@
effectiveto,
autoissue,
remark)
- VALUES ('" . $_POST['Sequence'] . "',
+ VALUES ('" . $Sequence . "',
+ '" . $Digitals . "',
'".$SelectedParent."',
'" . $_POST['Component'] . "',
'" . $_POST['WorkCentreAdded'] . "',
@@ -681,6 +691,7 @@
//editing a selected component from the link to the line item
$sql = "SELECT sequence,
+ digitals,
bom.loccode,
effectiveafter,
effectiveto,
@@ -696,7 +707,7 @@
$result = DB_query($sql);
$myrow = DB_fetch_array($result);
- $_POST['Sequence'] = $myrow['sequence'];
+ $_POST['Sequence'] = locale_number_format($myrow['sequence']/pow(10,$myrow['digitals']),'Variable');
$_POST['LocCode'] = $myrow['loccode'];
$_POST['EffectiveAfter'] = ConvertSQLDate($myrow['effectiveafter']);
$_POST['EffectiveTo'] = ConvertSQLDate($myrow['effectiveto']);
@@ -774,7 +785,7 @@
}
echo '<tr>
<td>' . _('Sequence in BOM') . ':</td>
- <td><input type="text" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
+ <td><input type="text" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /> ' . _('Number with decimal places is acceptable') . '</td>
</tr>';
echo '<tr>
<td>' . _('Location') . ': </td>
@@ -1065,4 +1076,9 @@
}
include('includes/footer.inc');
+function GetDigitals($Sequence) {
+ $SQLNumber = filter_number_format($Sequence);
+ return strlen(substr(strrchr($SQLNumber, "."),1));
+}
+
?>
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-15 05:17:01 UTC (rev 7521)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-15 09:46:15 UTC (rev 7522)
@@ -55,7 +55,26 @@
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
INSERT INTO securitytokens VALUES(18,'Cost authority');
-ALTER table bom change sequence sequence double not null default 0;
+ALTER table BOM ADD digitals int(11) NOT NULL DEFAULT 0;
+INSERT INTO scripts VALUES('StockIntransitStatus.php',1,'Inventory transaction status');
+INSERT INTO scripts VALUES ('StockTransferControlledDispatched.php',11,'Inventory controlled input');
+ALTER table loctransfers ADD closed tinyint(1) not null default '0';
+CREATE table trfserialno (trfno int(11) NOT NULL AUTO_INCREMENT,
+ trfref int(11) NOT NUll DEFAULT '0',
+ stkcode varchar(20) NOT NULL DEFAULT '0',
+ serialno varchar(20) NOT NULL DEFAULT '0',
+ trfqty double NOT NULL DEFAULT '0',
+ loccode varchar(5) NOT NULL DEFAULT '',
+ recqty double NOT NULL DEFAULT '0',
+ PRIMARY KEY (`trfno`),
+ KEY (`trfref`),
+ KEY (`stkcode`,`serialno`),
+ KEY (`serialno`),
+ KEY (`stkcode`),
+ KEY (`stkcode`,`serialno`,`loccode`),
+ CONSTRAINT FOREIGN KEY (`trfref`) REFERENCES `loctransfers`(`reference`),
+ CONSTRAINT FOREIGN KEY (`stkcode`,`serialno`,`loccode`) REFERENCES `stockserialitems`(`stockid`,`serialno`,`loccode`)) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2016-05-15 15:23:15
|
Revision: 7523
http://sourceforge.net/p/web-erp/reponame/7523
Author: rchacon
Date: 2016-05-15 15:23:11 +0000 (Sun, 15 May 2016)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
trunk/Payments.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po.old
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages-P-Y.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/Payments.php 2016-05-15 15:23:11 UTC (rev 7523)
@@ -1201,7 +1201,7 @@
}
echo '<tr>
<td>', _('Transaction Text'), ':</td>
- <td><input class="text" maxlength="200" name="supptrans_transtext" size="52" type="text" value="', stripslashes($_POST['supptrans_transtext']), '" /> ', _('Transaction text in supplier transactions. If blank, it uses the narrative.'), '</td>
+ <td><input class="text" maxlength="200" name="supptrans_transtext" size="52" type="text" value="', stripslashes($_POST['supptrans_transtext']), '" /> ', _('Transaction text in supplier transactions. If blank, it uses the bank narrative.'), '</td>
</tr>';
echo '<tr>
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -21708,7 +21708,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -26791,11 +26791,11 @@
msgstr ""
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr ""
#: SelectCustomer.php:647
@@ -26803,7 +26803,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -21740,7 +21740,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -26837,11 +26837,11 @@
msgstr ""
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr ""
#: SelectCustomer.php:647
@@ -26849,7 +26849,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22269,7 +22269,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -27530,11 +27530,11 @@
msgstr "Poslední Placené Datum:"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Poslední zaplacené částky (s DPH):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Zákazník od:"
#: SelectCustomer.php:647
@@ -27542,7 +27542,7 @@
msgstr "Strávit žádný z tohoto zákazníka."
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Celkové výdaje od tohoto zákazníka (s DPH):"
#: SelectCustomer.php:659
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22987,7 +22987,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -28413,11 +28413,11 @@
msgstr "Datum letzte Zahlg.:"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Letzter Zahlbetrag (incl. Steuer):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Kunde seit:"
#: SelectCustomer.php:647
@@ -28425,7 +28425,7 @@
msgstr "Keine Eingänge von diesem Kunden:"
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Bruttoeingänge von diesem Kunden:"
#: SelectCustomer.php:659
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22962,7 +22962,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -28387,11 +28387,11 @@
msgstr "Τελευταία Αμειβόμενος Ημερομηνία:"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Τελευταία καταβαλλόμενο ποσό (inc ΦΠΑ):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Πελάτης από:"
#: SelectCustomer.php:647
@@ -28399,7 +28399,7 @@
msgstr "Δεν Περάστε από αυτό το Πελάτη."
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Συνολική δαπάνη από τον πελάτη (inc ΦΠΑ):"
#: SelectCustomer.php:659
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-05-15 15:23:11 UTC (rev 7523)
@@ -20594,7 +20594,7 @@
msgstr ""
#: Payments.php:1204
-msgid "Transaction text in supplier transactions. If blank, it uses the narrative."
+msgid "Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -25410,11 +25410,11 @@
msgstr ""
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr ""
#: SelectCustomer.php:647
@@ -25422,7 +25422,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -21738,7 +21738,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -26837,11 +26837,11 @@
msgstr ""
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr ""
#: SelectCustomer.php:647
@@ -26849,7 +26849,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
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-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22943,7 +22943,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
"Texto de la transacción en las transacciones con proveedores. Si está en "
"blanco, se usa la descripción de bancos."
@@ -28398,11 +28398,11 @@
msgstr "Fecha del Último Pago:"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Importe del último pago (imp. inc.):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Cliente desde:"
#: SelectCustomer.php:647
@@ -28410,7 +28410,7 @@
msgstr "No hay gastos de este cliente."
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Gasto total de este cliente (impuestos incluidos):"
#: SelectCustomer.php:659
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -21749,7 +21749,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -26835,11 +26835,11 @@
msgstr ""
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr ""
#: SelectCustomer.php:647
@@ -26847,7 +26847,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
Modified: trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22277,7 +22277,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -27530,11 +27530,11 @@
msgstr "تاریخ و زمان آخرین تاریخ پرداخت :"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "تاریخ و زمان آخرین مبلغ پرداخت شده (وارز مالیات) :"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "مشتری از :"
#: SelectCustomer.php:647
@@ -27542,7 +27542,7 @@
msgstr "بدون صرف از این مشتری."
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "تعداد صرف از این مشتری (وارز مالیات) :"
#: SelectCustomer.php:659
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -22748,7 +22748,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -28147,11 +28147,11 @@
msgstr "Dernière Payée:"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Dernière Montant payé (TTC):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Client depuis:"
#: SelectCustomer.php:647
@@ -28159,7 +28159,7 @@
msgstr "Non Passez à partir de ce client."
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Montant total des dépenses de cette clientèle (TTC):"
#: SelectCustomer.php:659
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -23142,7 +23142,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -28652,11 +28652,11 @@
# JDN
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr "Dernier montant payé (T.T.C.):"
#: SelectCustomer.php:641
-msgid "Customer since:"
+msgid "Customer since"
msgstr "Client depuis:"
#: SelectCustomer.php:647
@@ -28665,7 +28665,7 @@
# JDN
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr "Montant total des dépenses de ce client (T.T.C.):"
#: SelectCustomer.php:659
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-15 15:23:11 UTC (rev 7523)
@@ -20063,7 +20063,7 @@
#: Payments.php:1204
msgid ""
-"Transaction text in supplier transactions. If blank, it uses the narrative."
+"Transaction text in supplier transactions. If blank, it uses the bank narrative."
msgstr ""
#: Payments.php:1209
@@ -28874,12 +28874,12 @@
msgstr "תאריך השינוי האחרון"
#: SelectCustomer.php:637
-msgid "Last Paid Amount (inc tax):"
+msgid "Last Paid Amount (inc tax)"
msgstr ""
#: SelectCustomer.php:641
#, fuzzy
-msgid "Customer since:"
+msgid "Customer since"
msgstr "מס הייחוס של הלקוח"
#: SelectCustomer.php:647
@@ -28887,7 +28887,7 @@
msgstr ""
#: SelectCustomer.php:653
-msgid "Total Spend from this Customer (inc tax):"
+msgid "Total Spend from this Customer (inc tax)"
msgstr ""
#: SelectCustomer.php:659
Modified: trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo 2016-05-15 09:46:15 UTC (rev 7522)
+++ trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo 2016-05-15 15:23:11 UTC (rev 7523)
@@ -2472,7 +2472,7 @@
@@ Diff output truncated at 100000 characters. @@
|
|
From: <rc...@us...> - 2016-05-15 16:23:41
|
Revision: 7525
http://sourceforge.net/p/web-erp/reponame/7525
Author: rchacon
Date: 2016-05-15 16:23:36 +0000 (Sun, 15 May 2016)
Log Message:
-----------
Hide no printing elements.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2016-05-15 15:30:46 UTC (rev 7524)
+++ trunk/AccountGroups.php 2016-05-15 16:23:36 UTC (rev 7525)
@@ -288,7 +288,7 @@
<th class="ascending">' . _('Sequence In TB') . '</th>
<th class="ascending">' . _('Profit and Loss') . '</th>
<th class="ascending">' . _('Parent Group') . '</th>
- <th colspan="2"> </th>
+ <th class="noprint" colspan="2"> </th>
</tr>';
$k=0; //row colour counter
@@ -319,8 +319,8 @@
<td class="number">' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') . '</a></td></tr>';
+ echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') . '</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -394,12 +394,17 @@
}
echo '<br />
- <table class="selection">
+ <table class="noprint selection">
<thead>
<tr>
<th colspan="2">', _('New Account Group Details'), '</th>
</tr>
</thead>
+ <tfoot>
+ <tr>
+ <td class="centre" colspan="2"><input name="submit" tabindex="6" type="submit" value="', _('Enter Information'), '" /></td>
+ </tr>
+ </tfoot>
<tbody>
<tr>
<td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
@@ -469,9 +474,6 @@
<td>', _('Sequence In TB'), ':</td>
<td><input class="number" maxlength="4" name="SequenceInTB" required="required" tabindex="5" type="text" value="', $_POST['SequenceInTB'], '" title="', _('Enter the sequence number that this account group and its child general ledger accounts should display in the trial balance'), '" /></td>
</tr>
- <tr>
- <td class="centre" colspan="2"><input name="submit" tabindex="6" type="submit" value="', _('Enter Information'), '" /></td>
- </tr>
</tbody>
</table>
<br />
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-05-15 15:30:46 UTC (rev 7524)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-05-15 16:23:36 UTC (rev 7525)
@@ -28414,11 +28414,11 @@
#: SelectCustomer.php:637
msgid "Last Paid Amount (inc tax)"
-msgstr "Letzter Zahlbetrag (incl. Steuer):"
+msgstr "Letzter Zahlbetrag (incl. Steuer)"
#: SelectCustomer.php:641
msgid "Customer since"
-msgstr "Kunde seit:"
+msgstr "Kunde seit"
#: SelectCustomer.php:647
msgid "No Spend from this Customer."
@@ -28426,7 +28426,7 @@
#: SelectCustomer.php:653
msgid "Total Spend from this Customer (inc tax)"
-msgstr "Bruttoeingänge von diesem Kunden:"
+msgstr "Bruttoeingänge von diesem Kunden"
#: SelectCustomer.php:659
msgid "Customer Type:"
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-05-15 15:30:46 UTC (rev 7524)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-15 16:23:36 UTC (rev 7525)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-26 09:51-0600\n"
-"PO-Revision-Date: 2016-05-09 08:56-0600\n"
+"POT-Creation-Date: 2016-05-15 10:13-0600\n"
+"PO-Revision-Date: 2016-05-15 10:18-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -176,23 +176,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
-#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
-#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:91 WorkCentres.php:97
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:185
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147
+#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
+#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
+#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
+#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
msgid "There are"
msgstr "Existen"
@@ -200,7 +200,7 @@
msgid "general ledger accounts that refer to this account group"
msgstr "cuentas contables que hacen referencia a este subgrupo"
-#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:404
+#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:413
msgid "Parent Group"
msgstr "Grupo ancestro"
@@ -244,53 +244,53 @@
msgid "Could not get account groups because"
msgstr "No se pudo obtener los grupos contables porque"
-#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
+#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:244 BOMs.php:908
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:280 BOMs.php:981
#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
-#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PriceMatrix.php:16
-#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:331 SelectGLAccount.php:77
-#: SelectOrderItems.php:559 SelectOrderItems.php:1469
-#: SelectOrderItems.php:1569 SelectProduct.php:522 SelectQASamples.php:45
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:257 SelectGLAccount.php:77 SelectOrderItems.php:559
+#: SelectOrderItems.php:1469 SelectOrderItems.php:1569 SelectProduct.php:522
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockSerialItemResearch.php:30
#: SupplierPriceList.php:14 SupplierPriceList.php:224
#: SupplierPriceList.php:394 SupplierPriceList.php:398
-#: SupplierPriceList.php:449 SupplierPriceList.php:499
+#: SupplierPriceList.php:449 SupplierPriceList.php:499 Suppliers.php:304
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
-#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
-#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
+#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "Buscar"
@@ -302,18 +302,18 @@
msgid "Section"
msgstr "Sección"
-#: AccountGroups.php:288 AccountGroups.php:458
+#: AccountGroups.php:288 AccountGroups.php:469
msgid "Sequence In TB"
msgstr "Secuencia en balance de comprobación"
-#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
+#: AccountGroups.php:289 AccountGroups.php:452 GLProfit_Loss.php:6
#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
msgid "Profit and Loss"
msgstr "Ganancias y pérdidas"
-#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
-#: AccountGroups.php:447 BOMs.php:129 BOMs.php:813 BOMs.php:815
+#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:456
+#: AccountGroups.php:458 BOMs.php:135 BOMs.php:886 BOMs.php:888
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
@@ -325,44 +325,44 @@
#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
-#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
-#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
-#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
-#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
-#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
-#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
-#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
-#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
-#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
-#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
-#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:230
-#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
-#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
-#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
-#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
-#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
-#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
-#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
+#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
+#: MRP.php:566 MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602
+#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
+#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
+#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
+#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
+#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
+#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
+#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
+#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
+#: QATests.php:424 QATests.php:429 QATests.php:434
+#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
+#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
+#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
+#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:230 SelectProduct.php:368
+#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
+#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
+#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
+#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
+#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
+#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
+#: StockClone.php:938 StockClone.php:940 StockClone.php:963 StockClone.php:965
+#: Stocks.php:1266 Stocks.php:1268 Stocks.php:1291 Stocks.php:1293
+#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
+#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
+#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
+#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
+#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -377,10 +377,10 @@
msgid "Yes"
msgstr "Sí"
-#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:131 BOMs.php:812 BOMs.php:816 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: AccountGroups.php:313 AccountGroups.php:461 AccountGroups.php:463
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:137 BOMs.php:885
+#: BOMs.php:889 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
@@ -391,15 +391,15 @@
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
-#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
-#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
-#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75
-#: PDFWOPrint.php:603 PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
+#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
+#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
+#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603
+#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -444,35 +444,34 @@
msgid "No"
msgstr "No"
-#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148
+#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:152
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:159 BankAccounts.php:243 COGSGLPostings.php:112
+#: BankAccounts.php:243 BOMs.php:193 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:291
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:256
-#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
-#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:680 SelectCustomer.php:699
-#: SelectCustomer.php:746 SelectCustomer.php:764 SelectCustomer.php:788
-#: SelectCustomer.php:805 SelectGLAccount.php:130 SelectGLAccount.php:145
-#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:126
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
+#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:742 SelectCustomer.php:767 SelectCustomer.php:822
+#: SelectCustomer.php:840 SelectCustomer.php:864 SelectCustomer.php:881
+#: SelectGLAccount.php:130 SelectGLAccount.php:145 SelectQASamples.php:417
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:191
-#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:368 WorkCentres.php:145 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
+#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:368
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
@@ -482,43 +481,43 @@
msgid "Are you sure you wish to delete this account group?"
msgstr "¿Está seguro que desea suprimir este grupo de cuenta?"
-#: AccountGroups.php:323 AccountSections.php:200 AddCustomerContacts.php:149
+#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:153
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:161 BankAccounts.php:244 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:195 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:409 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:993 CustomerTypes.php:206 Customers.php:1166
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
+#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:993 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:431 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
-#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1156
+#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1156 PaymentTerms.php:206
#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
-#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
-#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
-#: SelectCustomer.php:681 SelectCustomer.php:700 SelectCustomer.php:747
-#: SelectCustomer.php:765 SelectCustomer.php:789 SelectCustomer.php:806
+#: SelectCustomer.php:743 SelectCustomer.php:768 SelectCustomer.php:823
+#: SelectCustomer.php:841 SelectCustomer.php:865 SelectCustomer.php:882
#: SelectOrderItems.php:1381 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:127 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:369 WorkCentres.php:146 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 SuppShipt...
[truncated message content] |
|
From: <rc...@us...> - 2016-05-16 00:29:17
|
Revision: 7527
http://sourceforge.net/p/web-erp/reponame/7527
Author: rchacon
Date: 2016-05-16 00:29:12 +0000 (Mon, 16 May 2016)
Log Message:
-----------
Use a default map host if $map_host is empty.
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Change.log
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-05-15 16:35:00 UTC (rev 7526)
+++ trunk/SelectCustomer.php 2016-05-16 00:29:12 UTC (rev 7527)
@@ -149,6 +149,7 @@
if($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
if(!isset($_SESSION['BranchCode'])) {
+ // !isset($_SESSION['BranchCode'])
$SQL = "SELECT debtorsmaster.name,
custbranch.phoneno,
custbranch.brname
@@ -156,8 +157,8 @@
ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'";
- }// !isset($_SESSION['BranchCode'])
- else {
+ } else {
+ // isset($_SESSION['BranchCode'])
$SQL = "SELECT debtorsmaster.name,
custbranch.phoneno,
custbranch.brname
@@ -258,44 +259,29 @@
_('Search for Customers'), '</p>';// Page title.
echo '<table cellpadding="3" class="selection">';
-echo '<tr><td colspan="2">' . _('Enter a partial Name') . ':</td><td>';
-if(isset($_POST['Keywords'])) {
- echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
-} else {
- echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
-}
-echo '</td>
- <td><b>' . _('OR') . '</b></td><td>' . _('Enter a partial Code') . ':</td>
- <td>';
-if(isset($_POST['CustCode'])) {
- echo '<input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" value="', $_POST['CustCode'], '" />';
-} else {
- echo '<input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" />';
-}
-echo '</td>
- </tr>
- <tr>
- <td><b>' . _('OR') . '</b></td>
- <td>' . _('Enter a partial Phone Number') . ':</td>
- <td>';
-if(isset($_POST['CustPhone'])) {
- echo '<input maxlength="18" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" type="tel" value="', $_POST['CustPhone'], '" />';
-} else {
- echo '<input maxlength="18" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" type="tel" />';
-}
-echo '</td>';
-echo '<td><b>' . _('OR') . '</b></td>
- <td>' . _('Enter part of the Address') . ':</td>
- <td>';
-if(isset($_POST['CustAdd'])) {
- echo '<input maxlength="25" name="CustAdd" size="20" type="text" value="', $_POST['CustAdd'], '" />';
-} else {
- echo '<input maxlength="25" name="CustAdd" size="20" type="text" />';
-}
-echo '</td></tr>';
+
echo '<tr>
- <td><b>' . _('OR') . '</b></td>
- <td>' . _('Choose a Type') . ':</td>
+ <td colspan="2">', _('Enter a partial Name'), ':</td>
+ <td><input type="text" maxlength="25" name="Keywords" size="20" ',
+ ( isset($_POST['Keywords']) ? 'value="' . $_POST['Keywords'] . '" ' : '' ), '/></td>';
+
+echo '<td><b>', _('OR'), '</b></td><td>', _('Enter a partial Code'), ':</td>
+ <td><input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" ',
+ (isset($_POST['CustCode']) ? 'value="' . $_POST['CustCode'] . '" ' : '' ), '/></td>
+ </tr>';
+
+echo '<tr>
+ <td><b>', _('OR'), '</b></td><td>', _('Enter a partial Phone Number'), ':</td>
+ <td><input maxlength="18" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" type="tel" ',
+ ( isset($_POST['CustPhone']) ? 'value="' . $_POST['CustPhone'] . '" ' : '' ), '/></td>';
+
+echo '<td><b>', _('OR'), '</b></td><td>', _('Enter part of the Address'), ':</td>
+ <td><input maxlength="25" name="CustAdd" size="20" type="text" ',
+ (isset($_POST['CustAdd']) ? 'value="' . $_POST['CustAdd'] . '" ' : '' ), '/></td>
+ </tr>';
+
+echo '<tr>
+ <td><b>', _('OR'), '</b></td><td>', _('Choose a Type'), ':</td>
<td>';
if(isset($_POST['CustType'])) {
// Show Customer Type drop down list
@@ -341,7 +327,7 @@
}
/* Option to select a sales area */
-echo '<td><b>' . _('OR') . '</b></td>
+echo '<td><b>', _('OR'), '</b></td>
<td>' . _('Choose an Area') . ':</td><td>';
$result2 = DB_query("SELECT areacode, areadescription FROM areas");
// Error if no sales areas setup
@@ -369,6 +355,9 @@
<input name="Search" type="submit" value="', _('Search Now'), '" />
<input name="CSV" type="submit" value="', _('CSV Format'), '" />
</div>';
+// End search for customers.
+
+
if(isset($_SESSION['SalesmanLogin']) AND $_SESSION['SalesmanLogin'] != '') {
prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
}
@@ -508,6 +497,7 @@
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
+ if($map_host == '') {$map_host = 'maps.googleapis.com';}// If $map_host is empty, use a default map host.
$SQL = "SELECT
debtorsmaster.debtorno,
@@ -639,6 +629,7 @@
}
}// end if Geocode integration is turned on
+
// Extended Customer Info only if selected in Configuration
if($_SESSION['Extended_CustomerInfo'] == 1) {
if($_SESSION['CustomerID'] != '') {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-15 16:35:00 UTC (rev 7526)
+++ trunk/doc/Change.log 2016-05-16 00:29:12 UTC (rev 7527)
@@ -1,5 +1,6 @@
webERP Change Log
+15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
15/05/16 RChacon: In AccountGroups.php, hide no printing elements.
15/05/16 Exson: Add sequence digitals to make BOM sequences can be adjusted flexible and avoid any uncertainty of the number stored in SQL. Thanks Tim's suggestion.
14/05/16 RChacon: In SelectCustomer.php, fix use of Google Maps JavaScript API V3, unpaired html tags and other bugs.
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-05-15 16:35:00 UTC (rev 7526)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-05-16 00:29:12 UTC (rev 7527)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-26 09:51-0600\n"
+"POT-Creation-Date: 2016-05-15 17:54-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
-#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
-#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:91 WorkCentres.php:97
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:185
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147
+#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
+#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
+#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
+#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
msgid "There are"
msgstr "يوجد"
@@ -183,7 +183,7 @@
msgid "general ledger accounts that refer to this account group"
msgstr ""
-#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:404
+#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:418
msgid "Parent Group"
msgstr ""
@@ -225,53 +225,53 @@
msgid "Could not get account groups because"
msgstr "لم يتمكن الحصول على مجموات العضو لان"
-#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
+#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:244 BOMs.php:908
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:280 BOMs.php:981
#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
-#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PriceMatrix.php:16
-#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:331 SelectGLAccount.php:77
-#: SelectOrderItems.php:559 SelectOrderItems.php:1469
-#: SelectOrderItems.php:1569 SelectProduct.php:522 SelectQASamples.php:45
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:257 SelectGLAccount.php:77 SelectOrderItems.php:559
+#: SelectOrderItems.php:1469 SelectOrderItems.php:1569 SelectProduct.php:522
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockSerialItemResearch.php:30
#: SupplierPriceList.php:14 SupplierPriceList.php:224
#: SupplierPriceList.php:394 SupplierPriceList.php:398
-#: SupplierPriceList.php:449 SupplierPriceList.php:499
+#: SupplierPriceList.php:449 SupplierPriceList.php:499 Suppliers.php:304
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
-#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
-#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
+#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -283,18 +283,18 @@
msgid "Section"
msgstr "قسم"
-#: AccountGroups.php:288 AccountGroups.php:458
+#: AccountGroups.php:288 AccountGroups.php:474
msgid "Sequence In TB"
msgstr ""
-#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
+#: AccountGroups.php:289 AccountGroups.php:457 GLProfit_Loss.php:6
#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
msgid "Profit and Loss"
msgstr ""
-#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
-#: AccountGroups.php:447 BOMs.php:129 BOMs.php:813 BOMs.php:815
+#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:461
+#: AccountGroups.php:463 BOMs.php:135 BOMs.php:886 BOMs.php:888
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
@@ -306,44 +306,44 @@
#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
-#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
-#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
-#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
-#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
-#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
-#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
-#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
-#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
-#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
-#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
-#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:230
-#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
-#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
-#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
-#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
-#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
-#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
-#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
+#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
+#: MRP.php:566 MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602
+#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
+#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
+#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
+#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
+#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
+#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
+#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
+#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
+#: QATests.php:424 QATests.php:429 QATests.php:434
+#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
+#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
+#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
+#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:230 SelectProduct.php:368
+#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
+#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
+#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
+#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
+#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
+#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
+#: StockClone.php:938 StockClone.php:940 StockClone.php:963 StockClone.php:965
+#: Stocks.php:1266 Stocks.php:1268 Stocks.php:1291 Stocks.php:1293
+#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
+#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
+#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
+#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
+#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -358,10 +358,10 @@
msgid "Yes"
msgstr "موافق"
-#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:131 BOMs.php:812 BOMs.php:816 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:137 BOMs.php:885
+#: BOMs.php:889 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
@@ -372,15 +372,15 @@
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
-#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
-#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
-#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75
-#: PDFWOPrint.php:603 PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
+#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
+#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
+#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603
+#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -425,35 +425,34 @@
msgid "No"
msgstr "ﻻ"
-#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148
+#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:152
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:159 BankAccounts.php:243 COGSGLPostings.php:112
+#: BankAccounts.php:243 BOMs.php:193 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:291
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:256
-#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
-#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:680 SelectCustomer.php:699
-#: SelectCustomer.php:746 SelectCustomer.php:764 SelectCustomer.php:788
-#: SelectCustomer.php:805 SelectGLAccount.php:130 SelectGLAccount.php:145
-#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:126
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
+#: SalesCategories.php:310 SalesGLPo...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X