Menu
▾
▴
web-erp-svn
|
From: <tu...@us...> - 2014-03-02 23:15:42
|
Revision: 6594
http://sourceforge.net/p/web-erp/reponame/6594
Author: turbopt
Date: 2014-03-02 23:15:39 +0000 (Sun, 02 Mar 2014)
Log Message:
-----------
Div swap in footer to simplify CSS for Gel and Silverwolf themes. Some other themes will see a basic position swap of the date and version info where these vertically appeared together at the far left end.
Modified Paths:
--------------
trunk/css/gel/default.css
trunk/css/silverwolf/default.css
trunk/doc/Change.log
trunk/includes/footer.inc
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2014-03-02 08:45:18 UTC (rev 6593)
+++ trunk/css/gel/default.css 2014-03-02 23:15:39 UTC (rev 6594)
@@ -523,23 +523,21 @@
padding:3px;
}
#FooterLogoDiv{
+ background:white;
+ border-radius:8px;
float:left;
- background:white;
- border-radius:8px 8px 8px 8px;
- padding:3px;
- margin-left:47%; /* to the center (approx) */
+ padding:3px;
+ margin-left:44%; /* to the center (approx) */
}
-#FooterLogoDiv img{
- vertical-align:middle;
-}
#FooterVersionDiv{
clear:both; /* below the logo */
- float:left;
- margin-left:47%; /* to the center (approx) */
+ text-align:center;
}
#FooterTimeDiv{
+ display:block;
float:right;
- margin-top:-22px; /* go up to center */
+ line-height:2.8em; /* Center the text vertically.
+ [vertical-align has no effect on text alone] */
}
/*** END ***/
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2014-03-02 08:45:18 UTC (rev 6593)
+++ trunk/css/silverwolf/default.css 2014-03-02 23:15:39 UTC (rev 6594)
@@ -486,21 +486,19 @@
#FooterLogoDiv{
float:left;
background:white;
- border-radius:8px 8px 8px 8px;
+ border-radius:8px;
padding:3px;
- margin-left:47%; /* to the center (approx) */
+ margin-left:44%; /* to the center (approx) */
}
-#FooterLogoDiv img{
- vertical-align:middle;
-}
#FooterVersionDiv{
-clear:both; /* below the logo */
-float:left;
-margin-left:47%; /* to the center (approx) */
+ clear:both; /* below the logo */
+ text-align:center;
}
#FooterTimeDiv{
+ display:block;
float:right;
- margin-top:-22px; /* go up to center */
+ line-height:2.8em; /* Center the text vertically.
+ [vertical-align has no effect on text alone] */
}
/*** END ***/
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-02 08:45:18 UTC (rev 6593)
+++ trunk/doc/Change.log 2014-03-02 23:15:39 UTC (rev 6594)
@@ -1,4 +1,5 @@
webERP Change Log
+2/3/14 Paul T: Div swap in footer to simplify CSS for Gel and Silverwolf themes. Some other themes will see a basic position swap of the date and version info where these vertically appeared together at the far left end.
1/3/14 Paul T: Correct variable spelling error. [reported in forums by serakfalcon]
24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.
22/2/14 Exson: Fixed the wrong error messages displayed while input date data manually in MiscFunctions.js.
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2014-03-02 08:45:18 UTC (rev 6593)
+++ trunk/includes/footer.inc 2014-03-02 23:15:39 UTC (rev 6594)
@@ -12,14 +12,14 @@
echo '<img src="'. $RootPath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" />';
echo '</div>';
-echo '<div id="FooterVersionDiv">';
- echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a target="_blank" href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
-echo '</div>';
-
echo '<div id="FooterTimeDiv">';
echo DisplayDateTime();
echo '</div>';
+echo '<div id="FooterVersionDiv">';
+ echo 'webERP ' . _('version') . ' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a target="_blank" href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
+echo '</div>';
+
echo '</div>'; // FooterWrapDiv
echo '</div>'; // FooterDiv
echo '</div>'; // Canvas
|
|
From: <ice...@us...> - 2014-03-03 01:55:50
|
Revision: 6595
http://sourceforge.net/p/web-erp/reponame/6595
Author: icedlava
Date: 2014-03-03 01:55:46 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
Modified Paths:
--------------
trunk/WhereUsedInquiry.php
trunk/doc/Change.log
Modified: trunk/WhereUsedInquiry.php
===================================================================
--- trunk/WhereUsedInquiry.php 2014-03-02 23:15:39 UTC (rev 6594)
+++ trunk/WhereUsedInquiry.php 2014-03-03 01:55:46 UTC (rev 6595)
@@ -38,9 +38,9 @@
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($StockID)) {
- echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%-]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" value="' . $StockID . '" placeholder="'._('No illegal characters allowed').'" />';
+ echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" value="' . $StockID . '" placeholder="'._('No illegal characters allowed').'" />';
} else {
- echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%-]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" placeholder="'._('No illegal characters allowed').'" />';
+ echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" placeholder="'._('No illegal characters allowed').'" />';
}
echo '<input type="submit" name="ShowWhereUsed" value="' . _('Show Where Used') . '" />
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-02 23:15:39 UTC (rev 6594)
+++ trunk/doc/Change.log 2014-03-03 01:55:46 UTC (rev 6595)
@@ -1,11 +1,12 @@
webERP Change Log
+3/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
2/3/14 Paul T: Div swap in footer to simplify CSS for Gel and Silverwolf themes. Some other themes will see a basic position swap of the date and version info where these vertically appeared together at the far left end.
1/3/14 Paul T: Correct variable spelling error. [reported in forums by serakfalcon]
24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.
22/2/14 Exson: Fixed the wrong error messages displayed while input date data manually in MiscFunctions.js.
19/2/14 icedlava: GLTrialBalance_csv.php -Remove set AllowAnyone variable and prevent TB display - temp solution.
18/2/14 Exson: Remove redundant code in StockLocStatus.php and InventoryPlanning.php.
-17/2/14 Exson: Tidy up variable overwrite to if else structure in WorkOrderReceive.php scripts according Tim's comments.
+17/2/14 Exson: Tidy up variable overwrite to if else structure in WorkOrderReceive.php scripts according Tim's comments.
17/2/14 icedlava: CopyBOM.php - SQL fix for insert to bom and locstock tables - ensure column counts match values even when zero.
16/2/14 icedlava: StockCounts.php - Enter by Category only counts and enters 10 items maximum - fix to allow any number that are input.
15/2/14 Exson: Make perishable control available in WorkOrderReceive.php.
|
|
From: <dai...@us...> - 2014-03-03 04:55:32
|
Revision: 6598
http://sourceforge.net/p/web-erp/reponame/6598
Author: daintree
Date: 2014-03-03 04:55:30 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
use the javascript check for no illegal chars rather than pattern
Modified Paths:
--------------
trunk/AccountSections.php
trunk/WhereUsedInquiry.php
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2014-03-03 02:33:07 UTC (rev 6597)
+++ trunk/AccountSections.php 2014-03-03 04:55:30 UTC (rev 6598)
@@ -188,8 +188,9 @@
$k++;
}
- echo '<td>' . $myrow['sectionid'] . '</td><td>' . $myrow['sectionname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td class="number">' . $myrow['sectionid'] . '</td>
+ <td>' . $myrow['sectionname'] . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>';
if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
echo '<td><b>' . _('Restricted') . '</b></td>';
} else {
Modified: trunk/WhereUsedInquiry.php
===================================================================
--- trunk/WhereUsedInquiry.php 2014-03-03 02:33:07 UTC (rev 6597)
+++ trunk/WhereUsedInquiry.php 2014-03-03 04:55:30 UTC (rev 6598)
@@ -38,9 +38,9 @@
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($StockID)) {
- echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" value="' . $StockID . '" placeholder="'._('No illegal characters allowed').'" />';
+ echo _('Enter an Item Code') . ': <input type="text" required="required" data-type="no-illegal-chars" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" value="' . $StockID . '" placeholder="'._('No illegal characters allowed').'" />';
} else {
- echo _('Enter an Item Code') . ': <input type="text" required="required" pattern="[^ +%]{1,}" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" placeholder="'._('No illegal characters allowed').'" />';
+ echo _('Enter an Item Code') . ': <input type="text" required="required" data-type="no-illegal-chars" title="'._('Illegal characters and blank is not allowed').'" name="StockID" autofocus="autofocus" size="21" maxlength="20" placeholder="'._('No illegal characters allowed').'" />';
}
echo '<input type="submit" name="ShowWhereUsed" value="' . _('Show Where Used') . '" />
|
|
From: <ice...@us...> - 2014-03-05 01:05:51
|
Revision: 6599
http://sourceforge.net/p/web-erp/reponame/6599
Author: icedlava
Date: 2014-03-05 01:05:48 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
Customers.php - Remove input fields (Country and Language) and display this data instead on customer view page
Modified Paths:
--------------
trunk/Customers.php
trunk/doc/Change.log
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2014-03-03 04:55:30 UTC (rev 6598)
+++ trunk/Customers.php 2014-03-05 01:05:48 UTC (rev 6599)
@@ -328,7 +328,7 @@
$result = DB_query($SQL,$db);
$myrow = DB_fetch_row($result);
-
+
if ($myrow[0]>0) {
prnMsg(_('Cannot delete this customer because contracts have been created that refer to it') . '. ' . _('Purge old contracts first'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' '._('contracts referring to this customer');
@@ -421,7 +421,7 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_row($result);
if ($myrow[0]==0) {
- prnMsg( _('In order to create a new customer you must first set up at least one sales type/price list') . '<br />' .
+ prnMsg( _('In order to create a new customer you must first set up at least one sales type/price list') . '<br />' .
_('Click').' ' . '<a target="_blank" href="' . $RootPath . '/SalesTypes.php">' . _('here').' ' . '</a>' . _('to set up your price lists'),'warning') . '<br />';
$SetupErrors += 1;
}
@@ -430,7 +430,7 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_row($result);
if ($myrow[0]==0) {
- prnMsg( _('In order to create a new customer you must first set up at least one customer type') . '<br />' .
+ prnMsg( _('In order to create a new customer you must first set up at least one customer type') . '<br />' .
_('Click').' ' . '<a target="_blank" href="' . $RootPath . '/CustomerTypes.php">' . _('here').' ' . '</a>' . _('to set up your customer types'),'warning');
$SetupErrors += 1;
}
@@ -791,20 +791,10 @@
<tr>
<td>' . _('Address Line 5 (Postal Code)') . ':</td>
<td>' . $_POST['Address5'] . '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Country') . ':</td>
- <td><select name="Address6">';
- foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['Address6']) AND (strtoupper($_POST['Address6']) == strtoupper($CountryName))){
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
- echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
- } else {
- echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
- }
- }
- echo '</select></td>
+ <td>' . $_POST['Address6'] . '</td>
</tr>';
} else {
echo '<tr>
@@ -1022,8 +1012,7 @@
</tr>';
}
echo '<tr>
- <td>' . _('Language') . ':</td>
- <td><select name="LanguageID" required="required">';
+ <td>' . _('Language') . ':</td>';
if (!isset($_POST['LanguageID']) OR $_POST['LanguageID']==''){
$_POST['LanguageID']=$_SESSION['Language'];
@@ -1031,12 +1020,10 @@
foreach ($LanguagesArray as $LanguageCode => $LanguageName){
if ($_POST['LanguageID'] == $LanguageCode){
- echo '<option selected="selected" value="' . $LanguageCode . '">' . $LanguageName['LanguageName'] . '</option>';
- } else {
- echo '<option value="' . $LanguageCode . '">' . $LanguageName['LanguageName'] . '</option>';
+ echo '<td>' . $LanguageName['LanguageName'] ;
}
}
- echo '</select></td>
+ echo '</td>
</tr>';
echo '<tr>
<td>' . _('Require Customer PO Line on SO') . ':</td>';
@@ -1199,4 +1186,4 @@
} // end of main ifs
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-03 04:55:30 UTC (rev 6598)
+++ trunk/doc/Change.log 2014-03-05 01:05:48 UTC (rev 6599)
@@ -1,6 +1,7 @@
webERP Change Log
+05/03/2014 icedlava: Remove input fields (Country and Language) and display this data instead on customer view page
03/03/2014 Exson: Remove redundant code in CustomerAllocations.php
-3/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
+03/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
2/3/14 Paul T: Div swap in footer to simplify CSS for Gel and Silverwolf themes. Some other themes will see a basic position swap of the date and version info where these vertically appeared together at the far left end.
1/3/14 Paul T: Correct variable spelling error. [reported in forums by serakfalcon]
24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.
|
|
From: <ice...@us...> - 2014-03-05 09:14:20
|
Revision: 6601
http://sourceforge.net/p/web-erp/reponame/6601
Author: icedlava
Date: 2014-03-05 09:14:16 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
ReverseGRN.php - Ensure there are no unescaped characters in existing data when updating purchorders after reversing GRN. This fixes a symptom of a more widespread bug and therefore temporary until more general fix is applied.
Modified Paths:
--------------
trunk/ReverseGRN.php
trunk/doc/Change.log
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2014-03-05 02:22:10 UTC (rev 6600)
+++ trunk/ReverseGRN.php 2014-03-05 09:14:16 UTC (rev 6601)
@@ -133,7 +133,7 @@
/*Now the purchorder header status in case it was completed - now incomplete - just printed */
$SQL = "UPDATE purchorders
SET status = 'Printed',
- stat_comment = CONCAT('" . Date($_SESSION['DefaultDateFormat']) . ' ' . _('GRN Reversed for') . ' ' . $GRN['itemdescription'] . ' ' . _('by') . ' ' . $_SESSION['UsersRealName'] . "<br />', stat_comment )
+ stat_comment = CONCAT('" . Date($_SESSION['DefaultDateFormat']) . ' ' . _('GRN Reversed for') . ' ' . mysql_real_escape_string(stripslashes($GRN['itemdescription'])) . ' ' . _('by') . ' ' . $_SESSION['UsersRealName'] . "<br />', stat_comment )
WHERE orderno = '" . $GRN['orderno'] . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase order statusand status comment could not be changed because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-05 02:22:10 UTC (rev 6600)
+++ trunk/doc/Change.log 2014-03-05 09:14:16 UTC (rev 6601)
@@ -1,4 +1,6 @@
webERP Change Log
+
+05/03/2014 icedlava: Ensure there are no unescaped characters in existing data when updating purchorders after reversing GRN. This fixes a symptom of a more widespread bug and therefore temporary until more general fix is applied.
05/03/2014 icedlava: Remove input fields (Country and Language) and display this data instead on customer view page
03/03/2014 Exson: Remove redundant code in CustomerAllocations.php
03/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
|
|
From: <dai...@us...> - 2014-03-06 06:52:15
|
Revision: 6602
http://sourceforge.net/p/web-erp/reponame/6602
Author: daintree
Date: 2014-03-06 06:52:11 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
use DB abstraction function rather than mysql specific function
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/ReverseGRN.php
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2014-03-05 09:14:16 UTC (rev 6601)
+++ trunk/PrintCustStatements.php 2014-03-06 06:52:11 UTC (rev 6602)
@@ -461,7 +461,7 @@
echo '<table class="selection">';
echo '<tr><td>' . _('Starting Customer statement to print (Customer code)'). '
- </td><td><input type="text" maxlength="10" size="8" name="FromCust" value="1" /></td></tr>
+ </td><td><input type="text" maxlength="10" size="8" name="FromCust" value="0" /></td></tr>
<tr><td>' . _('Ending Customer statement to print (Customer code)') . '</td><td>
<input type="text" maxlength="10" size="8" name="ToCust" value="zzzzzz" /></td></tr></table>
<br /><div class="centre">
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2014-03-05 09:14:16 UTC (rev 6601)
+++ trunk/ReverseGRN.php 2014-03-06 06:52:11 UTC (rev 6602)
@@ -133,7 +133,7 @@
/*Now the purchorder header status in case it was completed - now incomplete - just printed */
$SQL = "UPDATE purchorders
SET status = 'Printed',
- stat_comment = CONCAT('" . Date($_SESSION['DefaultDateFormat']) . ' ' . _('GRN Reversed for') . ' ' . mysql_real_escape_string(stripslashes($GRN['itemdescription'])) . ' ' . _('by') . ' ' . $_SESSION['UsersRealName'] . "<br />', stat_comment )
+ stat_comment = CONCAT('" . Date($_SESSION['DefaultDateFormat']) . ' ' . _('GRN Reversed for') . ' ' . DB_escape_string(stripslashes($GRN['itemdescription'])) . ' ' . _('by') . ' ' . $_SESSION['UsersRealName'] . "<br />', stat_comment )
WHERE orderno = '" . $GRN['orderno'] . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase order statusand status comment could not be changed because');
|
|
From: <dai...@us...> - 2014-03-12 05:53:07
|
Revision: 6603
http://sourceforge.net/p/web-erp/reponame/6603
Author: daintree
Date: 2014-03-12 05:53:03 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
changed error reporting
Modified Paths:
--------------
trunk/config.distrib.php
trunk/install/index.php
Added Paths:
-----------
trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg
trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg
trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg
trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg
Added: trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg
===================================================================
(Binary files differ)
Index: trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg
===================================================================
--- trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg 2014-03-12 05:53:03 UTC (rev 6603)
Property changes on: trunk/companies/weberpdemo/part_pics/DVD-DHWV.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg
===================================================================
(Binary files differ)
Index: trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg
===================================================================
--- trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg 2014-03-12 05:53:03 UTC (rev 6603)
Property changes on: trunk/companies/weberpdemo/part_pics/DVD-LTWP.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg
===================================================================
(Binary files differ)
Index: trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg
===================================================================
--- trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg 2014-03-12 05:53:03 UTC (rev 6603)
Property changes on: trunk/companies/weberpdemo/part_pics/DVD-TOPGUN.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg
===================================================================
(Binary files differ)
Index: trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg
===================================================================
--- trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg 2014-03-12 05:53:03 UTC (rev 6603)
Property changes on: trunk/companies/weberpdemo/part_pics/DVD-UNSG.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/config.distrib.php 2014-03-12 05:53:03 UTC (rev 6603)
@@ -104,7 +104,7 @@
//This is the default value set in php.ini for most installations
//but just to be sure it is forced here
//turning on NOTICES destroys things */
-error_reporting (E_ALL && ~E_NOTICE);
+error_reporting(E_ALL && ~E_NOTICE && E_WARNING);
/* For Development Use */
//error_reporting (-1);
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-03-06 06:52:11 UTC (rev 6602)
+++ trunk/install/index.php 2014-03-12 05:53:03 UTC (rev 6603)
@@ -384,7 +384,7 @@
$msg .= "if (\$RootPath == '/' OR \$RootPath == '\\\') {\n";
$msg .= " \$RootPath = '';\n";
$msg .= "}\n";
- $msg .= "error_reporting (E_ALL & ~E_NOTICE);\n";
+ $msg .= "error_reporting(E_ALL && ~E_NOTICE && E_WARNING);\n";
$msg .= "//Installed companies \n";
foreach ($CompanyList as $k=>$compinfo)
{
|
|
From: <dai...@us...> - 2014-03-14 06:36:01
|
Revision: 6604
http://sourceforge.net/p/web-erp/reponame/6604
Author: daintree
Date: 2014-03-14 06:35:58 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
what happens if we do this?
Modified Paths:
--------------
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/install/index.php
Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc 2014-03-12 05:53:03 UTC (rev 6603)
+++ trunk/includes/ConnectDB_mysql.inc 2014-03-14 06:35:58 UTC (rev 6604)
@@ -164,7 +164,7 @@
}
function DB_escape_string($String){
- return mysql_real_escape_string(htmlspecialchars($String, ENT_COMPAT, 'utf-8', false));
+ return mysql_real_escape_string($String);
}
function DB_show_tables(&$Conn){
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2014-03-12 05:53:03 UTC (rev 6603)
+++ trunk/includes/ConnectDB_mysqli.inc 2014-03-14 06:35:58 UTC (rev 6604)
@@ -181,7 +181,7 @@
function DB_escape_string($String){
global $db;
- return mysqli_real_escape_string($db, htmlspecialchars($String, ENT_COMPAT,'utf-8', false));
+ return mysqli_real_escape_string($db, $String);
}
function DB_show_tables(&$Conn){
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-03-12 05:53:03 UTC (rev 6603)
+++ trunk/install/index.php 2014-03-14 06:35:58 UTC (rev 6604)
@@ -384,7 +384,7 @@
$msg .= "if (\$RootPath == '/' OR \$RootPath == '\\\') {\n";
$msg .= " \$RootPath = '';\n";
$msg .= "}\n";
- $msg .= "error_reporting(E_ALL && ~E_NOTICE && E_WARNING);\n";
+ $msg .= "error_reporting(E_ALL && ~E_NOTICE && ~E_WARNING);\n";
$msg .= "//Installed companies \n";
foreach ($CompanyList as $k=>$compinfo)
{
|
|
From: <dai...@us...> - 2014-03-14 20:29:17
|
Revision: 6605
http://sourceforge.net/p/web-erp/reponame/6605
Author: daintree
Date: 2014-03-14 20:29:12 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Jiro Akits Taiwanese translation update
Modified Paths:
--------------
trunk/config.distrib.php
trunk/doc/Manual/ManualContributors.html
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2014-03-14 06:35:58 UTC (rev 6604)
+++ trunk/config.distrib.php 2014-03-14 20:29:12 UTC (rev 6605)
@@ -51,6 +51,8 @@
// 'ShowInputBox'
// 'Hide'
+
+//$AllowCompanySelectionBox = 'ShowInputBox';
$AllowCompanySelectionBox = 'ShowSelectionBox';
//If $AllowCompanySelectionBox is not 'ShowSelectionBox' above then the $DefaultDatabase string is used to determined the default Company
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2014-03-14 06:35:58 UTC (rev 6604)
+++ trunk/doc/Manual/ManualContributors.html 2014-03-14 20:29:12 UTC (rev 6605)
@@ -170,6 +170,8 @@
<td valign="top"><b>Translation</b><br />
<br />
+ Jiro Akits - Taiwanese<br />
+ <br />
Rafael Chacón - Spanish<br />
<br />
Billy Chang,劉世琪 - Taiwanese<br />
Modified: trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po 2014-03-14 06:35:58 UTC (rev 6604)
+++ trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po 2014-03-14 20:29:12 UTC (rev 6605)
@@ -1,75 +1,77 @@
-# SOME DESCRIPTIVE TITLE.
+# webERP 4.11.3繁體(台灣)中文介面
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <aki...@ya...>, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: WebERP 4.05\n"
+"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2013-11-25 08:28-0600\n"
-"Last-Translator: Rafael Chacon <raf...@gm...>\n"
-"Language-Team: <sma...@gm...>\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2014-03-15 00:49+0800\n"
+"Last-Translator: Jiro Akits <aki...@ya...>\n"
+"Language-Team: Jiro Akits <aki...@ya...>\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"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-Basepath: d:\\www\\ERP\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_Hant_TW\n"
#: AccountGroups.php:7 includes/MainMenuLinksArray.php:370
msgid "Account Groups"
-msgstr "會計科目"
+msgstr "會計科目組 "
#: AccountGroups.php:20
msgid ""
"An error occurred in retrieving the account groups of the parent account "
"group during the check for recursion"
-msgstr "在遞歸檢查時提取主會計群組的會計科目時發生錯誤"
+msgstr "在遞歸檢查時提取主會計群組的會計科目組時發生錯誤 "
#: AccountGroups.php:21
msgid ""
"The SQL that was used to retrieve the account groups of the parent account "
"group and that failed in the process was"
-msgstr "用作提取中提取會計科目主帳目組時誤失敗的 SQL 是"
+msgstr "用作提取中提取會計科目主帳目組時失敗的 SQL 是"
#: AccountGroups.php:50
msgid "An error occurred in moving the account group"
-msgstr ""
+msgstr "在移動會計科目組時發生錯誤"
#: AccountGroups.php:51
msgid "The SQL that was used to move the account group was"
-msgstr ""
+msgstr "這是用於移動會計科目組的SQL是"
#: AccountGroups.php:53 AccountGroups.php:334
msgid "Review Account Groups"
-msgstr "檢視會計科目"
+msgstr "檢視會計科目組"
#: AccountGroups.php:54
msgid "All accounts in the account group:"
-msgstr ""
+msgstr "在會計科目組中的所有會計科目："
#: AccountGroups.php:54
msgid "have been changed to the account group:"
-msgstr ""
+msgstr "已更改為會計科目組："
#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211
#: AccountGroups.php:246
msgid "The SQL that was used to retrieve the information was"
-msgstr ""
+msgstr "被用於檢索信息的SQL是"
#: AccountGroups.php:74
msgid "Could not check whether the group exists because"
-msgstr ""
+msgstr "無法檢查該組是否存在因"
#: AccountGroups.php:81
msgid "The account group name already exists in the database"
-msgstr ""
+msgstr "會計科目組名稱已經存在於數據庫中"
#: AccountGroups.php:87
msgid "The account group name cannot contain the character"
-msgstr "會計科目名稱不能包含這字元"
+msgstr "會計科目組名稱不能包含這字元"
#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:31
msgid "or the character"
@@ -77,7 +79,7 @@
#: AccountGroups.php:93
msgid "The account group name must be at least one character long"
-msgstr "會計科目名稱必須不少於 1 個字元"
+msgstr "會計科目組名稱必須不少於 1 個字元"
#: AccountGroups.php:100
msgid ""
@@ -90,7 +92,7 @@
#: AccountGroups.php:111
msgid "Could not check whether the group is recursive because"
-msgstr ""
+msgstr "無法檢查該組是否是遞歸的，因為"
#: AccountGroups.php:119
msgid ""
@@ -100,6 +102,9 @@
"inherited from the parent account group. Any changes made to these fields "
"will have no effect."
msgstr ""
+"由於該會計科目組是一個子科目，在試算表的順序及在帳目之部分該會計科目是否會出"
+"現在資產負債表或損益表等，是從父會計科目繼承所有屬性。這些欄位所做的任何更改"
+"將不會影響父會計科目的任何屬性。"
#: AccountGroups.php:124
msgid "The section in accounts must be an integer"
@@ -111,23 +116,23 @@
#: AccountGroups.php:136
msgid "The sequence in the TB must be numeric and less than"
-msgstr ""
+msgstr "在結核病的順序必須是數字和小於"
#: AccountGroups.php:152
msgid "An error occurred in renaming the account group"
-msgstr ""
+msgstr "在重命名會計科目組時發生錯誤"
#: AccountGroups.php:153
msgid "The SQL that was used to rename the account group was"
-msgstr ""
+msgstr "這是用來重命名會計科目組的SQL是"
#: AccountGroups.php:172
msgid "An error occurred in updating the account group"
-msgstr ""
+msgstr "在更新會計科目組時發生錯誤"
#: AccountGroups.php:173
msgid "The SQL that was used to update the account group was"
-msgstr ""
+msgstr "這是用來更新會計科目組的SQL是"
#: AccountGroups.php:175 AccountSections.php:101 PaymentMethods.php:83
msgid "Record Updated"
@@ -135,11 +140,11 @@
#: AccountGroups.php:191
msgid "An error occurred in inserting the account group"
-msgstr ""
+msgstr "在插入會計科目組時發生錯誤"
#: AccountGroups.php:192
msgid "The SQL that was used to insert the account group was"
-msgstr ""
+msgstr "這是用來插入會計科目組的SQL是"
#: AccountGroups.php:193 AccountSections.php:111
msgid "Record inserted"
@@ -147,13 +152,13 @@
#: AccountGroups.php:210
msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr ""
+msgstr "從主圖表檢索組信息時發生錯誤"
#: AccountGroups.php:215
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
-msgstr "總帳已產生此會計科目, 不能刪除"
+msgstr "總帳已產生此會計科目組, 不能刪除"
#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
@@ -177,41 +182,41 @@
#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:86
msgid "There are"
-msgstr "這是"
+msgstr "這些是"
#: AccountGroups.php:216
msgid "general ledger accounts that refer to this account group"
-msgstr "此會計科目的總帳"
+msgstr "此會計科目參考此會計科目組"
#: AccountGroups.php:223 AccountGroups.php:294 AccountGroups.php:407
msgid "Parent Group"
-msgstr "主群組"
+msgstr "父群組"
#: AccountGroups.php:239
msgid "Move Group"
-msgstr ""
+msgstr "移動組"
#: AccountGroups.php:245
msgid "An error occurred in retrieving the parent group information"
-msgstr ""
+msgstr "在檢索父組信息時出錯"
#: AccountGroups.php:250
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
-msgstr "未能刪除這會計科目, 因為這是其他科目的主帳目組"
+msgstr "未能刪除這會計科目組, 因為這是其他科目的主帳目組"
#: AccountGroups.php:251
msgid "account groups that have this group as its/there parent account group"
-msgstr "這主群組下屬的會計科目"
+msgstr "這父會計科目群組下的會計科目組"
#: AccountGroups.php:255
msgid "An error occurred in deleting the account group"
-msgstr ""
+msgstr "在刪除會計科目組時發生錯誤"
#: AccountGroups.php:256
msgid "The SQL that was used to delete the account group was"
-msgstr ""
+msgstr "這是用來刪除該會計科目組的SQL是"
#: AccountGroups.php:258
msgid "group has been deleted"
@@ -219,11 +224,11 @@
#: AccountGroups.php:283
msgid "The sql that was used to retrieve the account group information was "
-msgstr ""
+msgstr "這是用來檢索該會計科目組信息的SQL是"
#: AccountGroups.php:284
msgid "Could not get account groups because"
-msgstr "不能取得會計科目, 因為"
+msgstr "不能取得會計科目組, 因為"
#: AccountGroups.php:286 AccountSections.php:172 AddCustomerContacts.php:25
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
@@ -276,11 +281,11 @@
#: AccountGroups.php:290
msgid "Group Name"
-msgstr "科目名稱"
+msgstr "科目組名稱"
#: AccountGroups.php:291 EDIMessageFormat.php:129 EDIMessageFormat.php:208
msgid "Section"
-msgstr "分類"
+msgstr "會計要素"
#: AccountGroups.php:292 AccountGroups.php:461
msgid "Sequence In TB"
@@ -420,7 +425,7 @@
#: AccountGroups.php:326
msgid "Are you sure you wish to delete this account group?"
-msgstr ""
+msgstr "是否確定要刪除這會計科目組?"
#: AccountGroups.php:326 AccountSections.php:196 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
@@ -463,33 +468,33 @@
#: AccountGroups.php:354
msgid "An error occurred in retrieving the account group information"
-msgstr ""
+msgstr "在檢索會計科目組信息時出錯"
#: AccountGroups.php:355
msgid ""
"The SQL that was used to retrieve the account group and that failed in the "
"process was"
-msgstr ""
+msgstr "這是用來檢索該會計科目組和失敗的過程中的SQL是"
#: AccountGroups.php:358
msgid "The account group name does not exist in the database"
-msgstr ""
+msgstr "輸入的會計科目組名稱不存在於資料庫"
#: AccountGroups.php:372
msgid "Edit Account Group Details"
-msgstr ""
+msgstr "編輯會計科目組明細"
#: AccountGroups.php:396
msgid "New Account Group Details"
-msgstr ""
+msgstr "新增會計科目組明細"
#: AccountGroups.php:403
msgid "Account Group Name"
-msgstr ""
+msgstr "會計科目組名稱"
#: AccountGroups.php:404
msgid "Enter the account group name"
-msgstr ""
+msgstr "輸入會計科目組名稱"
#: AccountGroups.php:404
msgid ""
@@ -497,6 +502,8 @@
"long and less than 30 characters long. Only alpha numeric characters can be "
"used."
msgstr ""
+"該會計科目組的唯一名稱，必須輸入 - 至少3個字符長，小於30個字符長。只有字母數"
+"字字符都可以使用。"
#: AccountGroups.php:413 AccountGroups.php:415
msgid "Top Level Group"
@@ -504,7 +511,7 @@
#: AccountGroups.php:429
msgid "Section In Accounts"
-msgstr "會計類別"
+msgstr "會計要素"
#: AccountGroups.php:445
msgid ""
@@ -512,12 +519,14 @@
"only profit and loss accounts or NO if the group will contain balance sheet "
"account"
msgstr ""
+"如果這個會計科目將包含帳戶及損益帳，則選擇YES; 若包含資產負債表科目，則選擇"
+"NO。"
#: AccountGroups.php:462
msgid ""
"Enter the sequence number that this account group and its child general "
"ledger accounts should display in the trial balance"
-msgstr ""
+msgstr "輸入該會計科目的序列號則總帳子科目將會顯示在試算表上"
#: AccountGroups.php:465 AccountSections.php:263 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
@@ -536,37 +545,37 @@
#: TaxProvinces.php:235 UnitsOfMeasure.php:241 WorkCentres.php:280
#: WWW_Users.php:735
msgid "Enter Information"
-msgstr "輸入資料"
+msgstr "儲存以上輸入的資料"
#: AccountSections.php:7 includes/MainMenuLinksArray.php:369
msgid "Account Sections"
-msgstr "會計類別"
+msgstr "會計要素"
#: AccountSections.php:64
msgid "The account section already exists in the database"
-msgstr ""
+msgstr "該帳戶部分已經存在於數據庫中"
#: AccountSections.php:71
msgid "The account section name cannot contain any illegal characters"
-msgstr ""
+msgstr "帳戶部分名稱不能包含任何非法字符"
#: AccountSections.php:77
msgid "The account section name must contain at least one character"
-msgstr ""
+msgstr "該帳戶部分名稱必須至少包含一個字符"
#: AccountSections.php:83 AccountSections.php:89
msgid "The section number must be an integer"
-msgstr "會計類別必須是整數"
+msgstr "會計要素必須是整數"
#: AccountSections.php:131
msgid ""
"Cannot delete this account section because general ledger accounts groups "
"have been created using this section"
-msgstr "總帳已產生此會計類別, 不能刪除"
+msgstr "總帳已產生此會計要素, 不能刪除"
#: AccountSections.php:133
msgid "general ledger accounts groups that refer to this account section"
-msgstr "此會計類別的總帳"
+msgstr "此會計要素的總帳"
#: AccountSections.php:145
msgid "section has been deleted"
@@ -574,23 +583,23 @@
#: AccountSections.php:170
msgid "Could not get account group sections because"
-msgstr "不能取得會計類別, 因為"
+msgstr "不能取得會計要素, 因為"
#: AccountSections.php:176 AccountSections.php:235 AccountSections.php:253
msgid "Section Number"
-msgstr "類別編號"
+msgstr "會計要素編號"
#: AccountSections.php:177 AccountSections.php:258
msgid "Section Description"
-msgstr "類別內容"
+msgstr "會計要素名稱"
#: AccountSections.php:194
msgid "Restricted"
-msgstr "受限制"
+msgstr "不可修改"
#: AccountSections.php:205
msgid "Review Account Sections"
-msgstr "檢視會計類別"
+msgstr "檢視會計要素"
#: AccountSections.php:224
msgid "Could not retrieve the requested section please try again."
@@ -599,7 +608,7 @@
#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:606
#: SelectCustomer.php:641
msgid "Customer Contacts"
-msgstr ""
+msgstr "客戶聯絡人"
#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:21
#: Z_CheckDebtorsControl.php:14
@@ -608,27 +617,27 @@
#: AddCustomerContacts.php:25
msgid "Contacts for Customer"
-msgstr ""
+msgstr "與我們聯繫客戶"
#: AddCustomerContacts.php:27
msgid "Edit contact for"
-msgstr ""
+msgstr "對於編輯聯繫人"
#: AddCustomerContacts.php:39
msgid "The Contact ID must be an integer."
-msgstr ""
+msgstr "聯繫人ID必須是整數。"
#: AddCustomerContacts.php:42
msgid "The contact name must be forty characters or less long"
-msgstr ""
+msgstr "聯絡人名稱必須不多於 50 字元"
#: AddCustomerContacts.php:45
msgid "The contact name may not be empty"
-msgstr ""
+msgstr "聯絡人名稱不能留空"
#: AddCustomerContacts.php:48
msgid "The contact email address is not a valid email address"
-msgstr ""
+msgstr "聯繫人的電子郵件地址不是一個有效的電子郵件地址"
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:69
@@ -643,11 +652,11 @@
#: AddCustomerContacts.php:74
msgid "The contact record has been added"
-msgstr ""
+msgstr "聯絡人紀錄已新增"
#: AddCustomerContacts.php:103
msgid "The contact record has been deleted"
-msgstr ""
+msgstr "聯絡人紀錄已刪除"
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
#: CustomerBranches.php:408 Customers.php:1117 Customers.php:1125
@@ -663,11 +672,11 @@
#: Customers.php:1126 SelectCustomer.php:610 WWW_Access.php:110
#: WWW_Access.php:173
msgid "Role"
-msgstr "身份"
+msgstr "使用者身份/角色"
#: AddCustomerContacts.php:128
msgid "Phone no"
-msgstr ""
+msgstr "電話號碼"
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:278
@@ -685,7 +694,7 @@
#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:420
#: ../webSHOP/Register.php:607
msgid "Email"
-msgstr ""
+msgstr "電子郵件"
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1121
#: Customers.php:1129 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
@@ -707,12 +716,12 @@
#: AddCustomerContacts.php:206
msgid "Contact Code"
-msgstr ""
+msgstr "聯絡人號碼"
#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
#: ../webSHOP/Checkout.php:504 ../webSHOP/Register.php:622
msgid "Contact Name"
-msgstr "聯繫名稱"
+msgstr "聯繫人名稱"
#: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247
#: PO_Header.php:1017 PO_Header.php:1102 SelectCreditItems.php:245
@@ -727,35 +736,35 @@
#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:656
#: SelectCustomer.php:689
msgid "Customer Notes"
-msgstr ""
+msgstr "客戶備註"
#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
msgid "Back to Select Customer"
-msgstr ""
+msgstr "回到客戶選擇"
#: AddCustomerNotes.php:34
msgid "The contact priority must be an integer."
-msgstr ""
+msgstr "接觸優先權必須是整數。"
#: AddCustomerNotes.php:37
msgid "The contact's notes must be two hundred characters or less long"
-msgstr ""
+msgstr "聯絡人的備註說明必須是或少於200字元"
#: AddCustomerNotes.php:40
msgid "The contact's notes may not be empty"
-msgstr ""
+msgstr "聯絡人的備註說明不能留空"
#: AddCustomerNotes.php:64
msgid "The contact notes record has been added"
-msgstr ""
+msgstr "聯絡人的備註紀錄已新增"
#: AddCustomerNotes.php:91
msgid "The contact note record has been deleted"
-msgstr ""
+msgstr "聯絡人的備註紀錄已刪除"
#: AddCustomerNotes.php:101
msgid "Notes for Customer"
-msgstr ""
+msgstr "客戶備註"
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
@@ -797,78 +806,78 @@
#: AddCustomerNotes.php:119 AddCustomerNotes.php:213
msgid "WWW"
-msgstr ""
+msgstr "網址"
#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
#: SelectCustomer.php:662 SelectCustomer.php:704
msgid "Priority"
-msgstr ""
+msgstr "優先"
#: AddCustomerNotes.php:138
#, php-format
msgid "Are you sure you wish to delete this customer note?"
-msgstr ""
+msgstr "您確定要刪除這個客戶備註？"
#: AddCustomerNotes.php:157
msgid "Review all notes for this Customer"
-msgstr ""
+msgstr "查看該客戶的所有備註"
#: AddCustomerNotes.php:196 AddCustomerTypeNotes.php:189
msgid "Note ID"
-msgstr ""
+msgstr "備註ID"
#: AddCustomerNotes.php:204
msgid "Contact Note"
-msgstr ""
+msgstr "聯繫人備註"
#: AddCustomerTypeNotes.php:5 SelectCustomer.php:698
msgid "Customer Type (Group) Notes"
-msgstr ""
+msgstr "客戶類型（集團）附註"
#: AddCustomerTypeNotes.php:31
msgid "The Contact priority must be an integer."
-msgstr ""
+msgstr "聯絡人優先順序必須是整數"
#: AddCustomerTypeNotes.php:34
msgid "The contacts notes must be two hundred characters or less long"
-msgstr ""
+msgstr "聯絡人的備註說明必須是或少於200字元"
#: AddCustomerTypeNotes.php:37
msgid "The contacts notes may not be empty"
-msgstr ""
+msgstr "聯絡人備註不能留空"
#: AddCustomerTypeNotes.php:48 SelectCustomer.php:730
msgid "Customer Group Notes"
-msgstr ""
+msgstr "客戶本集團附註"
#: AddCustomerTypeNotes.php:61
msgid "The contact group notes record has been added"
-msgstr ""
+msgstr "聯絡人群組的備註紀錄已新增"
#: AddCustomerTypeNotes.php:84
msgid "The contact group note record has been deleted"
-msgstr ""
+msgstr "聯絡人群組的備註紀錄已刪除"
#: AddCustomerTypeNotes.php:94
msgid "Notes for Customer Type"
-msgstr ""
+msgstr "對於客戶類型備註"
#: AddCustomerTypeNotes.php:113
msgid "href"
-msgstr ""
+msgstr "href"
#: AddCustomerTypeNotes.php:150
msgid "Review all notes for this Customer Type"
-msgstr ""
+msgstr "查看該客戶類型的所有備註"
#: AddCustomerTypeNotes.php:203
msgid "Contact Group Note"
-msgstr ""
+msgstr "聯絡人群組備註"
#: AddCustomerTypeNotes.php:207
msgid "Web site"
-msgstr ""
+msgstr "網站"
#: AgedDebtors.php:14
msgid "Aged Customer Balance Listing"
@@ -910,7 +919,7 @@
#: SupplierTenderCreate.php:666 SupplierTenders.php:397 SuppPriceList.php:138
#: includes/PDFPaymentRun_PymtFooter.php:152
msgid "Problem Report"
-msgstr "問題報告"
+msgstr "問題報表"
#: AgedDebtors.php:269 CustomerInquiry.php:94 CustomerInquiry.php:119
#: CustomerPurchases.php:25 DebtorsAtPeriodEnd.php:59
@@ -1025,7 +1034,7 @@
#: AgedDebtors.php:436
msgid ""
"There are no customers with balances meeting the criteria specified to list"
-msgstr ""
+msgstr "有沒有客戶餘額達到指定列出的標準"
#: AgedDebtors.php:447
msgid "Aged Debtor Analysis"
@@ -1037,7 +1046,7 @@
#: AgedDebtors.php:466
msgid "Enter the first customer code alphabetically to include in the report"
-msgstr ""
+msgstr "在報表中包含輸入的客戶代碼的第一個字母"
#: AgedDebtors.php:469 DebtorsAtPeriodEnd.php:146
msgid "To Customer Code"
@@ -1045,7 +1054,7 @@
#: AgedDebtors.php:470
msgid "Enter the last customer code alphabetically to include in the report"
-msgstr ""
+msgstr "在報表中包含輸入的客戶代碼的最後一個字母"
#: AgedDebtors.php:473 AgedSuppliers.php:295
msgid "All balances or overdues only"
@@ -1077,15 +1086,15 @@
#: AgedDebtors.php:517
msgid "Summary or detailed report"
-msgstr "總結或詳細報告"
+msgstr "總結或詳細報表"
#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:285
msgid "Summary Report"
-msgstr "總結報告"
+msgstr "總結報表"
#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:286
msgid "Detailed Report"
-msgstr "詳細報告"
+msgstr "詳細報表"
#: AgedDebtors.php:527 AgedSuppliers.php:327 BOMExtendedQty.php:285
#: BOMIndented.php:275 BOMIndentedReverse.php:254 BOMListing.php:130
@@ -1119,7 +1128,7 @@
#: AgedSuppliers.php:195
msgid "Aged Supplier Account Analysis - Problem Report"
-msgstr "供應商戶口分析-問題報告"
+msgstr "供應商戶口分析-問題報表"
#: AgedSuppliers.php:197
msgid "The details of outstanding transactions for Supplier"
@@ -1131,7 +1140,7 @@
#: AgedSuppliers.php:265
msgid "There are no results so the PDF is empty"
-msgstr ""
+msgstr "沒有結果，所以這PDF檔案是空白"
#: AgedSuppliers.php:287 OutstandingGRNs.php:267 PDFRemittanceAdvice.php:153
#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:265
@@ -1141,7 +1150,7 @@
#: AgedSuppliers.php:288
msgid "Enter the first supplier code alphabetially to include in the report"
-msgstr ""
+msgstr "在報表中包含輸入的供應商代碼的第一個字母"
#: AgedSuppliers.php:291 OutstandingGRNs.php:271 PDFRemittanceAdvice.php:157
#: SupplierBalsAtPeriodEnd.php:136 SuppPaymentRun.php:269
@@ -1151,7 +1160,7 @@
#: AgedSuppliers.php:292
msgid "Enter the last supplier code alphabetically to include in the report"
-msgstr ""
+msgstr "在報表中包含輸入的供應商代碼的最後一個字母"
#: AgedSuppliers.php:297
msgid "All suppliers with balances"
@@ -1163,11 +1172,11 @@
#: AgedSuppliers.php:318 InventoryValuation.php:283
msgid "Summary or Detailed Report"
-msgstr "總結或詳細報告"
+msgstr "總結或詳細報表"
#: Areas.php:7
msgid "Sales Area Maintenance"
-msgstr "銷售地區維護"
+msgstr "銷售區域維護"
#: Areas.php:40
msgid "The area code must be three characters or less long"
@@ -1175,7 +1184,7 @@
#: Areas.php:45
msgid "The area code entered already exists"
-msgstr ""
+msgstr "輸入的區碼已經存在"
#: Areas.php:50
msgid "The area description must be twenty five characters or less long"
@@ -1219,7 +1228,7 @@
msgid ""
"Cannot delete this area because sales analysis records exist that use this "
"area"
-msgstr ""
+msgstr "因為銷售分析記錄存在使用此區域不能刪除這個區域"
#: Areas.php:124
msgid "sales analysis records referring this area code"
@@ -1247,7 +1256,7 @@
#: Areas.php:166
msgid "View Customers from this Area"
-msgstr ""
+msgstr "從本區查看客戶"
#: Areas.php:176
msgid "Review Areas Defined"
@@ -1255,11 +1264,11 @@
#: Areas.php:218
msgid "Enter the sales area code - up to 3 characters are allowed"
-msgstr ""
+msgstr "輸入銷售地區編號必須是或少於3字元"
#: Areas.php:223
msgid "Enter the description of the sales area"
-msgstr ""
+msgstr "進入銷售區域的說明"
#: AuditTrail.php:7
msgid "Audit Trail"
@@ -1272,18 +1281,18 @@
#: AuditTrail.php:43 BOMIndented.php:316 BOMIndentedReverse.php:296
#: MRPCalendar.php:264
msgid "From Date"
-msgstr ""
+msgstr "日期從"
#: AuditTrail.php:47 BOMIndented.php:317 BOMIndentedReverse.php:297
#: MRPCalendar.php:266
msgid "To Date"
-msgstr ""
+msgstr "日期到"
#: AuditTrail.php:53 PO_AuthorisationLevels.php:124
#: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
#: UserSettings.php:112 includes/UserLogin.php:135
msgid "User ID"
-msgstr "用戶 ID"
+msgstr "使用者帳號"
#: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306
#: CounterReturns.php:1627 CounterReturns.php:1630 CounterSales.php:2236
@@ -1318,11 +1327,11 @@
#: AuditTrail.php:67
msgid "Table "
-msgstr ""
+msgstr "資料表名稱"
#: AuditTrail.php:84
msgid "Containing text"
-msgstr ""
+msgstr "文字含有"
#: AuditTrail.php:90 InternalStockRequest.php:592 MRPReport.php:779
#: PO_SelectPurchOrder.php:432 SelectContract.php:184 SelectProduct.php:807
@@ -1331,12 +1340,12 @@
#: AuditTrail.php:175
msgid "Date/Time"
-msgstr ""
+msgstr "日期/時間"
#: AuditTrail.php:176 BankAccountUsers.php:71 BankAccountUsers.php:84
#: PcReportTab.php:268 includes/header.inc:59
msgid "User"
-msgstr ""
+msgstr "用戶 "
#: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295
#: CustomerAllocations.php:378 CustomerInquiry.php:219
@@ -1357,12 +1366,12 @@
#: AuditTrail.php:178
msgid "Table"
-msgstr ""
+msgstr "資料表名稱"
#: AuditTrail.php:179 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777
#: api/api_xml-rpc.php:2187
msgid "Field Name"
-msgstr ""
+msgstr "欄位名稱"
#: AuditTrail.php:180 MaterialsNotUsed.php:38 PurchData.php:700
#: SellThroughSupport.php:263 ShopParameters.php:197 SystemParameters.php:362
@@ -1372,27 +1381,27 @@
#: BackupDatabase.php:7
msgid "Backup webERP Database"
-msgstr ""
+msgstr "備份ERP數料庫"
#: BackupDatabase.php:20
msgid "Deleted"
-msgstr ""
+msgstr "刪除"
#: BackupDatabase.php:23
msgid "Unable to delete"
-msgstr ""
+msgstr "無法刪除"
#: BackupDatabase.php:28
msgid "All backup files on the server have been deleted"
-msgstr ""
+msgstr "服務器上的所有備份文件已被刪除"
#: BackupDatabase.php:30
msgid "No backup files on the server were deleted"
-msgstr ""
+msgstr "在服務器上沒有備份文件被刪除"
#: BackupDatabase.php:34
msgid "Backup"
-msgstr ""
+msgstr "備用"
#: BackupDatabase.php:43
msgid ""
@@ -1400,6 +1409,8 @@
"computer because in case the web-server has a disk failure the backup would "
"then not on the same machine. Use the link below"
msgstr ""
+"備份文件已經被新建。web服務器有一個磁盤出現故障的備份，請使用下面的鏈接，將這"
+"個備份檔案下載到您的電腦，備份程序將不會在同一台機器上運行。"
#: BackupDatabase.php:43
msgid "Download the backup file to your locale machine"
@@ -1413,10 +1424,13 @@
"contain sensitive information which would otherwise be available for others "
"to download!"
msgstr ""
+"一旦你已經下載了資料庫備份文件到本地機器上，你應該使用下面的鏈接將其刪除 -如"
+"果不刪除則備份文件將會累積，並在您的託管帳戶中將佔用大量的空間，而包含其中的"
+"敏感信息可能會遭到有心人士下載！"
#: BackupDatabase.php:47
msgid "Delete the backup file off the server"
-msgstr ""
+msgstr "刪除備份文件，關閉服務器"
#: BackupDatabase.php:49
msgid ""
@@ -1424,10 +1438,12 @@
"relates to a permissions issue - the web-server user must have permission to "
"write to the companies directory"
msgstr ""
+"使用mysqldump備份時,若有一些問題產生。通常，這涉及到一個權限問題 - 網絡服務器"
+"的用戶必須具有讀寫權限該公司的目錄"
#: BankAccounts.php:7
msgid "Bank Accounts Maintenance"
-msgstr "銀行戶口維護"
+msgstr "銀行帳戶維護"
#: BankAccounts.php:12 TaxAuthorities.php:150
#: ../webSHOP/includes/Functions.php:755
@@ -1441,26 +1457,28 @@
"print Account details on Invoices (only one account should be set to Fall "
"Back Default)."
msgstr ""
+"更新銀行帳戶資料。帳戶代碼是SWIFT或BSB型銀行代碼。設置發票預設幣別或降級預設"
+"值以利列印在發票（只有一個帳戶應設置降一級預設值）帳戶的詳細資料。"
#: BankAccounts.php:45
msgid "The bank account code already exists in the database"
-msgstr ""
+msgstr "銀行帳戶代碼已經存在於數據庫中"
#: BankAccounts.php:51
msgid "The bank account name must be fifty characters or less long"
-msgstr "銀行戶口名稱長度必須是或少於50字元"
+msgstr "銀行帳戶名稱長度必須是或少於50字元"
#: BankAccounts.php:57
msgid "The bank account name may not be empty."
-msgstr "銀行戶口名稱不能留空"
+msgstr "銀行帳戶名稱不能留空"
#: BankAccounts.php:63
msgid "The bank account number may not be empty."
-msgstr ""
+msgstr "銀行帳號不能為空。"
#: BankAccounts.php:69
msgid "The bank account number must be fifty characters or less long"
-msgstr "銀行戶口編號長度必須是或少於50字元"
+msgstr "銀行帳戶編號長度必須是或少於50字元"
#: BankAccounts.php:75
msgid "The bank address must be fifty characters or less long"
@@ -1470,7 +1488,7 @@
msgid ""
"Note that it is not possible to change the currency of the account once "
"there are transactions against it"
-msgstr ""
+msgstr "請注意，這帳戶一旦有交易，是不可以改變帳戶的貨幣別"
#: BankAccounts.php:105
msgid "The bank account details have been updated"
@@ -1478,11 +1496,11 @@
#: BankAccounts.php:124
msgid "The new bank account has been entered"
-msgstr "新銀行戶口已輸入"
+msgstr "新銀行帳戶已輸入"
#: BankAccounts.php:129
msgid "The bank account could not be inserted or modified because"
-msgstr "銀行戶口不能插入或修改, 因為"
+msgstr "銀行帳戶不能插入或修改, 因為"
#: BankAccounts.php:130
msgid "The SQL used to insert/modify the bank account details was"
@@ -1492,39 +1510,39 @@
msgid ""
"Cannot delete this bank account because transactions have been created using "
"this account"
-msgstr "不能刪除此銀行戶口因為此戶口已有交易存在"
+msgstr "不能刪除此銀行帳戶因為此戶口已有交易存在"
#: BankAccounts.php:159
msgid "transactions with this bank account code"
-msgstr "此銀行戶口編碼的交易"
+msgstr "此銀行帳戶編碼的交易"
#: BankAccounts.php:165
msgid "Bank account deleted"
-msgstr "銀行戶口已刪除"
+msgstr "銀行帳戶已刪除"
#: BankAccounts.php:185
msgid "The bank accounts set up could not be retrieved because"
-msgstr ""
+msgstr "設立銀行帳戶無法檢索，因為"
#: BankAccounts.php:186
msgid "The SQL used to retrieve the bank account details was"
-msgstr "用作提取銀行戶口資料的 SQL 是"
+msgstr "用作提取銀行帳戶資料的 SQL 是"
#: BankAccounts.php:191 GLJournal.php:295
msgid "GL Account Code"
-msgstr ""
+msgstr "總帳帳戶代碼"
#: BankAccounts.php:192 BankAccounts.php:328
msgid "Bank Account Name"
-msgstr "銀行戶口名稱"
+msgstr "銀行帳戶名稱"
#: BankAccounts.php:193 BankAccounts.php:332
msgid "Bank Account Code"
-msgstr ""
+msgstr "銀行帳戶代碼"
#: BankAccounts.php:194 BankAccounts.php:336
msgid "Bank Account Number"
-msgstr "銀行戶口編號"
+msgstr "銀行帳戶編號"
#: BankAccounts.php:195 BankAccounts.php:340
msgid "Bank Address"
@@ -1546,82 +1564,82 @@
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36 ../webSHOP/Checkout.php:378
msgid "Currency"
-msgstr "貨幣"
+msgstr "貨幣別"
#: BankAccounts.php:197 BankAccounts.php:366
msgid "Default for Invoices"
-msgstr ""
+msgstr "發票預設"
#: BankAccounts.php:212 BankAccounts.php:377 BankAccounts.php:383
#: BankAccounts.php:387 BankAccounts.php:391
msgid "Fall Back Default"
-msgstr ""
+msgstr "降一級的預設值"
#: BankAccounts.php:214 BankAccounts.php:378 BankAccounts.php:382
#: BankAccounts.php:386 BankAccounts.php:392
msgid "Currency Default"
-msgstr ""
+msgstr "預設貨幣"
#: BankAccounts.php:224
#, php-format
msgid "Are you sure you wish to delete this bank account?"
-msgstr ""
+msgstr "您確定要刪除此銀行帳戶？"
#: BankAccounts.php:248
msgid "Show All Bank Accounts Defined"
-msgstr "顯示全部銀行戶口定義"
+msgstr "顯示全部銀行帳戶的設定"
#: BankAccounts.php:284 BankAccounts.php:290
msgid "Bank Account GL Code"
-msgstr "銀行戶口總帳編碼"
+msgstr "銀行帳戶總帳編碼"
#: BankAccounts.php:344
msgid "Currency Of Account"
-msgstr ""
+msgstr "外幣帳戶"
#: BankAccountUsers.php:4
msgid "Maintenance Of Bank Account Authorised Users"
-msgstr ""
+msgstr "維護銀行帳戶授權的用戶"
#: BankAccountUsers.php:7 includes/MainMenuLinksArray.php:375
msgid "Bank Account Authorised Users"
-msgstr ""
+msgstr "銀行帳戶授權"
#: BankAccountUsers.php:31
msgid "You have not selected any bank account"
-msgstr ""
+msgstr "您還沒有選擇任何銀行帳戶"
#: BankAccountUsers.php:44
msgid "You have not selected an user to be authorised to use this bank account"
-msgstr ""
+msgstr "您沒有選擇被授權使用該銀行帳戶的用戶"
#: BankAccountUsers.php:63
msgid "The user"
-msgstr ""
+msgstr "用戶"
#: BankAccountUsers.php:63
msgid "already authorised to use this bank account"
-msgstr ""
+msgstr "已經授權使用此銀行帳戶"
#: BankAccountUsers.php:71
msgid "has been authorised to use"
-msgstr ""
+msgstr "已經授權使用"
#: BankAccountUsers.php:71 BankAccountUsers.php:84 BankAccountUsers.php:141
msgid "bank account"
-msgstr ""
+msgstr "銀行帳戶"
#: BankAccountUsers.php:82
msgid "The bank account user record could not be deleted because"
-msgstr ""
+msgstr "銀行帳戶的用戶記錄無法刪除，因為"
#: BankAccountUsers.php:84
msgid "has been un-authorised to use"
-msgstr ""
+msgstr "已經被未經授權的使用"
#: BankAccountUsers.php:97
msgid "Select Bank Account"
-msgstr ""
+msgstr "選擇銀行帳戶"
#: BankAccountUsers.php:105 BankAccountUsers.php:205
#: InternalStockCategoriesByRole.php:120 InternalStockCategoriesByRole.php:209
@@ -1629,7 +1647,7 @@
#: PcExpenses.php:310 PcExpensesTypeTab.php:123 PcExpensesTypeTab.php:212
#: PurchaseByPrefSupplier.php:317 StockCounts.php:120
msgid "Not Yet Selected"
-msgstr ""
+msgstr "尚未選擇"
#: BankAccountUsers.php:123 BankAccountUsers.php:222 CustomerReceipt.php:948
#: CustomerReceipt.php:1160 CustomerTypes.php:270 ExchangeRateTrend.php:51
@@ -1642,7 +1660,7 @@
#: PcTabs.php:487 PcTypeTabs.php:253 SalesTypes.php:274 SupplierTypes.php:255
#: Z_CheckDebtorsControl.php:61
msgid "Accept"
-msgstr "接受"
+msgstr "確認"
#: BankAccountUsers.php:124 BankAccountUsers.php:223
#: CustomerAllocations.php:452 CustomerReceipt.php:1161
@@ -1657,15 +1675,15 @@
#: BankAccountUsers.php:141
msgid "Authorised users for"
-msgstr ""
+msgstr "授權的用戶"
#: BankAccountUsers.php:159
msgid "Authorised users for bank account"
-msgstr ""
+msgstr "授權用戶的銀行帳戶"
#: BankAccountUsers.php:161
msgid "User Code"
-msgstr ""
+msgstr "用戶代碼"
#: BankAccountUsers.php:162 PcTabs.php:206 PcTabs.php:307
#: PO_AuthorisationLevels.php:125 SMTPServer.php:110 UserSettings.php:117
@@ -1675,20 +1693,20 @@
#: BankAccountUsers.php:178
#, php-format
msgid "Are you sure you wish to un-authorise this user?"
-msgstr ""
+msgstr "您確定要取消授權此用戶？"
#: BankAccountUsers.php:178
#, php-format
msgid "Un-authorise"
-msgstr ""
+msgstr "未檢查"
#: BankAccountUsers.php:196
msgid "Select User"
-msgstr ""
+msgstr "選擇用戶"
#: BankMatching.php:6
msgid "Bank Account Matching"
-msgstr ""
+msgstr "銀行帳戶匹配"
#: BankMatching.php:17 PDFCustTransListing.php:45 Z_CheckDebtorsControl.php:74
msgid "Receipts"
@@ -1696,11 +1714,11 @@
#: BankMatching.php:19 BankMatching.php:28
msgid "Bank Matching"
-msgstr ""
+msgstr "銀行匹配"
#: BankMatching.php:19
msgid "Bank Account Matching - Receipts"
-msgstr ""
+msgstr "銀行帳戶匹配 - 預收"
#: BankMatching.php:26 PaymentAllocations.php:31 PaymentMethods.php:11
#: PDFSuppTransListing.php:41
@@ -1709,7 +1727,7 @@
#: BankMatching.php:28
msgid "Bank Account Matching - Payments"
-msgstr ""
+msgstr "銀行帳戶匹配 - 付款"
#: BankMatching.php:33
msgid "This page must be called with a bank transaction type"
@@ -1721,11 +1739,11 @@
#: BankMatching.php:53
msgid "Could not retrieve transaction information"
-msgstr ""
+msgstr "無法獲取交易信息"
#: BankMatching.php:60
msgid "Could not match off this payment because"
-msgstr ""
+msgstr "難道這不匹配的付款，因為關閉"
#: BankMatching.php:74
msgid "Could not update the amount matched off this bank transaction because"
@@ -1733,7 +1751,7 @@
#: BankMatching.php:82
msgid "Could not unclear this bank transaction because"
-msgstr "不能 未清算 此銀行交易, 因為"
+msgstr "此銀行交易不能核銷, 因為"
#: BankMatching.php:90
msgid ""
@@ -1741,13 +1759,15 @@
"Statement. Check your bank statement and click the check-box when you find "
"the matching transaction."
msgstr ""
+"檢查您的銀行月結單時，並單擊該複選框，當你找到比對的交易，使用這畫面ERP的收支"
+"表比對您的銀行對帳單。"
#: BankMatching.php:100 BankReconciliation.php:113 CounterReturns.php:829
#: Currencies.php:219 CustomerReceipt.php:803 DailyBankTransactions.php:40
#: Payments.php:778 PDFChequeListing.php:46 TaxAuthorities.php:151
#: TaxAuthorities.php:318
msgid "Bank Account"
-msgstr "銀行戶口"
+msgstr "銀行帳戶"
#: BankMatching.php:132 FormDesigner.php:103 ShopParameters.php:303
#: ShopParameters.php:307
@@ -1915,11 +1935,11 @@
#: BankMatching.php:286
msgid "Clear"
-msgstr "清算"
+msgstr "核銷"
#: BankMatching.php:286 BankMatching.php:312
msgid "Unclear"
-msgstr "未清算"
+msgstr "未核銷"
#: BankMatching.php:351
msgid "Update Matching"
@@ -1935,43 +1955,45 @@
"bank statement should be entered. The exchange difference has not been "
"calculated and no general ledger journal has been created"
msgstr ""
+"銀行對帳單餘額的項目不是數字。則在銀行對帳單餘額上就應輸入。匯兌差額未計算則"
+"總帳日記帳被建立"
#: BankReconciliation.php:43
msgid "Could not retrieve the exchange rate for the selected bank account"
-msgstr ""
+msgstr "無法檢索匯率所選銀行帳戶"
#: BankReconciliation.php:72 BankReconciliation.php:90
msgid "reconciliation on"
-msgstr ""
+msgstr "和解"
#: BankReconciliation.php:75 Currencies.php:200
msgid "Cannot insert a GL entry for the exchange difference because"
-msgstr ""
+msgstr "不能插入總帳輸入的匯兌差額"
#: BankReconciliation.php:76 Currencies.php:201
msgid "The SQL that failed to insert the exchange difference GL entry was"
-msgstr ""
+msgstr "插入的匯兌差額總帳條目中的SQL失敗"
#: BankReconciliation.php:96
msgid "Exchange difference of"
-msgstr ""
+msgstr "的匯兌差額"
#: BankReconciliation.php:96 Currencies.php:219
msgid "has been posted"
-msgstr ""
+msgstr "已發布"
#: BankReconciliation.php:109 SuppPaymentRun.php:317
msgid "The bank accounts could not be retrieved by the SQL because"
-msgstr "銀行戶口不能自SQL取得, 因為"
+msgstr "銀行帳戶不能自SQL取得, 因為"
#: BankReconciliation.php:110 CustomerReceipt.php:791
#: DailyBankTransactions.php:36 Payments.php:774 SuppPaymentRun.php:319
msgid "The SQL used to retrieve the bank accounts was"
-msgstr ""
+msgstr "用於檢索的銀行帳戶的SQL是"
#: BankReconciliation.php:120 CustomerReceipt.php:811
msgid "Bank Accounts have not yet been defined"
-msgstr "銀行戶口未有設定"
+msgstr "銀行帳戶未設定"
#: BankReconciliation.php:120 CustomerReceipt.php:811
msgid "You must first"
@@ -1980,30 +2002,30 @@
#: BankReconciliation.php:120 CustomerReceipt.php:811
#: DailyBankTransactions.php:46 Payments.php:786 SuppPaymentRun.php:332
msgid "define the bank accounts"
-msgstr "定義銀戶口"
+msgstr "設定銀行帳戶"
#: BankReconciliation.php:120 CustomerReceipt.php:811
#: DailyBankTransactions.php:46 Payments.php:786 SuppPaymentRun.php:332
msgid "and general ledger accounts to be affected"
-msgstr "和總帳戶口會受影"
+msgstr "和對應的會計科目"
#: BankReconciliation.php:143
msgid "Show bank reconciliation statement"
-msgstr "顯示銀行對數單"
+msgstr "顯示銀行對帳單"
#: BankReconciliation.php:164 Currencies.php:172
msgid "The bank account balance could not be returned by the SQL because"
-msgstr "銀行戶口結餘未能由 SQL 回, 因為"
+msgstr "無法返回銀行帳戶餘額, 原因是"
#: BankReconciliation.php:178
msgid ""
"Could not retrieve the currency and exchange rate for the selected bank "
"account"
-msgstr ""
+msgstr "無法檢索的貨幣和匯率選擇的銀行帳戶"
#: BankReconciliation.php:185
msgid "Balance as at"
-msgstr ""
+msgstr "結存"
#: BankReconciliation.php:209
msgid "The unpresented cheques could not be retrieved by the SQL because"
@@ -2060,15 +2082,15 @@
#: BankReconciliation.php:287
msgid "The uncleared deposits could not be retrieved by the SQL because"
-msgstr "未清算存入未能自 SQL 取得, 因為"
+msgstr "未核銷存入未能自 SQL 取得, 因為"
#: BankReconciliation.php:291
msgid "Less deposits not cleared"
-msgstr "存入差數未清算"
+msgstr "存入差數未核銷"
#: BankReconciliation.php:344
msgid "Total of all uncleared deposits"
-msgstr "未清算存入總計"
+msgstr "未核銷存入總計"
#: BankReconciliation.php:352
msgid "Bank statement balance should be"
@@ -2076,11 +2098,11 @@
#: BankReconciliation.php:362
msgid "Enter the actual bank statement balance"
-msgstr ""
+msgstr "輸入實際的銀行對帳單餘額"
#: BankReconciliation.php:366 BankReconciliation.php:379
msgid "Calculate and Post Exchange Difference"
-msgstr ""
+msgstr "計算和郵政匯兌差額"
#: BankReconciliation.php:366
msgid ""
@@ -2088,6 +2110,8 @@
"difference in the current balance of the account. It is important that the "
"exchange rate above reflects the current value of the bank account currency"
msgstr ""
+"這將新建一個總帳日記帳沖銷帳戶的當前餘額的匯兌差額。重要的是，匯價上反映了銀"
+"行帳戶貨幣的現值"
#: BankReconciliation.php:366 CounterReturns.php:740 CounterSales.php:836
#: Customers.php:1193 SelectOrderItems.php:1451 Stocks.php:1397
@@ -2105,52 +2129,56 @@
"exchange difference based on the current exchange rate to correct the "
"reconciliation to the actual bank statement balance click below."
msgstr ""
+"這是正常的外幣帳戶有需要被反映匯率變化的匯兌差額。這個對帳是利用設置在表中的"
+"貨幣匯率（見建立標籤）編制。此表必須保持與運行前對帳的現行匯率。如果你想新建"
+"一個日誌，以反映根據當前的匯率來更正對帳，以實際的銀行對帳單餘額點擊下面的匯"
+"兌差額。"
#: BankReconciliation.php:389 BankReconciliation.php:397
msgid "Match off cleared payments"
-msgstr "已清算付款配對"
+msgstr "關閉匹配核銷付款"
#: BankReconciliation.php:392 BankReconciliation.php:400
msgid "Match off cleared deposits"
-msgstr "已清算存入配對"
+msgstr "已核銷存入配對"
#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:154
#: BOMExtendedQty.php:250
msgid "Quantity Extended BOM Listing"
-msgstr ""
+msgstr "數量擴展的BOM清單"
#: BOMExtendedQty.php:30 BOMIndented.php:27 BOMIndentedReverse.php:26
#: MRPCalendar.php:86 MRP.php:27
msgid "The SQL to create passbom failed with the message"
-msgstr ""
+msgstr "新建passbom在SQL失敗消息"
#: BOMExtendedQty.php:43 BOMIndented.php:40 BOMIndentedReverse.php:39
#: MRP.php:34
msgid "Create of tempbom failed because"
-msgstr ""
+msgstr "新建tempbom的失敗，因為"
#: BOMExtendedQty.php:156
msgid ""
"The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
-msgstr ""
+msgstr "該Quantiy擴展的BOM清單不能由SQL來檢索，因為"
#: BOMExtendedQty.php:237 BOMIndented.php:231
msgid "Print Indented BOM Listing Error"
-msgstr ""
+msgstr "打印縮進的BOM清單錯誤"
#: BOMExtendedQty.php:239 BOMIndented.php:233
msgid "There were no items for the selected assembly"
-msgstr ""
+msgstr "所選定的組合沒有物料"
#: BOMExtendedQty.php:259 BOMIndented.php:253 BOMIndentedReverse.php:241
msgid "Part"
-msgstr ""
+msgstr "部分"
#: BOMExtendedQty.php:260
msgid ""
"Enter the item code that you wish to display the extended bill of material "
"for"
-msgstr ""
+msgstr "輸入您希望顯示材料結構的產品代碼"
#: BOMExtendedQty.php:263 BOMExtendedQty.php:330 BOMExtendedQty.php:331
#: BOMExtendedQty.php:332 BOMExtendedQty.php:333 BOMIndented.php:315
@@ -2215,21 +2243,21 @@
#: BOMExtendedQty.php:267
msgid "Selection Option"
-msgstr ""
+msgstr "選擇選項"
#: BOMExtendedQty.php:269
msgid "Show All Parts"
-msgstr ""
+msgstr "顯示所有配件"
#: BOMExtendedQty.php:270
msgid "Only Show Shortages"
-msgstr ""
+msgstr "只顯示短缺"
#: BOMExtendedQty.php:274 BOMIndented.php:265 BOMIndentedReverse.php:245
#: MRPPlannedPurchaseOrders.php:280 MRPPlannedWorkOrders.php:336
#: MRPReschedules.php:136 MRPShortages.php:293
msgid "Print Option"
-msgstr ""
+msgstr "打印選項"
#: BOMExtendedQty.php:276 BOMIndented.php:267 BOMIndentedReverse.php:247
#: MRPPlannedPurchaseOrders.php:282 MRPPlannedWorkOrders.php:338
@@ -2241,11 +2269,11 @@
#: MRPPlannedPurchaseOrders.php:283 MRPPlannedWorkOrders.php:339
#: MRPReschedules.php:139 MRPShortages.php:296
msgid "Plain Print"
-msgstr ""
+msgstr "普通打印"
#: BOMExtendedQty.php:310
msgid "Extended Quantity BOM Listing For\t "
-msgstr ""
+msgstr "擴展數量的BOM清單對於噸"
#: BOMExtendedQty.php:312 BOMIndented.php:302 BOMIndentedReverse.php:282
#: GLAccountReport.php:327 InventoryPlanningPrefSupplier.php:58
@@ -2343,11 +2371,11 @@
#: BOMExtendedQty.php:315
msgid "Build Quantity: "
-msgstr ""
+msgstr "建立產品數量："
#: BOMExtendedQty.php:322
msgid "Build"
-msgstr ""
+msgstr "建"
#: BOMExtendedQty.php:323 BOMInquiry.php:110 BOMs.php:899
#: CounterReturns.php:1684 CounterSales.php:2112 CounterSales.php:2293
@@ -2362,11 +2390,11 @@
#: BOMExtendedQty.php:324
msgid "P.O."
-msgstr ""
+msgstr "P.O."
#: BOMExtendedQty.php:325
msgid "W.O."
-msgstr ""
+msgstr "W.O."
#: BOMExtendedQty.php:327 BOMIndented.php:310 BOMIndentedReverse.php:290
#: InventoryQuantities.php:245 MRPDemands.php:294 MRPDemands.php:371
@@ -2378,18 +2406,18 @@
#: POReport.php:1419 POReport.php:1525 POReport.php:1610 POReport.php:1623
#: ReorderLevel.php:297 StockDispatch.php:502 StockDispatch.php:509
msgid "Part Number"
-msgstr ""
+msgstr "產品編號"
#: BOMExtendedQty.php:328 BOMIndented.php:311 BOMIndentedReverse.php:291
#: MRPShortages.php:351
msgid "M/B"
-msgstr ""
+msgstr "M/B"
#: BOMExtendedQty.php:329 POReport.php:549 POReport.php:635 POReport.php:726
#: POReport.php:1315 POReport.php:1366 POReport.php:1420 StockClone.php:663
#: StockClone.php:687 Stocks.php:964 Stocks.php:988
msgid "Part Description"
-msgstr "物料"
+msgstr "物料說明"
#: BOMExtendedQty.php:334 MRPShortages.php:356
msgid "Shortage"
@@ -2399,15 +2427,15 @@
#: BOMIndented.php:244 BOMIndented.php:301 BOMIndentedReverse.php:13
#: BOMIndentedReverse.php:14 BOMIndentedReverse.php:140
msgid "Indented BOM Listing"
-msgstr ""
+msgstr "鋸齒式BOM清單"
#: BOMIndented.php:152 BOMIndentedReverse.php:142
msgid "The Indented BOM Listing could not be retrieved by the SQL because"
-msgstr ""
+msgstr "縮進的BOM清單不能由SQL來檢索，因為"
#: BOMIndented.php:254
msgid "Enter the item code of parent item to list the bill of material for"
-msgstr ""
+msgstr "輸入父項目的項目代碼列出材料的法案"
#: BOMIndented.php:257
msgid "Levels"
@@ -2479,7 +2507,7 @@
#: BOMIndented.php:314 BOMIndentedReverse.php:294
msgid "WC"
-msgstr ""
+msgstr "WC"
#: BOMIndented.php:323
msgid "Assembly:"
@@ -2487,27 +2515,27 @@
#: BOMIndented.php:328 BOMIndentedReverse.php:306
msgid " 12345678901234567890"
-msgstr ""
+msgstr " 12345678901234567890"
#: BOMIndentedReverse.php:218
msgid "Print Reverse Indented BOM Listing Error"
-msgstr ""
+msgstr "打印反向縮進的BOM清單錯誤"
#: BOMIndentedReverse.php:220
msgid "There were no items for the selected component"
-msgstr ""
+msgstr "有所選組件中沒有商品"
#: BOMIndentedReverse.php:231 BOMIndentedReverse.php:281
msgid "Reverse Indented BOM Listing"
-msgstr ""
+msgstr "反向縮進的BOM清單"
#: BOMIndentedReverse.php:242
msgid "Enter the item code required to list the bill of material for"
-msgstr ""
+msgstr "輸入需要列出材料的帳單項目代碼"
#: BOMIndentedReverse.php:300
msgid "Component:"
-msgstr ""
+msgstr "組件："
#: BOMInquiry.php:6
msgid "Costed Bill Of Material"
@@ -2527,7 +2555,7 @@
#: BOMInquiry.php:21 BOMs.php:876
msgid "Parts must be defined in the stock item entry"
-msgstr "部件必須在存貨物品中定義"
+msgstr "部件必須在存貨商品中定義"
#: BOMInquiry.php:21 BOMs.php:876
msgid "modification screen as manufactured"
@@ -2593,7 +2621,7 @@
#: WorkOrderIssue.php:683 Z_ChangeStockCategory.php:92
#: Z_ChangeStockCode.php:177 ../webSHOP/includes/PlaceOrder.php:235
msgid "Stock Code"
-msgstr "存貨編碼"
+msgstr "物料編號"
#: BOMInquiry.php:35 BOMs.php:887 ContractBOM.php:342 Contracts.php:769
#: CounterReturns.php:1656 CounterSales.php:2266 CustomerReceipt.php:1186
@@ -2688,7 +2716,7 @@
#: BOMInquiry.php:186
msgid "Return to Main Menu"
-msgstr ""
+msgstr "返回到主菜單"
#: BOMInquiry.php:195
msgid "per"
@@ -2716,11 +2744,11 @@
#: BOMInquiry.php:244
msgid "Labour Cost"
-msgstr ""
+msgstr "勞工成本"
#: BOMInquiry.php:247
msgid "Overhead Cost"
-msgstr ""
+msgstr "間接成本"
#: BOMInquiry.php:258
msgid "Enter a stock item code above"
@@ -2745,7 +2773,7 @@
#: BOMListing.php:54
msgid "The Bill of Material listing has no bills to report on"
-msgstr "BOM清單沒有要報告於"
+msgstr "BOM清單沒有要報表於"
#: BOMListing.php:120
msgid "From Inventory Part Code"
@@ -2755,7 +2783,7 @@
msgid ""
"Enter the lowest alpha code of parent bom items to list the bill of material "
"for"
-msgstr ""
+msgstr "於材料結構中輸入父BOM的物料小寫字母代碼"
#: BOMListing.php:124
msgid "To Inventory Part Code"
@@ -2765,7 +2793,7 @@
msgid ""
"Enter the end alpha numeric code of any parent bom items to list the bill of "
"material for"
-msgstr ""
+msgstr "於材料結構中輸入任何父BOM產品的最後文數字代碼"
#: BOMs.php:7
msgid "Multi-Level Bill Of Materials Maintenance"
@@ -2816,15 +2844,15 @@
#, php-format
msgid ""
"Are you sure you wish to delete this component from the bill of material?"
-msgstr ""
+msgstr "你確定你想從物料清單中刪除此組件？"
#: BOMs.php:244
msgid "The effective after date field must be a date in the format"
-msgstr ""
+msgstr "生效後的日期字段必須是格式的日期"
#: BOMs.php:250
msgid "The effective to date field must be a date in the format"
-msgstr ""
+msgstr "在有效日期字段必須是格式的日期"
#: BOMs.php:256 StockAdjustments.php:159 StockTransfers.php:174
#: WorkOrderEntry.php:317
@@ -2866,7 +2894,7 @@
"orders to be specified so autoissue is not an option. Auto issue has been "
"automatically set to off for this component"
msgstr ""
-"自有非序號或非批號控制物品可以被設為自動發放. 這發放到工作訂單的物品須要指定"
+"自有非序號或非批號控制商品可以被設為自動發放. 這發放到工作訂單的商品須要指定"
"批號/序號, 所以不能選取自動發放. 這零件的自動發放會自動設為關閉"
#: BOMs.php:304
@@ -2974,7 +3002,7 @@
#: BOMs.php:442 BOMs.php:534 StockClone.php:857 StockClone.php:859
#: Stocks.php:1144 Stocks.php:1146
msgid "Phantom"
-msgstr ""
+msgstr "倣真"
#: BOMs.php:446
msgid "Select a Different BOM"
@@ -2982,11 +3010,11 @@
#: BOMs.php:462
msgid "Manufactured parent items"
-msgstr "自產主物品"
+msgstr "自產主商品"
#: BOMs.php:485
msgid "Assembly parent items"
-msgstr "組裝主物品"
+msgstr "組裝主商品"
#: BOMs.php:509
msgid "Kit sets"
@@ -3050,7 +3078,7 @@
#: BOMs.php:647
msgid "New Component Details"
-msgstr ""
+msgstr "新組件詳細信息"
#: BOMs.php:650
msgid "Component code"
@@ -3066,7 +3094,7 @@
#: BOMs.php:693
msgid "Sequence in BOM"
-msgstr ""
+msgstr "材料清單(BOM)次序"
#: BOMs.php:720
msgid "Work Centre Added"
@@ -3086,7 +3114,7 @@
#: BOMs.php:749
msgid "Enter the quantity of this item required for the parent item"
-msgstr ""
+msgstr "輸入所需的父項資料的數量"
#: BOMs.php:777
msgid "Auto Issue this Component to Work Orders"
@@ -3098,11 +3126,11 @@
#: COGSGLPostings.php:7
msgid "Cost Of Sales GL Postings Set Up"
-msgstr "總帳銷售成本過帳記定"
+msgstr "設定總帳銷售成本過帳"
#: COGSGLPostings.php:37
msgid "Cost of sales GL posting code has been updated"
-msgstr "總帳銷售成本過帳編碼已新"
+msgstr "更新總帳銷售成本過帳編碼"
#: COGSGLPostings.php:53
msgid "A new cost of sales posting code has been inserted"
@@ -3131,7 +3159,7 @@
#: SalesInquiry.php:774 SalesInquiry.php:809 SalesInquiry.php:976
#: SalesInquiry.php:1233
msgid "Stock Category"
-msgstr "存貨類別"
+msgstr "物料組"
#: COGSGLPostings.php:94 COGSGLPostings.php:199 COGSGLPostings.php:316
#: Customers.php:513 Customers.php:855 Customers.php:860 DiscountMatrix.php:97
@@ -3141,7 +3169,7 @@
#: SalesGLPostings.php:363 SelectOrderItems.php:739 api/api_xml-rpc.php:979
#: api/api_xml-rpc.php:1022
msgid "Sales Type"
-msgstr "銷售種類"
+msgstr "銷售方式"
#: COGSGLPostings.php:95
msgid "COGS Account"
@@ -3150,13 +3178,13 @@
#: COGSGLPostings.php:113 COGSGLPostings.php:217
#, php-format
msgid "Are you sure you wish to delete this COGS GL posting record?"
-msgstr ""
+msgstr "您確定要刪除這個COGS總帳過帳記錄？"
#: COGSGLPostings.php:200 CustomerReceipt.php:1092 GLJournal.php:387
#: GLTransInquiry.php:44 Payments.php:1082 SupplierTransInquiry.php:172
#: TaxAuthorities.php:148 TaxAuthorities.php:149
msgid "GL Account"
-msgstr "總帳帳目"
+msgstr "會計科目"
#: COGSGLPostings.php:235
msgid "Show all cost of sales posting records"
@@ -3173,15 +3201,15 @@
#: PricesByCost.php:268 SalesGLPostings.php:363 SelectOrderItems.php:739
#: SuppPriceList.php:138 SuppPriceList.php:251
msgid "Price List"
-msgstr "價目表"
+msgstr "價格表"
#: COGSGLPostings.php:333
msgid "Post to GL account"
-msgstr "過數到總帳"
+msgstr "拋轉到總帳帳戶"
#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:433
msgid "Company Preferences"
-msgstr "公司設定"
+msgstr "公司偏好設定"
#: CompanyPreferences.php:32
msgid "The company name must be entered and be fifty characters or less long"
@@ -3189,19 +3217,19 @@
#: CompanyPreferences.php:39 Suppliers.php:375 Z_ImportSuppliers.php:177
msgid "The email address is not correctly formed"
-msgstr ""
+msgstr "電子郵件地址格式不正確"
#: CompanyPreferences.php:73
msgid "The company preferences could not be updated because"
-msgstr "公司設定不能更新, 因為"
+msgstr "公司篇好設定不能更新, 因為"
#: CompanyPreferences.php:75
msgid "Company preferences updated"
-msgstr "公司設定已更新"
+msgstr "公司偏好設定已更新"
#: CompanyPreferences.php:87
msgid "Could not update the currency rates"
-msgstr ""
+msgstr "無法更新貨幣匯率"
#: CompanyPreferences.php:97 Customers.php:279 ShopParameters.php:185
#: Suppliers.php:622 SystemParameters.php:350
@@ -3219,17 +3247,17 @@
#: CompanyPreferences.php:173
msgid "to appear on reports"
-msgstr "在報告中顯示"
+msgstr "在報表中顯示"
#: CompanyPreferences.php:174
msgid ""
"Enter the name of the business. This will appear on all reports and at the "
"top of each screen. "
-msgstr ""
+msgstr "輸入公司的名稱。這名稱將出現在所有的報表及螢幕頂部上。"
#: CompanyPreferences.php:178
msgid "Official Company Number"
-msgstr "官式公司編號"
+msgstr "官方的公司編號"
#: CompanyPreferences.php:183
msgid "Tax Authority Reference"
@@ -3243,7 +3271,7 @@
msgid ""
"Enter the first line of the company registered office. This will appear on "
"invoices and statements."
-msgstr ""
+msgstr "輸入第一行公司註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:193 Factors.php:214
msgid "Address Line 2"
@@ -3253,7 +3281,7 @@
msgid ""
"Enter the second line of the company registered office. This will appear on "
"invoices and statements."
-msgstr ""
+msgstr "輸入第二行公司註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:198 Factors.php:218
msgid "Address Line 3"
@@ -3263,7 +3291,7 @@
msgid ""
"Enter the third line of the company registered office. This will appear on "
"invoices and statements."
-msgstr ""
+msgstr "輸入第三行公司註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:203 Factors.php:222
msgid "Address Line 4"
@@ -3273,7 +3301,7 @@
msgid ""
"Enter the fourth line of the company registered office. This will appear on "
"invoices and statements."
-msgstr ""
+msgstr "輸入第四行公司註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:208 Factors.php:226
msgid "Address Line 5"
@@ -3291,7 +3319,7 @@
msgid ""
"Enter the main telephone number of the company registered office. This will "
"appear on invoices and statements."
-msgstr ""
+msgstr "輸入公司主要的電話於註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:223
msgid "Facsimile Number"
@@ -3301,13 +3329,13 @@
#: Suppliers.php:956 SupplierTenderCreate.php:410 SuppLoginSetup.php:145
#: WWW_Users.php:466 ../webSHOP/Checkout.php:555
msgid "Email Address"
-msgstr ""
+msgstr "電子郵件地址"
#: CompanyPreferences.php:229
msgid ""
"Enter the main company email address. This will appear on invoices and "
"statements."
-msgstr ""
+msgstr "輸入公司主要的電子郵件於註冊處。這註冊文字將出現在發票和報表上。"
#: CompanyPreferences.php:237
msgid "Home Currency"
@@ -3315,7 +3343,7 @@
#: CompanyPreferences.php:262
msgid "Debtors Control GL Account"
-msgstr "借方控制總帳"
+msgstr "應收總帳科目"
#: CompanyPreferences.php:263
msgid ""
@@ -3324,10 +3352,12 @@
"the total amount owed by customers to the business. Only balance sheet "
"accounts are available for this selection."
msgstr ""
+"選擇要用於發布所有客戶交易的當地貨幣價值的總帳科目。此帳戶將永遠代表客戶所欠"
+"的業務總量。只有結算帳戶可用於此選擇。"
#: CompanyPreferences.php:279
msgid "Creditors Control GL Account"
-msgstr "貸方控制總帳"
+msgstr "應付總帳科目"
#: CompanyPreferences.php:280
msgid ""
@@ -3336,14 +3366,16 @@
"the total amount owed by the business to suppliers. Only balance sheet "
"accounts are available for this selection."
msgstr ""
+"選擇要用於發布所有供應商交易的當地貨幣價值的總帳科目。此帳戶將始終代表由企業"
+"欠供應商的總金額。只有結算帳戶可用於此選擇。"
#: CompanyPreferences.php:296
msgid "Payroll Net Pay Clearing GL Account"
-msgstr "總帳的工資支出會計清算"
+msgstr "工資總帳科目"
#: CompanyPreferences.php:313
msgid "Goods Received Clearing GL Account"
-msgstr "總帳的收貨會計清算"
+msgstr "收貨總帳科目"
#: CompanyPreferences.php:314
msgid ""
@@ -3352,10 +3384,12 @@
"will represent the value of goods received yet to be invoiced by suppliers. "
"Only balance sheet accounts are available for this selection."
msgstr ""
+"選擇總帳帳戶用於發布商品成本以待收到供應商發票的進口的貨物。此帳戶將代表尚未"
+"收到由供應商開具發票的貨物價值。只有結算帳戶可用於此選擇。"
#: CompanyPreferences.php:329
msgid "Retained Earning Clearing GL Account"
-msgstr "總帳的保留收益會計清算"
+msgstr "保留收益總帳科目"
#: CompanyPreferences.php:330
msgid ""
@@ -3363,14 +3397,16 @@
"accounts to that represents the accumulated retained profits of the "
"business. Only balance sheet accounts are available for this selection."
msgstr ""
+"選擇總帳帳戶用於結算損益帳，以表示該業務的累計未分配的利潤。只有結算帳戶可用"
+"於此選擇。"
#: CompanyPreferences.php:346
msgid "Freight Re-charged GL Account"
-msgstr "總帳的收回運輸的"
+msgstr "運費總帳科目"
#: CompanyPreferences.php:371
msgid "Sales Exchange Variances GL Account"
-msgstr "總帳的銷售交易差異"
+msgstr "銷售匯率差異總帳科目"
#: CompanyPreferences.php:372
msgid ""
@@ -3381,10 +3417,12 @@
"account. Only profit and loss general ledger accounts are available for this "
"selection."
msgstr ""
+"選擇要用於張貼應收帳款匯率差異的總帳科目 -以客戶收取貨幣的匯率，銷售發票的匯"
+"率是不同的，匯率自動計算並拋到這個總帳科目。僅損益總帳帳戶可用於此選擇。"
#: CompanyPreferences.php:388
msgid "Purchases Exchange Variances GL Account"
-msgstr "總帳的採購差異"
+msgstr "採購匯率差異總帳科目"
#: CompanyPreferences.php:389
msgid ""
@@ -3395,10 +3433,13 @@
"this general ledger account. Only profit and loss general ledger accounts "
"are available for this selection."
msgstr ""
+"選擇要用於張貼在應付帳款交易的匯兌差額的總帳科目。輸入一種貨幣，並以供應商的"
+"支付貨幣，以不同的匯率供應商發票具有自動計算並拋到這個總帳科目的差異。僅損益"
+"總帳帳戶可用於此選擇。"
#: CompanyPreferences.php:405
msgid "Payment Discount GL Account"
-msgstr "總帳的付報折扣"
+msgstr "現金折扣總帳科目"
#: CompanyPreferences.php:406
msgid ""
@@ -3406,10 +3447,12 @@
"payment discounts given to customers at the time of entering a receipt. Only "
"profit and loss general ledger accounts are available for this selection."
msgstr ""
+"選擇要用於張貼在輸入收貨時間給予客戶付款折扣價值的總帳科目。僅損益總帳帳戶可"
+"用於此選擇。"
#: CompanyPreferences.php:422
msgid "Create GL entries for accounts receivable transactions"
-msgstr "為總帳產生應收帳交易"
+msgstr "為應收帳交易產生總帳憑證"
#: CompanyPreferences.php:423
msgid ""
@@ -3418,10 +3461,12 @@
"account (selected above) to ensure it should always balance to the list of "
"customer balances in local currency."
msgstr ""
+"選擇yes，以確保ERP新建總帳報表的所有應收帳款的交易。 ERP將維持債務人帳戶控制"
+"（上面選擇），以確保它應該總是以當地貨幣來平衡客戶結餘表。"
#: CompanyPreferences.php:437
msgid "Create GL entries for accounts payable transactions"
-msgstr "為總帳產生應付帳交易"
+msgstr "為應付帳交易產生總帳憑證"
#: CompanyPreferences.php:438
msgid ""
@@ -3430,10 +3475,12 @@
"account (selected above) to ensure it should always balance to the list of "
"supplier balances in local currency."
msgstr ""
+"選擇yes，以確保ERP新建總帳日記帳的所有應付帳款交易。 ERP將維持債權人控制的帳"
+"戶（上面選擇），以確保它應該總是以當地貨幣平衡供應商餘額清單。"
#: CompanyPreferences.php:452
msgid "Create GL entries for stock transactions"
-msgstr "為總帳產生存貨交易"
+msgstr "為庫存帳交易產生總帳憑證"
#: CompanyPreferences.php:453
msgid ""
@@ -3442,6 +3489,8 @@
"(selected under the inventory categories set up) to ensure they balance. "
"Only balance sheet general ledger accounts can be selected."
msgstr ""
+"只有資產負債表總帳科目可以選擇。選擇yes，以確保ERP新建總帳報表的所有庫存交"
+"易。 ERP將保持庫存管理帳目（根據設置存貨類別選擇），以確保它們的平衡。"
#: CompanyPreferences.php:470 ConfirmDispatch_Invoice.php:652
#: ConfirmDispatch_Invoice.php:1691 Credit_Invoice.php:1593
@@ -3462,17 +3511,17 @@
#: ConfirmDispatchControlled_Invoice.php:8
msgid "Specify Dispatched Controlled Items"
-msgstr "指定派送控制物品"
+msgstr "指定派送控制商品"
#: ConfirmDispatchControlled_Invoice.php:27
msgid "Select a line item to invoice"
-msgstr "選擇列物品到發票"
+msgstr "選擇列商品到發票"
#: ConfirmDispatchControlled_Invoice.php:30
msgid ""
"This page can only be opened if a line item on a sales order to be invoiced "
"has been selected"
-msgstr "此頁只能在銷售訂單中的一列物品被選擇到發票時才能開啟"
+msgstr "此頁只能在銷售訂單中的一列商品被選擇到發票時才能開啟"
#: ConfirmDispatchControlled_Invoice.php:30 CreditItemsControlled.php:38
#: CreditItemsControlled.php:49 GoodsReceivedControlled.php:30
@@ -3488,7 +3537,7 @@
msgid ""
"This page can only be opened if a sales order and line item has been "
"selected Please do that first"
-msgstr "此頁只能在銷售訂單中的列物品被選擇到發票時才能開啟, 請先做這個"
+msgstr "此頁只能在銷售訂單中的列商品被選擇到發票時才能開啟, 請先做這個"
#: ConfirmDispatchControlled_Invoice.php:54
msgid "Back to the Sales Order"
@@ -3498,7 +3547,7 @@
msgid ""
"The line item must be defined as controlled to require input of the batch "
"numbers or serial numbers being sold"
-msgstr "在銷售時要求輸入批次號或序列號, 列物品必須定義為受控的"
+msgstr "在銷售時要求輸入批次號或序列號, 列商品必須定義為受控的"
#: ConfirmDispatchControlled_Invoice.php:66
msgid "Back to Confirmation of Dispatch"
@@ -3519,7 +3568,7 @@
#: ConfirmDispatchControlled_Invoice.php:68
msgid "Controlled items"
-msgstr "控制物品"
+msgstr "控制商品"
#: ConfirmDispatchControlled_Invoice.php:68 GoodsReceivedControlled.php:68
msgid "on order"
@@ -3527,7 +3576,7 @@
#: ConfirmDispatch_Invoice.php:9
msgid "Confirm Dispatches and Invoice An Order"
-msgstr ""
+msgstr "確認急件和發票的訂單"
#: ConfirmDispatch_Invoice.php:34
msgid ""
@@ -3549,7 +3598,7 @@
#: ConfirmDispatch_Invoice.php:170 Credit_Invoice.php:140 OrderDetails.php:152
#: RecurringSalesOrders.php:135 SelectOrderItems.php:229
msgid "The line items of the order cannot be retrieved because"
-msgstr "訂單的列物品未能取, 因為"
+msgstr "訂單的列商品未能取, 因為"
#: ConfirmDispatch_Invoice.php:211
msgid ""
@@ -3559,7 +3608,7 @@
#: ConfirmDispatch_Invoice.php:221
msgid "This order item could not be retrieved. Please select another order"
-msgstr "訂單物品不能提取, 請選擇其他訂單"
+msgstr "訂單商品不能提取, 請選擇其他訂單"
#: ConfirmDispatch_Invoice.php:268
msgid "Confirm Invoice"
@@ -3567,7 +3616,7 @@
#: ConfirmDispatch_Invoice.php:269
msgid "Confirm Dispatch and Invoice"
-msgstr ""
+msgstr "確認調度和發票"
#: ConfirmDispatch_Invoice.php:272 Contracts.php:778 CustLoginSetup.php:32
#: CustomerAllocations.php:347 CustomerBranches.php:403
@@ -3619,7 +3668,7 @@
#: ConfirmDispatch_Invoice.php:276
msgid "Invoice amounts stated in"
-msgstr "發票總計陳述於"
+msgstr "貨幣別:"
#: ConfirmDispatch_Invoice.php:290 ContractBOM.php:241 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:992 CounterReturns.php:667
@@ -3671,13 +3720,13 @@
#: includes/PO_PDFOrderPageHeader.inc:76
#: ../webSHOP/includes/DisplayShoppingCart.php:6
msgid "Item Description"
-msgstr "物品內容"
+msgstr "物料內容"
#: ConfirmDispatch_Invoice.php:292 GoodsReceived.php:102 GoodsReceived.php:106
#: PDFOrdersInvoiced.php:333 PDFOrderStatus.php:330 Shipments.php:401
#: Shipments....
[truncated message content] |
|
From: <dai...@us...> - 2014-03-14 22:17:34
|
Revision: 6607
http://sourceforge.net/p/web-erp/reponame/6607
Author: daintree
Date: 2014-03-14 22:17:30 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Andrew Galuski Auto Supplier numbering
Modified Paths:
--------------
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2014-03-14 20:30:35 UTC (rev 6606)
+++ trunk/Suppliers.php 2014-03-14 22:17:30 UTC (rev 6607)
@@ -305,8 +305,8 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
if (isset($SupplierID)) {
echo '<p>
- <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a>
- </p>';
+ <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a>
+ </p>';
}
$InputError = 0;
@@ -340,7 +340,7 @@
$Errors[$i]='Name';
$i++;
}
- if (mb_strlen($SupplierID) == 0) {
+ if ($_SESSION['AutoSupplierNo']==0 AND mb_strlen($SupplierID) == 0) {
$InputError = 1;
prnMsg(_('The Supplier Code cannot be empty'),'error');
$Errors[$i]='ID';
@@ -532,7 +532,10 @@
prnMsg(_('The supplier master record for') . ' ' . $SupplierID . ' ' . _('has been updated'),'success');
} else { //its a new supplier
-
+ if ($_SESSION['AutoSupplierNo']== 1) {
+ /* system assigned, sequential, numeric */
+ $SupplierID = GetNextTransNo(600, $db);
+ }
$sql = "INSERT INTO suppliers (supplierid,
suppname,
address1,
@@ -591,7 +594,11 @@
prnMsg(_('A new supplier for') . ' ' . $_POST['SuppName'] . ' ' . _('has been added to the database'),'success');
- unset($SupplierID);
+ echo '<p>
+ <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a>
+ </p>';
+
+ unset($SupplierID);
unset($_POST['SuppName']);
unset($_POST['Address1']);
unset($_POST['Address2']);
@@ -681,9 +688,13 @@
echo '<input type="hidden" name="New" value="Yes" />';
echo '<table class="selection">';
- echo '<tr><td>' . _('Supplier Code') . ':</td>
- <td><input type="text" data-type="no-illegal-chars" title="'._('The supplier id should not be within 10 legal characters and cannot be blank').'" required="required" name="SupplierID" placeholder="'._('within 10 characters').'" size="11" maxlength="10" /></td>
- </tr>';
+
+ /* if $AutoSupplierNo is off (not 0) then provide an input box for the SupplierID to manually assigned */
+ if ($_SESSION['AutoSupplierNo']== 0 ) {
+ echo '<tr><td>' . _('Supplier Code') . ':</td>
+ <td><input type="text" data-type="no-illegal-chars" title="'._('The supplier id should not be within 10 legal characters and cannot be blank').'" required="required" name="SupplierID" placeholder="'._('within 10 characters').'" size="11" maxlength="10" /></td>
+ </tr>';
+ }
echo '<tr>
<td>' . _('Supplier Name') . ':</td>
<td><input type="text" pattern="(?!^\s+$)[^<>+]{1,40}" required="required" title="'._('The supplier name should not be blank and should be less than 40 legal characters').'" name="SuppName" size="42" placeholder="'._('Within 40 legal characters').'" maxlength="40" /></td>
@@ -849,8 +860,9 @@
<div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
echo '</div>
</form>';
+}
-} else {
+else {
//SupplierID exists - either passed when calling the form or from the form itself
@@ -916,27 +928,43 @@
} else {
// its a new supplier being added
+
echo '<tr><td><input type="hidden" name="New" value="Yes" />';
- echo _('Supplier Code') . ':</td>
- <td><input '.(in_array('ID',$Errors) ? 'class="inputerror"' : '').' type="text" name="SupplierID" value="' . $SupplierID . '" size="12" maxlength="10" /></td></tr>';
+ /* if $AutoSupplierNo is off (i.e. 0) then provide an input box for the SupplierID to manually assigned */
+ if ($_SESSION['AutoSupplierNo']== 0 ) {
+ echo _('Supplier Code') . ':</td>
+ <td><input '.(in_array('ID',$Errors) ? 'class="inputerror"' : '').' type="text" name="SupplierID" value="' . $SupplierID . '" size="12" maxlength="10" /></td></tr>';
+ }
}
- echo '<tr><td>' . _('Supplier Name') . ':</td>
- <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="text" name="SuppName" value="' . $_POST['SuppName'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
- <td><input type="text" name="Address1" value="' . $_POST['Address1'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 2 (Street)') . ':</td>
- <td><input type="text" name="Address2" value="' . $_POST['Address2'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 3 (Suburb/City)') . ':</td>
- <td><input type="text" name="Address3" placeholder="'._('Within 40 characters').'" value="' . $_POST['Address3'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 4 (State/Province)') . ':</td>
- <td><input type="text" name="Address4" value="' . $_POST['Address4'] . '" placeholder="'._('Within 40 characters').'" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 5 (Postal Code)') . ':</td>
- <td><input type="text" name="Address5" value="' . $_POST['Address5'] . '" size="42" placeholder="'._('Witin 40 characters').'" maxlength="40" /></td></tr>';
-
echo '<tr>
+ <td>' . _('Supplier Name') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="text" name="SuppName" value="' . $_POST['SuppName'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 1 (Street)') . ':</td>
+ <td><input type="text" name="Address1" value="' . $_POST['Address1'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 2 (Street)') . ':</td>
+ <td><input type="text" name="Address2" value="' . $_POST['Address2'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 3 (Suburb/City)') . ':</td>
+ <td><input type="text" name="Address3" placeholder="'._('Within 40 characters').'" value="' . $_POST['Address3'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 4 (State/Province)') . ':</td>
+ <td><input type="text" name="Address4" value="' . $_POST['Address4'] . '" placeholder="'._('Within 40 characters').'" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 5 (Postal Code)') . ':</td>
+ <td><input type="text" name="Address5" value="' . $_POST['Address5'] . '" size="42" placeholder="'._('Witin 40 characters').'" maxlength="40" /></td>
+ </tr>
+ <tr>
<td>' . _('Country') . ':</td>
<td><select name="Address6">';
+
foreach ($CountriesArray as $CountryEntry => $CountryName){
if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
@@ -949,15 +977,24 @@
echo '</select></td>
</tr>';
- echo '<tr><td>' . _('Telephone') . ':</td>
- <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Phone" value="' . $_POST['Phone'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td>
- <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Fax" value="' . $_POST['Fax'] . '" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="email" title="'._('The input must be in email format').'" name="Email" value="' . $_POST['Email'] . '" size="42" maxlength="40" placeholder="'._('email format such as xx...@ma...').'" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td></tr>';
- echo '<tr><td>' . _('URL') . ':</td>
- <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="url" title="'._('The input must be in url format').'" name="URL" value="' . $_POST['URL'] . '" size="42" maxlength="40" placeholder="'._('url format such as www.example.com').'" /></td></tr>';
- echo '<tr><td>' . _('Supplier Type') . ':</td>
+ echo '<tr>
+ <td>' . _('Telephone') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Phone" value="' . $_POST['Phone'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Facsimile') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Fax" value="' . $_POST['Fax'] . '" size="42" maxlength="40" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Email Address') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="email" title="'._('The input must be in email format').'" name="Email" value="' . $_POST['Email'] . '" size="42" maxlength="40" placeholder="'._('email format such as xx...@ma...').'" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td>
+ </tr>
+ <tr>
+ <td>' . _('URL') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="url" title="'._('The input must be in url format').'" name="URL" value="' . $_POST['URL'] . '" size="42" maxlength="40" placeholder="'._('url format such as www.example.com').'" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Supplier Type') . ':</td>
<td><select name="SupplierType">';
$result=DB_query("SELECT typeid, typename FROM suppliertype", $db);
while ($myrow = DB_fetch_array($result)) {
@@ -967,20 +1004,29 @@
echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
}
} //end while loop
- echo '</select></td></tr>';
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('Supplier Since') . ' (' . $_SESSION['DefaultDateFormat'] .'):</td>
+ <td><input '.(in_array('SupplierSince',$Errors) ? 'class="inputerror"' : '').' size="12" maxlength="10" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="SupplierSince" value="' . $_POST['SupplierSince'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Bank Particulars') . ':</td>
+ <td><input type="text" name="BankPartics" size="13" maxlength="12" value="' . $_POST['BankPartics'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Bank Reference') . ':</td>
+ <td><input '.(in_array('BankRef',$Errors) ? 'class="inputerror"' : '').' type="text" name="BankRef" size="13" maxlength="12" value="' . $_POST['BankRef'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Bank Account No') . ':</td>
+ <td><input type="text" name="BankAct" size="31" maxlength="30" value="' . $_POST['BankAct'] . '" /></td>
+ </tr>';
- echo '<tr><td>' . _('Supplier Since') . ' (' . $_SESSION['DefaultDateFormat'] .'):</td>
- <td><input '.(in_array('SupplierSince',$Errors) ? 'class="inputerror"' : '').' size="12" maxlength="10" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="SupplierSince" value="' . $_POST['SupplierSince'] . '" /></td></tr>';
- echo '<tr><td>' . _('Bank Particulars') . ':</td>
- <td><input type="text" name="BankPartics" size="13" maxlength="12" value="' . $_POST['BankPartics'] . '" /></td></tr>';
- echo '<tr><td>' . _('Bank Reference') . ':</td>
- <td><input '.(in_array('BankRef',$Errors) ? 'class="inputerror"' : '').' type="text" name="BankRef" size="13" maxlength="12" value="' . $_POST['BankRef'] . '" /></td></tr>';
- echo '<tr><td>' . _('Bank Account No') . ':</td>
- <td><input type="text" name="BankAct" size="31" maxlength="30" value="' . $_POST['BankAct'] . '" /></td></tr>';
-
$result=DB_query("SELECT terms, termsindicator FROM paymentterms", $db);
- echo '<tr><td>' . _('Payment Terms') . ':</td>
+ echo '<tr>
+ <td>' . _('Payment Terms') . ':</td>
<td><select name="PaymentTerms">';
while ($myrow = DB_fetch_array($result)) {
@@ -995,7 +1041,8 @@
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
- echo '<tr><td>' . _('Factor Company') . ':</td>
+ echo '<tr>
+ <td>' . _('Factor Company') . ':</td>
<td><select name="FactorID">';
echo '<option value="0">' . _('None') . '</option>';
while ($myrow = DB_fetch_array($result)) {
@@ -1007,12 +1054,15 @@
} //end while loop
DB_data_seek($result, 0);
echo '</select></td></tr>';
- echo '<tr><td>' . _('Tax Reference') . ':</td>
- <td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td></tr>';
+ echo '<tr>
+ <td>' . _('Tax Reference') . ':</td>
+ <td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td>
+ </tr>';
$result=DB_query("SELECT currency, currabrev FROM currencies", $db);
- echo '<tr><td>' . _('Supplier Currency') . ':</td>
+ echo '<tr>
+ <td>' . _('Supplier Currency') . ':</td>
<td><select name="CurrCode">';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrCode'] == $myrow['currabrev']){
@@ -1023,8 +1073,10 @@
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>
- <tr><td>' . _('Remittance Advice') . ':</td>
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('Remittance Advice') . ':</td>
<td><select name="Remittance">';
if ($_POST['Remittance'] == 0){
@@ -1036,9 +1088,10 @@
}
- echo '</select></td></tr>';
-
- echo '<tr><td>' . _('Tax Group') . ':</td>
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('Tax Group') . ':</td>
<td><select name="TaxGroup">';
DB_data_seek($result, 0);
@@ -1055,7 +1108,9 @@
} //end while loop
- echo '</select></td></tr></table>';
+ echo '</select></td>
+ </tr>
+ </table>';
if (isset($_POST['New'])) {
echo '<br />
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-03-14 20:30:35 UTC (rev 6606)
+++ trunk/SystemParameters.php 2014-03-14 22:17:30 UTC (rev 6607)
@@ -216,6 +216,9 @@
if ($_SESSION['AutoDebtorNo'] != $_POST['X_AutoDebtorNo'] ) {
$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_AutoDebtorNo'])."' WHERE confname = 'AutoDebtorNo'";
}
+ if ($_SESSION['AutoSupplierNo'] != $_POST['X_AutoSupplierNo'] ) {
+ $sql[] = "UPDATE config SET confvalue = '". ($_POST['X_AutoSupplierNo'])."' WHERE confname = 'AutoSupplierNo'";
+ }
if ($_SESSION['HTTPS_Only'] != $_POST['X_HTTPS_Only'] ) {
$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_HTTPS_Only'])."' WHERE confname = 'HTTPS_Only'";
}
@@ -397,12 +400,12 @@
// PastDueDays1
echo '<tr style="outline: 1px solid"><td>' . _('First Overdue Deadline in (days)') . ':</td>
- <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[-\d]+" title="'._('The input must be integer').'" name="X_PastDueDays1" value="' . $_SESSION['PastDueDays1'] . '" size="3" maxlength="3" /></td>
+ <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[\d]+" title="'._('The input must be integer').'" name="X_PastDueDays1" value="' . $_SESSION['PastDueDays1'] . '" size="3" maxlength="3" /></td>
<td>' . _('Customer and supplier balances are displayed as overdue by this many days. This parameter is used on customer and supplier enquiry screens and aged listings') . '</td></tr>';
// PastDueDays2
echo '<tr style="outline: 1px solid"><td>' . _('Second Overdue Deadline in (days)') . ':</td>
- <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[-\d]+" title="'._('The input must be integer').'" name="X_PastDueDays2" value="' . $_SESSION['PastDueDays2'] . '" size="3" maxlength="3" /></td>
+ <td><input type="text" class="integer" required="required" pattern="(?!^0\d+$)[\d]+" title="'._('The input must be integer').'" name="X_PastDueDays2" value="' . $_SESSION['PastDueDays2'] . '" size="3" maxlength="3" /></td>
<td>' . _('As above but the next level of overdue') . '</td></tr>';
@@ -626,6 +629,21 @@
echo '</select></td>
<td>' . _('Set to Automatic - customer codes are automatically created - as a sequential number') . '</td></tr>';
+echo '<tr style="outline: 1px solid"><td>' . _('Create Supplier Codes Automatically') . ':</td>
+ <td><select name="X_AutoSupplierNo">';
+
+if ($_SESSION['AutoSupplierNo']==0) {
+ echo '<option selected="selected" value="0">' . _('Manual Entry') . '</option>';
+ echo '<option value="1">' . _('Automatic') . '</option>';
+} else {
+ echo '<option selected="selected" value="1">' . _('Automatic') . '</option>';
+ echo '<option value="0">' . _('Manual Entry') . '</option>';
+}
+echo '</select></td>
+ <td>' . _('Set to Automatic - Supplier codes are automatically created - as a sequential number') . '</td></tr>';
+
+
+
//==HJ== drop down list for tax category
$sql = "SELECT taxcatid, taxcatname FROM taxcategories ORDER BY taxcatname";
$ErrMsg = _('Could not load tax categories table');
@@ -1070,9 +1088,9 @@
//DefineControlledOnWOEntry
echo '<tr style="outline: 1px solid"><td>' . _('Controlled Items Defined At Work Order Entry') . ':</td>
<td><select name="X_DefineControlledOnWOEntry">
- <option '.($_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="1">' . _('Yes') . '</option>
- <option '.(!$_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="0">' . _('No') . '</option>
- </select></td>
+ <option '.($_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="1">' . _('Yes') . '</option>
+ <option '.(!$_SESSION['DefineControlledOnWOEntry']?'selected="selected" ':'').'value="0">' . _('No') . '</option>
+ </select></td>
<td>' . _('When set to yes, controlled items are defined at the time of the work order creation. Otherwise controlled items (serial numbers and batch/roll/lot references) are entered at the time the finished items are received against the work order') . '</td></tr>';
//AutoCreateWOs
@@ -1143,4 +1161,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-14 20:30:35 UTC (rev 6606)
+++ trunk/doc/Change.log 2014-03-14 22:17:30 UTC (rev 6607)
@@ -1,5 +1,6 @@
webERP Change Log
+15/3/14 Andrew Galuski: Auto Supplier number functionality
14/3/14 Jiro Akits: Updated zh_TW.utf8 translation
14/3/14 phil: removed htmchars in DB_escape_string() functions as suggested by Tim
05/03/14 icedlava: Ensure there are no unescaped characters in existing data when updating purchorders after reversing GRN. This fixes a symptom of a more widespread bug and therefore temporary until more general fix is applied.
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-14 20:30:35 UTC (rev 6606)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-14 22:17:30 UTC (rev 6607)
@@ -1,3 +1,3 @@
-
+INSERT INTO `weberpdemo`.`systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0');
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2014-03-15 00:03:06
|
Revision: 6608
http://sourceforge.net/p/web-erp/reponame/6608
Author: daintree
Date: 2014-03-15 00:03:02 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
fixes to Z_ChangeStockCategory.php script
Modified Paths:
--------------
trunk/Z_ChangeStockCategory.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeStockCategory.php
===================================================================
--- trunk/Z_ChangeStockCategory.php 2014-03-14 22:17:30 UTC (rev 6607)
+++ trunk/Z_ChangeStockCategory.php 2014-03-15 00:03:02 UTC (rev 6608)
@@ -20,13 +20,13 @@
}
if (ContainsIllegalCharacters($_POST['NewStockCategory'])) {
- prnMsg(_('The new stock code to change the old code to contains illegal characters - no changes will be made'), 'error');
+ prnMsg(_('The new stock category to change the old code to contains illegal characters - no changes will be made'), 'error');
include ('includes/footer.inc');
exit;
}
if ($_POST['NewStockCategory'] == '') {
- prnMsg(_('The new stock code to change the old code to must be entered as well'), 'error');
+ prnMsg(_('The new stock category to change the old code to must be entered as well'), 'error');
include ('includes/footer.inc');
exit;
}
@@ -77,19 +77,26 @@
$result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
echo ' ... ' . _('completed');
echo '<br />' . _('Changing sales analysis records');
- $sql = "UPDATE salesanalysis SET stkcategory='" . $_POST['NewStockID'] . "' WHERE stkcategory='" . $_POST['OldStockCategory'] . "'";
+ $sql = "UPDATE salesanalysis SET stkcategory='" . $_POST['NewStockCategory'] . "' WHERE stkcategory='" . $_POST['OldStockCategory'] . "'";
$ErrMsg = _('The SQL to update Sales Analysis records failed');
$result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing internal stock category roles records');
+ $sql = "UPDATE internalstockcatrole SET categoryid='" . $_POST['NewStockCategory'] . "' WHERE categoryid='" . $_POST['OldStockCategory'] . "'";
+ $ErrMsg = _('The SQL to update internal stock category role records failed');
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
+ echo ' ... ' . _('completed');
+
$sql = 'SET FOREIGN_KEY_CHECKS=1';
$result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
$result = DB_Txn_Commit($db);
echo '<br />' . _('Deleting the old stock category record');
$sql = "DELETE FROM stockcategory WHERE categoryid='" . $_POST['OldStockCategory'] . "'";
$ErrMsg = _('The SQL to delete the old stock category record failed');
- $result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
echo ' ... ' . _('completed');
- echo '<p>' . _('Stock Code') . ': ' . $_POST['OldStockCategory'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewStockCategory'];
+ echo '<p>' . _('Stock Category') . ': ' . $_POST['OldStockCategory'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewStockCategory'];
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
@@ -99,11 +106,11 @@
<table>
<tr>
<td>' . _('Existing Inventory Category Code') . ':</td>
- <td><input type="text" name="OldStockCategory" size="20" maxlength="20" /></td>
+ <td><input type="text" data-type="no-illegal-chars" name="OldStockCategory" title="' . _('Enter up to six alphanumeric characters or underscore as a code for this stock category') . '" size="7" maxlength="6" /></td>
</tr>
<tr>
<td>' . _('New Inventory Category Code') . ':</td>
- <td><input type="text" name="NewStockCategory" size="20" maxlength="20" /></td>
+ <td><input type="text" data-type="no-illegal-chars" title="' . _('Enter up to six alphanumeric characters or underscore as a code for this stock category') . '" name="NewStockCategory" size="7" maxlength="6" /></td>
</tr>
</table>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-14 22:17:30 UTC (rev 6607)
+++ trunk/doc/Change.log 2014-03-15 00:03:02 UTC (rev 6608)
@@ -1,8 +1,9 @@
webERP Change Log
+15/3/14 Phil: Z_ChangeStockCategory.php was not updating sales analysis records correctly - fixed
15/3/14 Andrew Galuski: Auto Supplier number functionality
14/3/14 Jiro Akits: Updated zh_TW.utf8 translation
-14/3/14 phil: removed htmchars in DB_escape_string() functions as suggested by Tim
+14/3/14 Phil: removed htmchars in DB_escape_string() functions as suggested by Tim
05/03/14 icedlava: Ensure there are no unescaped characters in existing data when updating purchorders after reversing GRN. This fixes a symptom of a more widespread bug and therefore temporary until more general fix is applied.
05/03/14 icedlava: Remove input fields (Country and Language) and display this data instead on customer view page
03/03/14 Exson: Remove redundant code in CustomerAllocations.php
|
|
From: <rc...@us...> - 2014-03-17 15:12:45
|
Revision: 6612
http://sourceforge.net/p/web-erp/reponame/6612
Author: rchacon
Date: 2014-03-17 15:12:41 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Allow translations of tax category "Freight". Minor Spanish translations improvements.
Modified Paths:
--------------
trunk/includes/DefineCartClass.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2014-03-17 14:04:49 UTC (rev 6611)
+++ trunk/includes/DefineCartClass.php 2014-03-17 15:12:41 UTC (rev 6612)
@@ -374,7 +374,7 @@
/*Gets the Taxes and rates applicable to the freight based on the tax group of the branch combined with the tax category for this particular freight
and SESSION['FreightTaxCategory'] the taxprovince of the dispatch location */
- $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='Freight'";
+ $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='" . _('Freight') . "'";// To allow translations of tax category "Freight".
$TaxCatQuery = DB_query($sql, $db);
if ($TaxCatRow = DB_fetch_array($TaxCatQuery)) {
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 2014-03-17 14:04:49 UTC (rev 6611)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-03-17 15:12:41 UTC (rev 6612)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-02-28 16:37-0600\n"
+"PO-Revision-Date: 2014-03-17 09:04-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -7089,7 +7089,7 @@
#: Credit_Invoice.php:421
msgid "Freight cost charged on invoice"
-msgstr "Costo de transporte cargado en la Factura"
+msgstr "Costo de flete cargado en la factura"
#: Credit_Invoice.php:424
msgid "Credit Freight Cost"
@@ -12636,7 +12636,7 @@
#: FreightCosts.php:28 FreightCosts.php:83
#: ../webSHOP/includes/PlaceOrder.php:274
msgid "Freight Costs"
-msgstr "Costos de Flete"
+msgstr "Costos de flete"
#: FreightCosts.php:38
msgid "Select A Freight Company to set up costs for"
@@ -17686,7 +17686,7 @@
#: OrderDetails.php:121
msgid "Freight Cost"
-msgstr "Costo de Transporte"
+msgstr "Costo de flete"
#: OrderDetails.php:153
msgid "The SQL used to retrieve the line items, that failed was"
@@ -28029,7 +28029,7 @@
#: ShopParameters.php:363
msgid "Freight Calculations"
-msgstr ""
+msgstr "Cálculos de flete"
#: ShopParameters.php:378
msgid "Select the freight calculation method to use for the webSHOP"
@@ -48707,12 +48707,12 @@
#: ../webSHOP/includes/DisplayShoppingCart.php:64
msgid "Freight cost"
-msgstr ""
+msgstr "Costo de flete"
#: ../webSHOP/includes/DisplayShoppingCart.php:68
#: ../webSHOP/includes/PlaceOrder.php:280
msgid "Freight Costs paid by"
-msgstr ""
+msgstr "Costos de flete pagados por"
#: ../webSHOP/includes/DisplayShoppingCart.php:79
#: ../webSHOP/includes/DisplayShoppingCart.php:85
|
|
From: <rc...@us...> - 2014-03-19 17:46:54
|
Revision: 6620
http://sourceforge.net/p/web-erp/reponame/6620
Author: rchacon
Date: 2014-03-19 17:46:49 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Improvements in the Spanish translation (capitalization). Improvements in the table presentation. Standardize to "Home Currency" (used in CompanyPreferences.php).
Modified Paths:
--------------
trunk/Currencies.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2014-03-19 03:55:16 UTC (rev 6619)
+++ trunk/Currencies.php 2014-03-19 17:46:49 UTC (rev 6620)
@@ -376,7 +376,8 @@
<td class="centre">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td class="centre" colspan="4">%s</td>
+ <td class="number">%s</td>
+ <td class="centre" colspan="3">%s</td>
</tr>',
$ImageFile,
$myrow['currabrev'],
@@ -387,7 +388,8 @@
$ShowInWebText,
locale_number_format(1,8),
locale_number_format(1,2),
- _('Functional Currency'));
+ locale_number_format(1,8),
+ _('Home Currency'));
}
} //END WHILE LIST LOOP
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 2014-03-19 03:55:16 UTC (rev 6619)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-03-19 17:46:49 UTC (rev 6620)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-03-17 09:04-0600\n"
+"PO-Revision-Date: 2014-03-19 11:26-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -6012,7 +6012,7 @@
#: PO_OrderDetails.php:113 SupplierCredit.php:291 SupplierInvoice.php:635
#: SuppPaymentRun.php:297
msgid "Exchange Rate"
-msgstr "Tasa de Cambio"
+msgstr "Tipo de cambio"
#: Contracts.php:944
msgid ""
@@ -7427,7 +7427,7 @@
#: Currencies.php:6 includes/MainMenuLinksArray.php:439
msgid "Currencies Maintenance"
-msgstr "Administrar Monedas"
+msgstr "Administrar monedas"
#: Currencies.php:53
msgid "The currency already exists in the database"
@@ -7556,11 +7556,11 @@
#: Currencies.php:297 Currencies.php:466
msgid "Hundredths Name"
-msgstr "Definición de los Céntimos"
+msgstr "Nombre del centésimo"
#: Currencies.php:298 InventoryValuation.php:205
msgid "Decimal Places"
-msgstr "Lugares Decimales"
+msgstr "Decimales"
#: Currencies.php:299 Currencies.php:495
msgid "Show in webSHOP"
@@ -7568,11 +7568,11 @@
#: Currencies.php:301
msgid "1 / Ex Rate"
-msgstr "1/ Tasa de Cambio"
+msgstr "1 / Tipo de cambio"
#: Currencies.php:302
msgid "Ex Rate - ECB"
-msgstr "Tasa de Cambio Banco Central Europeo"
+msgstr "Tipo de cambio del BCE"
#: Currencies.php:303 CustomerTypes.php:6 index.php:149 Prices.php:227
#: StockCategories.php:266 SupplierTypes.php:6
@@ -7591,7 +7591,7 @@
#: Currencies.php:390
msgid "Functional Currency"
-msgstr "Moneda Funcional"
+msgstr "Moneda funcional"
#: Currencies.php:400
msgid "Show all currency definitions"
@@ -7608,7 +7608,7 @@
#: Currencies.php:474
msgid "Decimal Places to Display"
-msgstr "Decimales al mostrar"
+msgstr "Decimales a mostrar"
#: CustEDISetup.php:6
msgid "Customer EDI Set Up"
@@ -9027,7 +9027,7 @@
#: CustomerReceipt.php:883
msgid "Receipt Exchange Rate"
-msgstr "Tasa de Cambio del Ingreso"
+msgstr "Tipo de cambio del recibo"
#: CustomerReceipt.php:885
msgid ""
@@ -9039,7 +9039,7 @@
#: CustomerReceipt.php:900 Payments.php:885
msgid "Functional Exchange Rate"
-msgstr "Tasa de Cambio Funcional"
+msgstr "Tipo de cambio funcional"
#: CustomerReceipt.php:902 Payments.php:886 Payments.php:887
msgid ""
@@ -9592,7 +9592,7 @@
#: CustomerTransInquiry.php:112 CustWhereAlloc.php:114
#: SupplierTransInquiry.php:109 Z_CheckAllocs.php:65
msgid "Ex Rate"
-msgstr "Tasa de Cambio"
+msgstr "Tipo de cambio"
#: CustomerTransInquiry.php:165
#, php-format
@@ -18175,7 +18175,7 @@
#: Payments.php:868
msgid "Payment Exchange Rate"
-msgstr "Tasa de Cambio del Pago"
+msgstr "Tipo de cambio del pago"
#: Payments.php:869 Payments.php:870
msgid ""
@@ -45018,7 +45018,7 @@
#: api/api_errorcodes.php:250
msgid "Invalid Exchange Rate"
-msgstr "Tasa de Cambio Inválida"
+msgstr "Tipo de cambio no válido"
#: api/api_errorcodes.php:251
msgid "Invalid OV Amount"
|
|
From: <ex...@us...> - 2014-03-21 03:49:26
|
Revision: 6624
http://sourceforge.net/p/web-erp/reponame/6624
Author: exsonqu
Date: 2014-03-21 03:49:21 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
21/03/14 Exson: Fixed that bugs in WorkOrderIssue.php that the issued non BOM materials not shown. And fixed bugs in WorkOrderStatus.php failed to retrieve item description.
Modified Paths:
--------------
trunk/WorkOrderIssue.php
trunk/WorkOrderStatus.php
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2014-03-20 07:51:39 UTC (rev 6623)
+++ trunk/WorkOrderIssue.php 2014-03-21 03:49:21 UTC (rev 6624)
@@ -622,7 +622,14 @@
stockmaster.decimalplaces,
autoissue",
$db);
+ $IssuedAlreadyResult = DB_query("SELECT stockid, SUM(-qty) as total FROM stockmoves
+ WHERE stockmoves.type=28
+ AND reference='" . $_POST['WO'] . "' GROUP BY stockid",$db);
+ while($myrow = DB_fetch_array($IssuedAlreadyResult)){
+ $IssuedMaterials[$myrow['stockid']]['description'] = $myrow['description'];
+ $IssuedMaterials[$myrow['stockid']]['total'] = $myrow['total'];
+ }
while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
if ($RequirementsRow['autoissue']==0){
echo '<tr>
@@ -633,18 +640,41 @@
<td class="notavailable">' . _('Auto Issue') . '</td>
<td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>';
}
- $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
- WHERE stockmoves.type=28
- AND stockid='" . $RequirementsRow['stockid'] . "'
- AND reference='" . $_POST['WO'] . "'",
- $db);
- $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
+ if (isset($IssuedMaterials[$RequirementsRow['stockid']])){
+ $IssuedAlreadyRow = $IssuedMaterials[$RequirementsRow['total']];
+ unset($IssuedMaterials[$RequirementsRow['stockid']]);
+ } else {
+ $IssuedAlreadyRow = 0;
+ }
echo '<td class="number">' . locale_number_format($RequirementsRow['quantityrequired'],$RequirementsRow['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td>
</tr>';
}
+ /* now to deal with those addtional issues of items not in BOM */
+ if (count($IssuedMaterials)>0){
+ $IssuedStocks = implode("','",array_keys($IssuedMaterials));
+ $sql = "SELECT stockid,
+ descrption,
+ decimalplaces
+ FROM stockmaster
+ WHERE stockid in ('" . $IssuedStocks . "')";
+ $ErrMsg = _('Failed to retrieve the item data');
+ $result = DB_query($sql,$db,$ErrMsg);
+ while($myrow = DB_fetch_array($result)){
+ echo '<tr>
+ <td><input type="submit" name="IssueItem" value="' . $myrow['stockid'] . '" /></td>
+ <td>' . $myrow['stockid'] . ' - ' . $myrow['description'] . '</td>
+ <td class="number">0</td>
+ <td class="number">' . locale_number_format($IssuedMaterials[$myrow['stockid']]['total'],$myrow['decimalplaces']) . '</td>
+ </tr>';
+
+ }
+}
+
+
+
echo '</table>
<br />';
@@ -848,4 +878,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2014-03-20 07:51:39 UTC (rev 6623)
+++ trunk/WorkOrderStatus.php 2014-03-21 03:49:21 UTC (rev 6624)
@@ -140,11 +140,10 @@
}
/* Now do any additional issues of items not in the BOM */
if(count($IssuedAlreadyRow)>0){
- $AdditionalStockIDs = array_keys($IssuedAlreadyRow);
- $AdditionalStocks = implode(',',$AdditionalStockIDs);
+ $AdditionalStocks = implode("','",array_keys($IssuedAlreadyRow));
$RequirementsSQL = "SELECT stockid,
- stockmaster.description,
- stockmaster.decimalplaces
+ description,
+ decimalplaces
FROM stockmaster WHERE stockid IN ('".$AdditionalStocks."')";
$RequirementsResult = DB_query($RequirementsSQL,$db);
$AdditionalStocks = array();
@@ -165,4 +164,4 @@
echo '</table>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <dai...@us...> - 2014-03-25 08:30:04
|
Revision: 6636
http://sourceforge.net/p/web-erp/reponame/6636
Author: daintree
Date: 2014-03-25 08:30:00 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
Removed DefaultTheme config parameter
Modified Paths:
--------------
trunk/CustLoginSetup.php
trunk/SuppLoginSetup.php
trunk/SystemParameters.php
trunk/WWW_Users.php
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/CustLoginSetup.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -242,7 +242,7 @@
if (isset($_POST['Theme']) and $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) and ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) and ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/SuppLoginSetup.php
===================================================================
--- trunk/SuppLoginSetup.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/SuppLoginSetup.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -260,7 +260,7 @@
if (isset($_POST['Theme']) and $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) and ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) and ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/SystemParameters.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -108,9 +108,6 @@
if ($_SESSION['DefaultDateFormat'] != $_POST['X_DefaultDateFormat'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DefaultDateFormat']."' WHERE confname = 'DefaultDateFormat'";
}
- if ($_SESSION['DefaultTheme'] != $_POST['X_DefaultTheme'] ) {
- $sql[] = "UPDATE config SET confvalue = '".$_POST['X_DefaultTheme']."' WHERE confname = 'DefaultTheme'";
- }
if ($_SESSION['PastDueDays1'] != $_POST['X_PastDueDays1'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_PastDueDays1']."' WHERE confname = 'PastDueDays1'";
}
@@ -380,22 +377,6 @@
</select></td>
<td>' . _('The default date format for entry of dates and display.') . '</td></tr>';
-// DefaultTheme
-echo '<tr style="outline: 1px solid"><td>' . _('New Users Default Theme') . ':</td>
- <td><select name="X_DefaultTheme">';
-$ThemeDirectory = dir('css/');
-while (false != ($ThemeName = $ThemeDirectory->read())){
- if (is_dir("css/$ThemeName") AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn'){
- if ($_SESSION['DefaultTheme'] == $ThemeName) {
- echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else {
- echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
- }
- }
-}
-echo '</select></td>
- <td>' . _('The default theme is used for new users who have not yet defined the display colour scheme theme of their choice') . '</td></tr>';
-
echo '<tr><th colspan="3">' . _('Accounts Receivable/Payable Settings') . '</th></tr>';
// PastDueDays1
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/WWW_Users.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -622,7 +622,7 @@
if (isset($_POST['Theme']) AND $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) AND ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) AND ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/Z_ChangeStockCode.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -41,6 +41,8 @@
if ($InputError ==0){ // no input errors
+
+ DB_IgnoreForeignKeys($db);
$result = DB_Txn_Begin($db);
echo '<br />' . _('Adding the new stock master record');
$sql = "INSERT INTO stockmaster (stockid,
@@ -109,22 +111,24 @@
ChangeFieldInTable("mrpdemands", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
//check if MRP tables exist before assuming
-
- $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
- if (DB_error_no($db)==0) {
- ChangeFieldInTable("mrpplannedorders", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ $sql = "SELECT * FROM mrpparameters";
+- $result = DB_query($sql, $db, '', '', false, false);
+- if (DB_error_no($db) == 0) {
+ $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
+ if (DB_error_no($db)==0) {
+ ChangeFieldInTable("mrpplannedorders", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
+
+ $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
+ if (DB_error_no($db)==0){
+ ChangeFieldInTable("mrprequirements", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
+
+ $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
+ if (DB_error_no($db)==0){
+ ChangeFieldInTable("mrpsupplies", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
}
-
- $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
- if (DB_error_no($db)==0){
- ChangeFieldInTable("mrprequirements", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
- }
-
- $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
- if (DB_error_no($db)==0){
- ChangeFieldInTable("mrpsupplies", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
- }
-
ChangeFieldInTable("salesanalysis", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("orderdeliverydifferenceslog", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("prices", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/doc/Change.log 2014-03-25 08:30:00 UTC (rev 6636)
@@ -1,5 +1,6 @@
webERP Change Log
+24/3/14 Phil: Removed DefaultTheme configuration parameter - unecessary as noted by Serafalcon
23/03/14 Exson: Fixed the no defined variable bugs in WorkOrderIssue.php. Reported by Tim.
23/03/14 Exson: Fixed the bug that the search results shows only limited to DisplayRecordsMax which does not make sense due to pagination in WorkOrderIssue.php.
23/03/14 Exson: Fixed that currency name not available in Prices.php.
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/includes/session.inc 2014-03-25 08:30:00 UTC (rev 6636)
@@ -195,10 +195,6 @@
If (isset($_POST['Theme']) AND ($_SESSION['UsersRealName'] == $_POST['RealName'])) {
$_SESSION['Theme'] = $_POST['Theme'];
$Theme = $_POST['Theme'];
-} elseif (!isset($_SESSION['Theme'])) {
- $Theme = $_SESSION['DefaultTheme'];
- $_SESSION['Theme'] = $_SESSION['DefaultTheme'];
-
} else {
$Theme = $_SESSION['Theme'];
}
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-25 08:30:00 UTC (rev 6636)
@@ -1,4 +1,5 @@
INSERT INTO `systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0');
INSERT INTO config (confname, confvalue) VALUES ('AutoSupplierNo', '0');
+DELETE FROM config WHERE confname='DefaultTheme';
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2014-03-27 08:21:13
|
Revision: 6643
http://sourceforge.net/p/web-erp/reponame/6643
Author: daintree
Date: 2014-03-27 08:21:10 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
Serakfalcon: fixed findLogoFile function in includes/session.inc
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/session.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-27 08:05:36 UTC (rev 6642)
+++ trunk/doc/Change.log 2014-03-27 08:21:10 UTC (rev 6643)
@@ -1,5 +1,6 @@
webERP Change Log
+26/3/14 Serakfalcon: fixed findLogoFile function in includes/session.inc
24/3/14 Phil: Removed DefaultTheme configuration parameter - unecessary as noted by Serafalcon
23/03/14 Exson: Fixed the no defined variable bugs in WorkOrderIssue.php. Reported by Tim.
23/03/14 Exson: Fixed the bug that the search results shows only limited to DisplayRecordsMax which does not make sense due to pagination in WorkOrderIssue.php.
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2014-03-27 08:05:36 UTC (rev 6642)
+++ trunk/includes/session.inc 2014-03-27 08:21:10 UTC (rev 6643)
@@ -211,38 +211,14 @@
*/
function findLogoFile($CompanyDir, $PathPrefix) {
- $dir = $PathPrefix.'companies/' . $CompanyDir . '/';
- $DirHandle = dir($dir);
- while ($DirEntry = $DirHandle->read() ){
- if ($DirEntry != '.' AND $DirEntry !='..'){
- $InCompanyDir[] = $DirEntry; //make an array of all files under company directory
- }
- } //loop through list of files in the company directory
- if ($InCompanyDir !== FALSE) {
- foreach($InCompanyDir as $logofilename) {
- if (strncasecmp($logofilename,'logo.png',8) === 0 AND
- is_readable($dir . $logofilename) AND
- is_file($dir . $logofilename)) {
- $logo = $logofilename;
- break;
- }
- }
- if (!isset($logo)) {
- foreach($InCompanyDir as $logofilename) {
- if (strncasecmp($logofilename,'logo.jpg',8) === 0 AND
- is_readable($dir . $logofilename) AND
- is_file($dir . $logofilename)) {
- $logo = $logofilename;
- break;
- }
- }
- }
- if (empty($logo)) {
- return null;
- } else {
- return 'companies/' .$CompanyDir .'/'. $logo;
- }
- } //end listing of files under company directory is not empty
+ $result = null;
+ $dir = $PathPrefix . 'companies/' . $CompanyDir;
+ if (file_exists($dir . '/logo.png')) {
+ $result = 'companies/' . $CompanyDir . '/logo.png';
+ } elseif (file_exists($dir . '/logo.jpg')) {
+ $result = 'companies/' . $CompanyDir . '/logo.jpg';
+ }
+ return $result;
}
/* Find a logo in companies/<company of this session> */
|
|
From: <rc...@us...> - 2014-03-29 00:41:01
|
Revision: 6649
http://sourceforge.net/p/web-erp/reponame/6649
Author: rchacon
Date: 2014-03-29 00:40:57 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
Fix on tax amount in tax report. Minor fixes in Spanish translation.
Modified Paths:
--------------
trunk/Tax.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2014-03-28 11:27:31 UTC (rev 6648)
+++ trunk/Tax.php 2014-03-29 00:40:57 UTC (rev 6649)
@@ -31,8 +31,9 @@
$PageNumber=0;
$line_height=12;
- /*Now get the invoices for the tax report */
+ /*Now get the invoices for the tax report */
+ /*rchacon: The amounts of taxes are inserted into debtortranstaxes.taxamount in local currency and they are accumulated in debtortrans.ovgst in original currency.*/
$SQL = "SELECT debtortrans.transno,
debtortrans.type,
systypes.typename,
@@ -43,7 +44,7 @@
debtortrans.order_,
(debtortrans.ovamount+debtortrans.ovfreight)/debtortrans.rate AS netamount,
debtortrans.ovfreight/debtortrans.rate AS freightamount,
- debtortranstaxes.taxamount/debtortrans.rate AS tax
+ debtortranstaxes.taxamount AS tax
FROM debtortrans
INNER JOIN debtorsmaster ON debtortrans.debtorno=debtorsmaster.debtorno
INNER JOIN systypes ON debtortrans.type=systypes.typeid
@@ -357,4 +358,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
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 2014-03-28 11:27:31 UTC (rev 6648)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-03-29 00:40:57 UTC (rev 6649)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-03-19 11:26-0600\n"
+"PO-Revision-Date: 2014-03-28 18:29-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -18494,11 +18494,11 @@
#: PcAuthorizeExpenses.php:45 PcAuthorizeExpenses.php:48 SuppLoginSetup.php:28
#: WWW_Users.php:20 includes/MainMenuLinksArray.php:30
msgid "Petty Cash"
-msgstr "Caja Chica"
+msgstr "Caja chica"
#: PcAuthorizeExpenses.php:46 PcAuthorizeExpenses.php:49
msgid "Authorisation Of Petty Cash Expenses "
-msgstr "Autorización de Gastos de Caja Chica"
+msgstr "Autorización de Gastos de caja chica"
#: PcAuthorizeExpenses.php:64
msgid "Detail Of Movement For Last "
@@ -18506,7 +18506,7 @@
#: PcAuthorizeExpenses.php:142
msgid "PettyCash"
-msgstr "Caja Chica"
+msgstr "Caja chica"
#: PcAuthorizeExpenses.php:314
msgid "Authorise expenses to Petty Cash Tab"
@@ -33443,7 +33443,7 @@
#: SuppLoginSetup.php:27 WWW_Users.php:19 includes/MainMenuLinksArray.php:29
msgid "Asset Manager"
-msgstr "Maestro de Activos"
+msgstr "Gestor de activos"
#: SuppLoginSetup.php:102
msgid "A new supplier login has been created"
@@ -35587,7 +35587,7 @@
#: Tax.php:286
msgid "Tax Reporting"
-msgstr "Informe Impositivo"
+msgstr "Informe impositivo"
#: Tax.php:297
msgid "Tax Authority To Report On:"
@@ -35599,11 +35599,11 @@
#: Tax.php:310
msgid "Quarter"
-msgstr "Cuarto"
+msgstr "Tres meses"
#: Tax.php:311
msgid "Six Months"
-msgstr "Seis Meses"
+msgstr "Seis meses"
#: Tax.php:317
msgid "Return To"
@@ -43220,7 +43220,7 @@
#: includes/MainMenuLinksArray.php:354
msgid "Tax Reports"
-msgstr "Informes de Impuestos"
+msgstr "Informes de impuestos"
#: includes/MainMenuLinksArray.php:371
msgid "GL Accounts"
|
|
From: <dai...@us...> - 2014-04-02 06:09:30
|
Revision: 6655
http://sourceforge.net/p/web-erp/reponame/6655
Author: daintree
Date: 2014-04-02 06:09:27 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Andew Galuski get credit available when modifying an existing order
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-03-31 12:14:17 UTC (rev 6654)
+++ trunk/SelectOrderItems.php 2014-04-02 06:09:27 UTC (rev 6655)
@@ -146,6 +146,7 @@
}
$_SESSION['Items'.$identifier]->OrderNo = $_GET['ModifyOrderNumber'];
$_SESSION['Items'.$identifier]->DebtorNo = $myrow['debtorno'];
+ $_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
/*CustomerID defined in header.inc */
$_SESSION['Items'.$identifier]->Branch = $myrow['branchcode'];
$_SESSION['Items'.$identifier]->CustomerName = $myrow['name'];
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-31 12:14:17 UTC (rev 6654)
+++ trunk/doc/Change.log 2014-04-02 06:09:27 UTC (rev 6655)
@@ -1,5 +1,6 @@
webERP Change Log
+2/4/14 Andrew Galuski: Get Credit available when modifiying an existing order
28/03/14 Exson: Fixed the Expiry Date not handled right during stocks adjustments by manual key in or bar code scan in Add_SerialItems.php, DefineSerialItems.php,InputSerialItems.php and InputSerialItemsKeyed.php.
26/3/14 Serakfalcon: fixed findLogoFile function in includes/session.inc
24/3/14 Phil: Removed DefaultTheme configuration parameter - unecessary as noted by Serafalcon
|
|
From: <ex...@us...> - 2014-04-05 11:30:29
|
Revision: 6664
http://sourceforge.net/p/web-erp/reponame/6664
Author: exsonqu
Date: 2014-04-05 11:30:25 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
05/04/14 Exson: Add a decimal places check in StockAdjustments.php to prevent from wrong decimal places input.
Modified Paths:
--------------
trunk/PDFQuotationPortrait.php
trunk/StockAdjustments.php
Modified: trunk/PDFQuotationPortrait.php
===================================================================
--- trunk/PDFQuotationPortrait.php 2014-04-04 08:02:36 UTC (rev 6663)
+++ trunk/PDFQuotationPortrait.php 2014-04-05 11:30:25 UTC (rev 6664)
@@ -274,7 +274,7 @@
include('includes/footer.inc');
exit;
} else {
- $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
?>
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2014-04-04 08:02:36 UTC (rev 6663)
+++ trunk/StockAdjustments.php 2014-04-05 11:30:25 UTC (rev 6664)
@@ -158,6 +158,9 @@
} elseif (!is_numeric($_SESSION['Adjustment' . $identifier]->Quantity)){
prnMsg( _('The quantity entered must be numeric'),'error');
$InputError = true;
+ } elseif(strlen(substr(strrchr($_SESSION['Adjustment'.$identifier]->Quantity, "."), 1))>$_SESSION['Adjustment' . $identifier]->DecimalPlaces){
+ prnMsg(_('The decimal places input is more than the decimals of this item defined,the defined decimal places is ').' '.$_SESSION['Adjustment' . $identifier]->DecimalPlaces.' '._('and the input decimal places is ').' '.strlen(substr(strrchr($_SESSION['Adjustment'.$identifier]->Quantity, "."), 1)),'error');
+ $InputError = true;
} elseif ($_SESSION['Adjustment' . $identifier]->Quantity==0){
prnMsg( _('The quantity entered cannot be zero') . '. ' . _('There would be no adjustment to make'),'error');
$InputError = true;
@@ -527,4 +530,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2014-04-05 14:07:44
|
Revision: 6667
http://sourceforge.net/p/web-erp/reponame/6667
Author: exsonqu
Date: 2014-04-05 14:07:41 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
05/04/14 Exson: Add decimal places check for controlled items quantity input in Add_SerialItems.php and InputSerialItems.php.The wrong decimal places will make this sections quite buggy and problem prone.
Modified Paths:
--------------
trunk/StockAdjustments.php
trunk/includes/Add_SerialItems.php
trunk/includes/InputSerialItems.php
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2014-04-05 13:37:30 UTC (rev 6666)
+++ trunk/StockAdjustments.php 2014-04-05 14:07:41 UTC (rev 6667)
@@ -530,4 +530,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2014-04-05 13:37:30 UTC (rev 6666)
+++ trunk/includes/Add_SerialItems.php 2014-04-05 14:07:41 UTC (rev 6667)
@@ -7,16 +7,35 @@
Added KEYED Entry values
********************************************/
if ( (isset($_POST['AddBatches']) AND $_POST['AddBatches']!='')) {
-
for ($i=0;$i < 10;$i++){
if(isset($_POST['SerialNo' . $i]) AND mb_strlen($_POST['SerialNo' . $i])>0){
+ /* add input quantity validation, the quantity left due to wrong decimal places is very annoying for controlled items */
+ if(is_numeric(filter_number_format($_POST['Qty'.$i]))){
+ if(strlen(substr(strrchr(filter_number_format($_POST['Qty'.$i]), "."), 1))>$DecimalPlaces){
+ echo '<br/>';
+ prnMsg(_('Please correct input quantity ').' '.$_POST['Qty'.$i].' '._('to').' '.$DecimalPlaces.' '._('decimalplaces'),'error');
+ $AddThisBundle = false;
+ $SerialError = true;
+ unset($LineItem->SerialItems[$_POST['SerialNo'.$i]]);
+
+ }
+ } else {
+ echo '<br/>';
+ prnMsg(_('The input quantity must be numeric'),'error');
+ $AddThisBundle = false;
+ $SerialError = true;
+ unset($LineItem->SerialItems[$_POST['SerialNo'.$i]]);
+ }
+
if ($ItemMustExist){
$ExistingBundleQty = ValidBundleRef($StockID, $LocationOut, $_POST['SerialNo' . $i]);
if ($ExistingBundleQty >0 OR ($ExistingBundleQty==1 and $IsCredit=true)){
- $AddThisBundle = true;
+ if(!isset($AddThisBundle)){
+ $AddThisBundle = true;
+ }
/*If the user enters a duplicate serial number the later one over-writes
- the first entered one - no warning given though ? */
- if (filter_number_format($_POST['Qty' . $i]) > $ExistingBundleQty){
+ the first entered one - no warning given though ? */
+ if (((filter_number_format($_POST['Qty' . $i]))*$InOutModifier) > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
echo '<br />';
prnMsg ( $_POST['SerialNo' . $i] . ' ' .
@@ -34,7 +53,9 @@
_('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll'),
'warn');
$_POST['Qty' . $i] = $ExistingBundleQty;
- $AddThisBundle = true;
+ if(!isset($AddThisBundle)){
+ $AddThisBundle = true;
+ }
}
}
if ($AddThisBundle==true){//the $InOutModifier should not appeared here. Otherwise, the users cannot remove the quantity but add it.
@@ -56,7 +77,9 @@
else {
//Serialised items can not exist w/ Qty > 0 if we have an $NewQty of 1
//Serialised items must exist w/ Qty = 1 if we have $NewQty of -1
- $SerialError = false;
+ if(!isset($SerialError)){
+ $SerialError = false;
+ }
$NewQty = ($InOutModifier>0?1:-1) * filter_number_format($_POST['Qty' . $i]);
$NewSerialNo = $_POST['SerialNo' . $i];
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2014-04-05 13:37:30 UTC (rev 6666)
+++ trunk/includes/InputSerialItems.php 2014-04-05 14:07:41 UTC (rev 6667)
@@ -9,12 +9,14 @@
- CreditItemsControlled.php
*/
//bring up perishable variable here otherwise we cannot get it in Add_SerialItems.php
-$sql="SELECT perishable
+$sql = "SELECT perishable,
+ decimalplaces
FROM stockmaster
WHERE stockid='".$StockID."'";
-$result=DB_query($sql, $db);
-$myrow=DB_fetch_array($result);
-$Perishable=$myrow['perishable'];
+$result = DB_query($sql, $db);
+$myrow = DB_fetch_array($result);
+$Perishable = $myrow['perishable'];
+$DecimalPlaces = $myrow['decimalplaces'];
include ('includes/Add_SerialItems.php');
/*Setup the Data Entry Types */
|
|
From: <rc...@us...> - 2014-04-05 23:31:58
|
Revision: 6669
http://sourceforge.net/p/web-erp/reponame/6669
Author: rchacon
Date: 2014-04-05 23:31:54 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
Fixes the bug that emptied ItemDescriptionLanguages.
Modified Paths:
--------------
trunk/StockClone.php
trunk/Stocks.php
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2014-04-05 14:17:50 UTC (rev 6668)
+++ trunk/StockClone.php 2014-04-05 23:31:54 UTC (rev 6669)
@@ -27,7 +27,7 @@
prnMsg(_('To use this script it must be called with the Stock ID of the item to be cloned passed in as $OldStockID. Please use the Clone This Item option in the Items Menu.'),'error');
}
-$ItemDescriptionLanguages = explode(',',$_SESSION['ItemDescriptionLanguages']);
+$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);
if (isset($_POST['StockID']) && !empty($_POST['StockID']) && !isset($_POST['UpdateCategories'])) {
$sql = "SELECT COUNT(stockid)
@@ -322,7 +322,7 @@
$ErrMsg = _('Could not update the language description because');
$DbgMsg = _('The SQL that was used to update the language description and failed was');
if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
if ($DescriptionLanguage!=''){
$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $_POST['StockID'] . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
}
@@ -548,7 +548,7 @@
unset($_POST['Pansize']);
unset($_POST['StockID']);
//unset($_POST['OldStockID']);
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
$_POST['New'] = 1; //do not show input form again
}
@@ -642,7 +642,7 @@
$_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $selectedStockID . "' AND (";
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
$sql .= "language_id='" . $DescriptionLanguage ."' OR ";
}
$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
@@ -664,7 +664,7 @@
<td><input ' . (in_array('Description',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Description" size="52" maxlength="50" value="' . $Description . '" /></td>
</tr>';
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
if ($DescriptionLanguage!=''){
//unfortunately cannot have points in POST variables so have to mess with the language id
$PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2014-04-05 14:17:50 UTC (rev 6668)
+++ trunk/Stocks.php 2014-04-05 23:31:54 UTC (rev 6669)
@@ -20,13 +20,13 @@
$StockID = '';
}
-$ItemDescriptionLanguages = explode(',',$_SESSION['ItemDescriptionLanguages']);
+$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);
if (isset($_POST['NextItem'])){
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid>'" . $StockID . "' ORDER BY stockid ASC LIMIT 1",$db);
$NextItemRow = DB_fetch_row($Result);
$StockID = $NextItemRow[0];
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
}
}
@@ -34,7 +34,7 @@
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid<'" . $StockID . "' ORDER BY stockid DESC LIMIT 1",$db);
$PreviousItemRow = DB_fetch_row($Result);
$StockID = $PreviousItemRow[0];
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
}
}
@@ -429,7 +429,7 @@
$DbgMsg = _('The SQL that was used to update the language description and failed was');
if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
if ($DescriptionLanguage!=''){
$result = DB_query("DELETE FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND language_id='" . $DescriptionLanguage . "'",$db,$ErrMsg,$DbgMsg,true);
$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
@@ -624,7 +624,7 @@
$ErrMsg = _('Could not update the language description because');
$DbgMsg = _('The SQL that was used to update the language description and failed was');
if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
if ($DescriptionLanguage!=''){
$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
}
@@ -695,7 +695,7 @@
unset($_POST['ShrinkFactor']);
unset($_POST['Pansize']);
unset($StockID);
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
}
$New=1;
@@ -841,7 +841,7 @@
unset($_POST['TaxCat']);
unset($_POST['DecimalPlaces']);
unset($_SESSION['SelectedStockItem']);
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
}
unset($StockID);
@@ -935,7 +935,7 @@
$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND (";
- foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
$sql .= "language_id='" . $DescriptionLanguage ."' OR ";
}
$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
@@ -965,7 +965,7 @@
<td><input ' . (in_array('Description',$Errors) ? 'class="inputerror"' : '' ) .' type="text" ' . ($New==0?'autofocus="autofocus"':'') . ' name="Description" required="required" size="52" maxlength="50" value="' . stripslashes($Description) . '" /></td>
</tr>';
-foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
if ($DescriptionLanguage!=''){
//unfortunately cannot have points in POST variables so have to mess with the language id
$PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);
|
|
From: <dai...@us...> - 2014-04-06 02:43:47
|
Revision: 6671
http://sourceforge.net/p/web-erp/reponame/6671
Author: daintree
Date: 2014-04-06 02:43:36 +0000 (Sun, 06 Apr 2014)
Log Message:
-----------
Andrew Galuski mods
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/GoodsReceived.php
trunk/ReprintGRN.php
trunk/SelectWorkOrder.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/doc/Change.log
trunk/includes/PDFStarter.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/FormDesigner.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -155,6 +155,18 @@
case 'PickingList.xml':
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFPickingList.php?' . SID .'TransNo=Preview">';
break;
+ case 'QALabel.xml':
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFQALabel.php?' . SID .'GRNNo=Preview&PONo=1">';
+ break;
+ case 'WOPaperwork.xml':
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFWOPrint.php?' . SID .'WO=Preview">';
+ break;
+ case 'FGLabel.xml':
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFFGLabel.php?' . SID .'WO=Preview">';
+ break;
+ case 'ShippingLabel.xml':
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFShipLabel.php?' . SID .'SO=Preview">';
+ break;
}
} else {
/* otherwise check that the web server has write premissions on the companies
@@ -182,7 +194,8 @@
while (false !== ($file = readdir($handle))) {
if ($file[0]!='.') {
$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$file);
- echo '<option value="'.$file.'">' . _($FormDesign['name']) . '</option>';
+ //echo "name is". $FormDesign['name'];
+ echo '<option value="'.$file.'">' . /*_(*/ $FormDesign['name'] /*)*/ . '</option>';
}
}
closedir($handle);
@@ -205,7 +218,7 @@
_('All measurements are in PostScript points (72 points = 25,4 mm).') . '<br /> '.
_('All coordinates are measured from the lower left corner of the sheet to the top left corner of the element.') . '</div><br />';
-$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations
+$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A6_Landscape', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations amg adds A6
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/GoodsReceived.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -304,19 +304,7 @@
$Changes=0;
$LineNo=1;
- if(DB_num_rows($Result)==0){//Those goods must have been received by another user. So should destroy the session data and show warning to users
- prnMsg(_('This order has been changed or invoiced since this delivery was started to be actioned').' . '._('Processing halted'),'error');
- echo '<div class="centre"><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php">' .
- _('Select a different purchase order for receiving goods against') . '</a></div>';
- unset($_SESSION['PO'.$identifier]->LineItems);
- unset($_SESSION['PO'.$identifier]);
- unset($_POST['ProcessGoodsReceived']);
- echo '</div>';
- echo '</form>';
- include ('includes/footer.inc');
- exit;
- }
while ($myrow = DB_fetch_array($Result)) {
if ($_SESSION['PO'.$identifier]->LineItems[$LineNo]->GLCode != $myrow['glcode'] OR
@@ -745,8 +733,11 @@
<a href="PDFGrn.php?GRNNo='.$GRN .'&PONo='.$PONo.'">' . _('Print this Goods Received Note (GRN)') . '</a>
<br />
<br />
+ <a href="PDFQALabel.php?GRNNo='.$GRN .'&PONo='.$PONo.'">' . _('Print QA Labels for this Receipt') . '</a>
+ <br />
+ <br />
<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php">' . _('Select a different purchase order for receiving goods against'). '</a>
- </div>';
+ </div>';
/*end of process goods received entry */
echo '</div>';
echo '</form>';
Modified: trunk/ReprintGRN.php
===================================================================
--- trunk/ReprintGRN.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/ReprintGRN.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -85,7 +85,8 @@
<th>' . _('Item Description') . '</th>
<th>' . _('Delivery Date') . '</th>
<th>' . _('Quantity Received') . '</th>
- </tr>';
+ <th>' . _('Action') . '</th>
+ </tr>';
while ($myrow=DB_fetch_array($result)) {
if ($k==1){
@@ -102,8 +103,9 @@
<td>' . $myrow['itemdescription'] . '</td>
<td>' . $myrow['deliverydate'] . '</td>
<td class="number">' . locale_number_format($myrow['qtyrecd'], $myrow['decimalplaces']) . '</td>
- <td><a href="PDFGrn.php?GRNNo=' . $myrow['grnbatch'] .'&PONo=' . $_POST['PONumber'] . '">' . _('Reprint') . '</a></td>
- </tr>';
+ <td><a href="PDFGrn.php?GRNNo=' . $myrow['grnbatch'] .'&PONo=' . $_POST['PONumber'] . '">' . _('Reprint GRN ') . '</a>
+ <a href="PDFQALabel.php?GRNNo=' . $myrow['grnbatch'] .'&PONo=' . $_POST['PONumber'] . '">' . _('Reprint QA Label') . '</a></td>
+ </tr>';
}
echo '</table>';
}
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/SelectWorkOrder.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -321,13 +321,14 @@
<th>' . _('Receive') . '</th>
<th>' . _('Issue To') . '</th>
<th>' . _('Costing') . '</th>
+ <th>' . _('Paperwork') . '</th>
<th class="ascending">' . _('Item') . '</th>
<th class="ascending">' . _('Quantity Required') . '</th>
<th class="ascending">' . _('Quantity Received') . '</th>
<th class="ascending">' . _('Quantity Outstanding') . '</th>
<th class="ascending">' . _('Start Date') . '</th>
<th class="ascending">' . _('Required Date') . '</th>
- </tr>';
+ </tr>';
$k=0; //row colour counter
while ($myrow=DB_fetch_array($WorkOrdersResult)) {
@@ -345,6 +346,7 @@
$Receive_WO = $RootPath . '/WorkOrderReceive.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
$Issue_WO = $RootPath . '/WorkOrderIssue.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
$Costing_WO =$RootPath . '/WorkOrderCosting.php?WO=' .$myrow['wo'];
+ $Printing_WO =$RootPath . '/PDFWOPrint.php?WO=' .$myrow['wo'] . '&StockID=' . $myrow['stockid'];
$FormatedRequiredByDate = ConvertSQLDate($myrow['requiredby']);
$FormatedStartDate = ConvertSQLDate($myrow['startdate']);
@@ -355,6 +357,7 @@
<td><a href="%s">' . _('Receive') . '</a></td>
<td><a href="%s">' . _('Issue To') . '</a></td>
<td><a href="%s">' . _('Costing') . '</a></td>
+ <td><a href="%s">' . _('Print W/O') . '</a></td>
<td>%s - %s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -368,13 +371,14 @@
$Receive_WO,
$Issue_WO,
$Costing_WO,
+ $Printing_WO,
$myrow['stockid'],
$myrow['description'],
locale_number_format($myrow['qtyreqd'],$myrow['decimalplaces']),
locale_number_format($myrow['qtyrecd'],$myrow['decimalplaces']),
locale_number_format($myrow['qtyreqd']-$myrow['qtyrecd'],$myrow['decimalplaces']),
$FormatedStartDate,
- $FormatedRequiredByDate);
+ $FormatedRequiredByDate);
//end of page full new headings if
}
//end of while loop
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/WorkOrderEntry.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -196,10 +196,8 @@
if (!isset($Offset)) {
$Offset=0;
}
- if($Offset<0){
- $Offset=0;
- }
- if($Offset>$ListPageMax AND $ListPageMax>0 )$Offset=$ListPageMax;
+ if($Offset<0)$Offset=0;
+ if($Offset>$ListPageMax)$Offset=$ListPageMax;
$sql = $sql . ' LIMIT ' . $_SESSION['DisplayRecordsMax'].' OFFSET ' . strval($_SESSION['DisplayRecordsMax']*$Offset);
@@ -293,7 +291,7 @@
'" . $NewItem . "',
'" . $EOQ . "',
'" . $Cost . "'
- )";
+ )";
$ErrMsg = _('The work order item could not be added');
$result = DB_query($sql,$db,$ErrMsg);
@@ -354,6 +352,9 @@
if (!isset($_POST['NextLotSNRef'.$i])) {
$_POST['NextLotSNRef'.$i]='';
}
+ if (!isset($_POST['WOComments'.$i])) {
+ $_POST['WOComments'.$i]='';
+ }
if (isset($_POST['QtyRecd'.$i]) AND $_POST['QtyRecd'.$i]>$_POST['OutputQty'.$i]){
$_POST['OutputQty'.$i]=$_POST['QtyRecd'.$i]; //OutputQty must be >= Qty already reced
}
@@ -375,14 +376,16 @@
}
$sql[] = "UPDATE woitems SET qtyreqd = '". $_POST['OutputQty' . $i] . "',
nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."',
- stdcost ='" . $Cost . "'
+ stdcost ='" . $Cost . "',
+ comments = '". $_POST['WOComments'.$i] ."'
WHERE wo='" . $_POST['WO'] . "'
- AND stockid='" . $_POST['OutputItem'.$i] . "'";
+ AND stockid='" . $_POST['OutputItem'.$i] . "'";
} elseif (isset($_POST['HasWOSerialNos'.$i]) AND $_POST['HasWOSerialNos'.$i]==false) {
$sql[] = "UPDATE woitems SET qtyreqd = '". $_POST['OutputQty' . $i] . "',
- nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."'
+ nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."',
+ comments = '". $_POST['WOComments'.$i] ."'
WHERE wo='" . $_POST['WO'] . "'
- AND stockid='" . $_POST['OutputItem'.$i] . "'";
+ AND stockid='" . $_POST['OutputItem'.$i] . "'";
}
}
@@ -403,6 +406,7 @@
unset($_POST['QtyRecd'.$i]);
unset($_POST['NetLotSNRef'.$i]);
unset($_POST['HasWOSerialNos'.$i]);
+ unset($_POST['WOComments'.$i]);
}
}
} elseif (isset($_POST['delete'])) {
@@ -451,6 +455,7 @@
unset($_POST['QtyRecd'.$i]);
unset($_POST['NetLotSNRef'.$i]);
unset($_POST['HasWOSerialNos'.$i]);
+ unset($_POST['WOComments'.$i]);
}
include('includes/footer.inc');
exit;
@@ -490,10 +495,11 @@
controlled,
serialised,
stockmaster.decimalplaces,
- nextserialno
+ nextserialno,
+ woitems.comments
FROM woitems INNER JOIN stockmaster
ON woitems.stockid=stockmaster.stockid
- WHERE wo='" .$_POST['WO'] . "'",$db,$ErrMsg);
+ WHERE wo='" .$_POST['WO'] . "'",$db,$ErrMsg);
$NumberOfOutputs=DB_num_rows($WOItemsResult);
$i=1;
@@ -502,6 +508,7 @@
$_POST['OutputItemDesc'.$i]=$WOItem['description'];
$_POST['OutputQty' . $i]= $WOItem['qtyreqd'];
$_POST['RecdQty' .$i] =$WOItem['qtyrecd'];
+ $_POST['WOComments' .$i] =$WOItem['comments'];
$_POST['DecimalPlaces' . $i] = $WOItem['decimalplaces'];
if ($WOItem['serialised']==1 AND $WOItem['nextserialno']>0){
$_POST['NextLotSNRef' .$i]=$WOItem['nextserialno'];
@@ -558,11 +565,12 @@
echo '</table>
<br /><table class="selection">';
echo '<tr><th>' . _('Output Item') . '</th>
+ <th>' . _('Comments') . '</th>
<th>' . _('Qty Required') . '</th>
<th>' . _('Qty Received') . '</th>
<th>' . _('Balance Remaining') . '</th>
<th>' . _('Next Lot/SN Ref') . '</th>
- </tr>';
+ </tr>';
$j=0;
if (isset($NumberOfOutputs)){
for ($i=1;$i<=$NumberOfOutputs;$i++){
@@ -575,6 +583,7 @@
}
echo '<td><input type="hidden" name="OutputItem' . $i . '" value="' . $_POST['OutputItem' .$i] . '" />' .
$_POST['OutputItem' . $i] . ' - ' . $_POST['OutputItemDesc' .$i] . '</td>';
+ echo'<td><textarea style="width:100%" rows="5" cols="20" name="WOComments' . $i . '" >' . $_POST['WOComments' . $i] . '</textarea></td>';
if ($_POST['Controlled'.$i]==1 AND $_SESSION['DefineControlledOnWOEntry']==1){
echo '<td class="number">' . locale_number_format($_POST['OutputQty' . $i], $_POST['DecimalPlaces' . $i]) . '</td>';
echo '<input type="hidden" name="OutputQty' . $i .'" value="' . locale_number_format($_POST['OutputQty' . $i]-$_POST['RecdQty' .$i], $_POST['DecimalPlaces' . $i]) . '" />';
@@ -739,4 +748,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/WorkOrderIssue.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -89,6 +89,26 @@
$InputError=1;
} else {
$QuantityIssued += filter_number_format($_POST['Qty'.$i]);
+
+ if ($_SESSION['ProhibitNegativeStock']==1 and $_POST['BatchRef'.$i] > "") {
+ $SQL = "SELECT quantity from stockserialitems WHERE (stockid= '" . $_POST['IssueItem'] . "')
+ AND (loccode = '" . $_POST['FromLocation'] . "')
+ AND (serialno = '" . $_POST['BatchRef'.$i] . "')";
+ $Result = DB_query($SQL,$db);
+ //$CheckLot = DB_fetch_array($Result);
+ if (DB_num_rows($Result)==0){
+ $InputError = true;
+ prnMsg(_('This issue cannot be processed because the system parameter is set to prohibit negative stock and this batch does not exist'),'error');
+ }
+ else {
+ $CheckLotRow = DB_fetch_row($Result);
+ if ($CheckLotRow[0]<$_POST['Qty'.$i]){
+ $InputError = true;
+ prnMsg(_('This issue cannot be processed because the system parameter is set to prohibit negative stock and this issue would result in this batch going into negative. Please correct the stock first before attempting another issue'),'error');
+ }
+ }
+ }
+
} //end if the qty field is numeric
} // end if the qty field is entered
}//end for the 15 fields available for batch/lot entry
@@ -111,6 +131,7 @@
if ($_SESSION['ProhibitNegativeStock']==1
AND ($IssueItemRow['mbflag']=='M' OR $IssueItemRow['mbflag']=='B')){
//don't need to check labour or dummy items
+
$SQL = "SELECT quantity FROM locstock
WHERE stockid ='" . $_POST['IssueItem'] . "'
AND loccode ='" . $_POST['FromLocation'] . "'";
@@ -120,7 +141,6 @@
$InputError = true;
prnMsg(_('This issue cannot be processed because the system parameter is set to prohibit negative stock and this issue would result in stock going into negative. Please correct the stock first before attempting another issue'),'error');
}
-
}
if ($InputError==false){
@@ -280,7 +300,7 @@
VALUES ('" . $StkMoveNo . "',
'" . $_POST['IssueItem'] . "',
'" . $_POST['BatchRef'.$i] . "',
- '" . filter_number_format($_POST['Qty'.$i]) . "')";
+ '" . filter_number_format($_POST['Qty'.$i])*-1 . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/doc/Change.log 2014-04-06 02:43:36 UTC (rev 6671)
@@ -1,5 +1,6 @@
webERP Change Log
+6/4/14 Andrew Galuski: Extensions for printing WO documentation new labels and links to print
05/04/14 rchacon: Fixes the bug that emptied ItemDescriptionLanguages.
05/04/14 Exson: Add decimal places check for controlled items quantity input in Add_SerialItems.php and InputSerialItems.php.The wrong decimal places will make this sections quite buggy and problem prone.
05/04/14 Exson: Add a decimal places check in StockAdjustments.php to prevent from wrong decimal places input.
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/includes/PDFStarter.php 2014-04-06 02:43:36 UTC (rev 6671)
@@ -160,6 +160,18 @@
$Left_Margin = 36; // Half inch = 72/2
$Right_Margin = 36; // Half inch = 72/2
break;
+
+ case 'A6_Landscape':
+ $DocumentPaper = 'A6';
+ $DocumentOrientation ='L';
+ $Page_Width=417;
+ $Page_Height=295;
+ $Top_Margin=10;
+ $Bottom_Margin=10;
+ $Left_Margin=10;
+ $Right_Margin=10;
+ break;
+
default:
$DocumentOrientation = 'L';
break;
@@ -182,4 +194,5 @@
$pdf->AddPage();
$pdf->cMargin = 0;
/* END Brought from class.pdf.php constructor */
-?>
\ No newline at end of file
+
+?>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-05 23:40:13 UTC (rev 6670)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-06 02:43:36 UTC (rev 6671)
@@ -1,5 +1,9 @@
INSERT INTO `systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0');
INSERT INTO config (confname, confvalue) VALUES ('AutoSupplierNo', '0');
DELETE FROM config WHERE confname='DefaultTheme';
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFWOPrint.php', '11', 'Produces W/O Paperwork');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFFGLabel.php', '11', 'Produces FG Labels');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFQALabel.php', '2', 'Produces a QA label on receipt of stock');
+ALTER TABLE `woitems` ADD `comments` LONGBLOB NULL DEFAULT NULL ;
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <ex...@us...> - 2014-04-06 13:20:23
|
Revision: 6674
http://sourceforge.net/p/web-erp/reponame/6674
Author: exsonqu
Date: 2014-04-06 13:20:18 +0000 (Sun, 06 Apr 2014)
Log Message:
-----------
06/04/14 Exson: Fixed the quote date and order confirmed date has not been retrieved for orders to modify in SelectOrderItems.php.
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-04-06 02:47:50 UTC (rev 6673)
+++ trunk/SelectOrderItems.php 2014-04-06 13:20:18 UTC (rev 6674)
@@ -112,6 +112,8 @@
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
salesorders.quotation,
+ salesorders.quotedate,
+ salesorders.confirmeddate,
salesorders.deliverblind,
debtorsmaster.customerpoline,
locations.locationname,
@@ -173,6 +175,8 @@
$_SESSION['Items'.$identifier]->Location = $myrow['fromstkloc'];
$_SESSION['Items'.$identifier]->LocationName = $myrow['locationname'];
$_SESSION['Items'.$identifier]->Quotation = $myrow['quotation'];
+ $_SESSION['Items'.$identifier]->QuoteDate = ConvertSQLDate($myrow['quotedate']);
+ $_SESSION['Items'.$identifier]->ConfirmedDate = ConvertSQLDate($myrow['confirmeddate']);
$_SESSION['Items'.$identifier]->FreightCost = $myrow['freightcost'];
$_SESSION['Items'.$identifier]->Orig_OrderDate = $myrow['orddate'];
$_SESSION['PrintedPackingSlip'] = $myrow['printedpackingslip'];
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-04-06 02:47:50 UTC (rev 6673)
+++ trunk/doc/Change.log 2014-04-06 13:20:18 UTC (rev 6674)
@@ -1,5 +1,6 @@
webERP Change Log
+06/04/14 Exson: Fixed the quote date and order confirmed date has not been retrieved for orders to modify in SelectOrderItems.php.
6/4/14 Andrew Galuski: Extensions for printing WO documentation new labels and links to print
05/04/14 rchacon: Fixes the bug that emptied ItemDescriptionLanguages.
05/04/14 Exson: Add decimal places check for controlled items quantity input in Add_SerialItems.php and InputSerialItems.php.The wrong decimal places will make this sections quite buggy and problem prone.
|
|
From: <rc...@us...> - 2014-04-07 14:26:46
|
Revision: 6679
http://sourceforge.net/p/web-erp/reponame/6679
Author: rchacon
Date: 2014-04-07 14:26:40 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Add /* $Id: StockClone.php ...
Modified Paths:
--------------
trunk/StockClone.php
trunk/Stocks.php
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2014-04-07 10:39:29 UTC (rev 6678)
+++ trunk/StockClone.php 2014-04-07 14:26:40 UTC (rev 6679)
@@ -1,5 +1,5 @@
<?php
-/* $Id$ */
+/* $Id: StockClone.php 6669 2014-04-05 23:31:54Z rchacon $ */
include('includes/session.inc');
$Title = _('Clone Item');
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2014-04-07 10:39:29 UTC (rev 6678)
+++ trunk/Stocks.php 2014-04-07 14:26:40 UTC (rev 6679)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$ */
include('includes/session.inc');
|
|
From: <dai...@us...> - 2014-04-08 08:27:10
|
Revision: 6680
http://sourceforge.net/p/web-erp/reponame/6680
Author: daintree
Date: 2014-04-08 08:27:07 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
Andrew Galuski missing files from QA label and WO labels work
Modified Paths:
--------------
trunk/Z_MakeNewCompany.php
Added Paths:
-----------
trunk/PDFFGLabel.php
trunk/PDFQALabel.php
Added: trunk/PDFFGLabel.php
===================================================================
--- trunk/PDFFGLabel.php (rev 0)
+++ trunk/PDFFGLabel.php 2014-04-08 08:27:07 UTC (rev 6680)
@@ -0,0 +1,220 @@
+<?php
+
+/* $Id: PDFFGLabel.php agaluski $*/
+
+include('includes/session.inc');
+
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+if (isset($_GET['StockID'])) {
+ $StockID = $_GET['StockID'];
+} elseif (isset($_POST['StockID'])){
+ $StockID = $_POST['StockID'];
+} else {
+ unset($StockID);
+}
+
+
+if (isset($_GET['LabelItem'])) {
+ $LabelItem = $_GET['LabelItem'];
+} elseif (isset($_POST['LabelItem'])){
+ $LabelItem = $_POST['LabelItem'];
+} else {
+ unset($LabelItem);
+}
+if (isset($_GET['LabelDesc'])) {
+ $LabelDesc = $_GET['LabelDesc'];
+} elseif (isset($_POST['LabelDesc'])){
+ $LabelDesc = $_POST['LabelDesc'];
+} else {
+ unset($LabelDesc);
+}
+if (isset($_GET['LabelLot'])) {
+ $LabelLot = $_GET['LabelLot'];
+} elseif (isset($_POST['LabelLot'])){
+ $LabelLot = $_POST['LabelLot'];
+} else {
+ unset($LabelLot);
+}
+if (isset($_GET['NoOfBoxes'])) {
+ $NoOfBoxes = $_GET['NoOfBoxes'];
+} elseif (isset($_POST['NoOfBoxes'])){
+ $NoOfBoxes = $_POST['NoOfBoxes'];
+} else {
+ unset($NoOfBoxes);
+}
+if (isset($_GET['LabelsPerBox'])) {
+ $LabelsPerBox = $_GET['LabelsPerBox'];
+} elseif (isset($_POST['LabelsPerBox'])){
+ $LabelsPerBox = $_POST['LabelsPerBox'];
+} else {
+ unset($LabelsPerBox);
+}
+if (isset($_GET['QtyPerBox'])) {
+ $QtyPerBox = $_GET['QtyPerBox'];
+} elseif (isset($_POST['QtyPerBox'])){
+ $QtyPerBox = $_POST['QtyPerBox'];
+} else {
+ unset($QtyPerBox);
+}
+if (isset($_GET['LeftOverQty'])) {
+ $LeftOverQty = $_GET['LeftOverQty'];
+} elseif (isset($_POST['LeftOverQty'])){
+ $LeftOverQty = $_POST['LeftOverQty'];
+} else {
+ unset($LeftOverQty);
+}
+
+/* If we are previewing the order then we dont want to email it */
+if ($SelectedWO == 'Preview') { //WO is set to 'Preview' when just looking at the format of the printed order
+ $_POST['PrintOrEmail'] = 'Print';
+ $MakePDFThenDisplayIt = True;
+} //$SelectedWO == 'Preview'
+
+if (isset($_POST['DoIt']) AND ($_POST['PrintOrEmail'] == 'Print' OR $ViewingOnly == 1)) {
+ $MakePDFThenDisplayIt = True;
+ $MakePDFThenEmailIt = False;
+} elseif (isset($_POST['DoIt']) AND $_POST['PrintOrEmail'] == 'Email' AND isset($_POST['EmailTo'])) {
+ $MakePDFThenEmailIt = True;
+ $MakePDFThenDisplayIt = False;
+}
+
+$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/FGLabel.xml');
+
+// Set the paper size/orintation
+$PaperSize = $FormDesign->PaperSize;
+$line_height=$FormDesign->LineHeight;
+include('includes/PDFStarter.php');
+$PageNumber=1;
+$pdf->addInfo('Title', _('FG Label') );
+
+if ($SelectedWO == 'Preview'){
+ $myrow['itemcode'] = str_pad('', 15,'x');
+ $myrow['itemdescription'] = str_pad('', 25,'x');
+ $myrow['serialno'] = str_pad('', 20,'x');
+ $myrow['weight'] = '99999999';
+ $ControlledRow['1'] = 'lbs';
+ $ControlledRow['controlled']=1;
+ $NoOfLabels =1;
+} else { //NOT PREVIEW
+ $i=1;
+ $NoOfLabels=$NoOfBoxes*$LabelsPerBox;
+ $BoxNumber=1;
+ while($i<=$NoOfLabels){
+ $myarray[$i]['itemcode']=$LabelItem;
+ $myarray[$i]['itemdescription']=$LabelDesc;
+ $myarray[$i]['serialno']=$LabelLot;
+ $myarray[$i]['weight']=$QtyPerBox;
+ $myarray[$i]['box']=$BoxNumber;
+ if ($i % $LabelsPerBox == 0) {
+ $BoxNumber+=1;
+ }
+ $i++;
+ }
+ if ($LeftOverQty>0) {
+ $j=1;
+ while($j<=$LabelsPerBox){
+ $myarray[$i]['itemcode']=$LabelItem;
+ $myarray[$i]['itemdescription']=$LabelDesc;
+ $myarray[$i]['serialno']=$LabelLot;
+ $myarray[$i]['weight']=$LeftOverQty;
+ $myarray[$i]['box']=$BoxNumber;
+ if ($i % $LabelsPerBox == 0) {
+ $BoxNumber+=1;
+ }
+ $i++;
+ $j++;
+ $NoOfLabels++;
+ }
+ }
+} // get data to print
+if ($NoOfLabels >0){
+
+ for ($i=1;$i<=$NoOfLabels;$i++) {
+ if ($SelectedWO!='Preview'){
+ $myrow = $myarray[$i];
+ //echo $myrow['itemcode'] ;
+ $SQL = "SELECT stockmaster.controlled,
+ stockmaster.units
+ FROM stockmaster WHERE stockid ='" . $myrow['itemcode'] . "'";
+ //echo $SQL;
+ $CheckControlledResult = DB_query($SQL,$db,'<br />' . _('Could not determine if the item was controlled or not because') . ' ');
+ $ControlledRow = DB_fetch_row($CheckControlledResult);
+ //var_dump($ControlledRow);
+ }
+ if ($PageNumber>1){
+ $pdf->newPage();
+ }
+ $PageNumber++;
+ $pdf->addJpegFromFile($_SESSION['LogoFile'] ,$FormDesign->logo->x,$Page_Height-$FormDesign->logo->y,$FormDesign->logo->width,$FormDesign->logo->height);
+ $pdf->addText($FormDesign->CompanyAddress->Line1->x,$Page_Height - $FormDesign->CompanyAddress->Line1->y, $FormDesign->CompanyAddress->Line1->FontSize, $_SESSION['CompanyRecord']['regoffice1']);
+ $pdf->addText($FormDesign->CompanyAddress->Line2->x,$Page_Height - $FormDesign->CompanyAddress->Line2->y, $FormDesign->CompanyAddress->Line2->FontSize, $_SESSION['CompanyRecord']['regoffice2']);
+ $pdf->addText($FormDesign->CompanyAddress->Line3->x,$Page_Height - $FormDesign->CompanyAddress->Line3->y, $FormDesign->CompanyAddress->Line3->FontSize, $_SESSION['CompanyRecord']['regoffice3']);
+ $pdf->addText($FormDesign->CompanyAddress->phone->x,$Page_Height - $FormDesign->CompanyAddress->phone->y, $FormDesign->CompanyAddress->phone->FontSize, _('Tel'). ': ' . $_SESSION['CompanyRecord']['telephone']);
+ $pdf->addText($FormDesign->CompanyAddress->www->x,$Page_Height - $FormDesign->CompanyAddress->www->y, $FormDesign->CompanyAddress->www->FontSize, $_SESSION['CompanyRecord']['regoffice4']);
+ $pdf->Line($FormDesign->LabelLine->startx, $Page_Height - $FormDesign->LabelLine->starty, $FormDesign->LabelLine->endx,$Page_Height - $FormDesign->LabelLine->endy);
+ $pdf->addText($FormDesign->ItemNbr->x,$Page_Height-$FormDesign->ItemNbr->y,$FormDesign->ItemNbr->FontSize,'Item: ' . $myrow['itemcode']);
+ $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
+ $pdf->addText($FormDesign->Weight->x,$Page_Height-$FormDesign->Weight->y,$FormDesign->Weight->FontSize,'Weight' . '(' . $ControlledRow['1'] . '): ' . $myrow['weight']);
+ $pdf->addText($FormDesign->Box->x,$Page_Height-$FormDesign->Box->y,$FormDesign->Box->FontSize,'Box' . ': ' . $myrow['box']);
+
+ if ($ControlledRow[0]==1) { /*Then its a controlled item */
+ $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'Lot: ' . $myrow['serialno']);
+ } //controlled item*/
+ } //end of loop around GRNs to print
+
+ $Success = 1; //assume the best and email goes - has to be set to 1 to allow update status
+ if ($MakePDFThenDisplayIt) {
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_FGLABEL_' . $SelectedWO . '_' . date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
+ } else {
+ $PdfFileName = $_SESSION['DatabaseName'] . '__FGLABEL_' . $SelectedWO . '_' . date('Y-m-d') . '.pdf';
+ $pdf->Output($_SESSION['reports_dir'] . '/' . $PdfFileName, 'F');
+ $pdf->__destruct();
+ include('includes/htmlMimeMail.php');
+ $mail = new htmlMimeMail();
+ $attachment = $mail->getFile($_SESSION['reports_dir'] . '/' . $PdfFileName);
+ $mail->setText(_('Please Process this Work order number') . ' ' . $SelectedWO);
+ $mail->setSubject(_('Work Order Number') . ' ' . $SelectedWO);
+ $mail->addAttachment($attachment, $PdfFileName, 'application/pdf');
+ //since sometime the mail server required to verify the users, so must set this information.
+ if($_SESSION['SmtpSetting'] == 0){//use the mail service provice by the server.
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $Success = $mail->send(array($_POST['EmailTo']));
+ }else if($_SESSION['SmtpSetting'] == 1) {
+ $Success = SendmailBySmtp($mail,array($_POST['EmailTo']));
+
+ }else{
+ prnMsg(_('The SMTP settings are wrong, please ask administrator for help'),'error');
+ exit;
+ include('includes/footer.inc');
+ }
+
+ if ($Success == 1) {
+ $Title = _('Email a Work Order');
+ include('includes/header.inc');
+ echo '<div class="centre"><br /><br /><br />';
+ prnMsg(_('Work Order') . ' ' . $SelectedWO . ' ' . _('has been emailed to') . ' ' . $_POST['EmailTo'] . ' ' . _('as directed'), 'success');
+
+ } else { //email failed
+ $Title = _('Email a Work Order');
+ include('includes/header.inc');
+ echo '<div class="centre"><br /><br /><br />';
+ prnMsg(_('Emailing Work order') . ' ' . $SelectedWO . ' ' . _('to') . ' ' . $_POST['EmailTo'] . ' ' . _('failed'), 'error');
+ }
+ }
+ include('includes/footer.inc');
+
+} else { //there were not labels to print
+ $Title = _('Label Error');
+ include('includes/header.inc');
+ prnMsg(_('There were no labels to print'),'warn');
+ echo '<br /><a href="'.$RootPath.'/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+}
+?>
Added: trunk/PDFQALabel.php
===================================================================
--- trunk/PDFQALabel.php (rev 0)
+++ trunk/PDFQALabel.php 2014-04-08 08:27:07 UTC (rev 6680)
@@ -0,0 +1,119 @@
+<?php
+
+/* $Id: PDFQALabel.php agaluski $*/
+
+include('includes/session.inc');
+
+if (isset($_GET['GRNNo'])) {
+ $GRNNo=$_GET['GRNNo'];
+} else {
+ $GRNNo='';
+}
+
+$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/QALabel.xml');
+
+// Set the paper size/orintation
+$PaperSize = $FormDesign->PaperSize;
+$line_height=$FormDesign->LineHeight;
+include('includes/PDFStarter.php');
+$PageNumber=1;
+$pdf->addInfo('Title', _('QA Label') );
+
+if ($GRNNo == 'Preview'){
+ $myrow['itemcode'] = str_pad('', 15,'x');
+ $myrow['itemdescription'] = str_pad('', 30,'x');
+ $myrow['serialno'] = str_pad('', 20,'x');
+ $myrow['reslot'] = str_pad('', 20,'x');
+ $SuppRow['suppname'] = str_pad('', 30,'x');
+ $myrow['deliverydate'] = '0000-00-00';
+ $myrow['orderno'] = '0000000000';
+ $NoOfGRNs =1;
+} else { //NOT PREVIEW
+
+ $sql="SELECT grns.itemcode,
+ grns.grnno,
+ grns.deliverydate,
+ grns.itemdescription,
+ grns.supplierid,
+ purchorderdetails.orderno
+ FROM grns INNER JOIN purchorderdetails
+ ON grns.podetailitem=purchorderdetails.podetailitem
+ LEFT JOIN stockmaster
+ ON grns.itemcode=stockmaster.stockid
+ WHERE grnbatch='". $GRNNo ."'";
+
+ $GRNResult=DB_query($sql, $db);
+ $NoOfGRNs = DB_num_rows($GRNResult);
+ if($NoOfGRNs>0) { //there are GRNs to print
+
+ $sql = "SELECT suppliers.suppname
+ FROM grns INNER JOIN suppliers
+ ON grns.supplierid=suppliers.supplierid
+ WHERE grnbatch='". $GRNNo ."'";
+ $SuppResult = DB_query($sql,$db,_('Could not get the supplier of the selected GRN'));
+ $SuppRow = DB_fetch_array($SuppResult);
+ }
+} // get data to print
+if ($NoOfGRNs >0){
+
+ for ($i=1;$i<=$NoOfGRNs;$i++) {
+ if ($GRNNo!='Preview'){
+ $myrow = DB_fetch_array($GRNResult);
+ }
+ $DeliveryDate = ConvertSQLDate($myrow['deliverydate']);
+ $SQL = "SELECT stockmaster.controlled
+ FROM stockmaster WHERE stockid ='" . $myrow['itemcode'] . "'";
+ $CheckControlledResult = DB_query($SQL,$db,'<br />' . _('Could not determine if the item was controlled or not because') . ' ');
+ $ControlledRow = DB_fetch_row($CheckControlledResult);
+
+ if ($ControlledRow[0]==1) { /*Then its a controlled item */
+ $SQL = "SELECT stockserialmoves.serialno
+ FROM stockmoves INNER JOIN stockserialmoves
+ ON stockmoves.stkmoveno= stockserialmoves.stockmoveno
+ WHERE stockmoves.stockid='" . $myrow['itemcode'] . "'
+ AND stockmoves.type =25
+ AND stockmoves.transno='" . $GRNNo . "'";
+ $GetStockMoveResult = DB_query($SQL,$db,_('Could not retrieve the stock movement reference number which is required in order to retrieve details of the serial items that came in with this GRN'));
+ while ($SerialStockMoves = DB_fetch_array($GetStockMoveResult)){
+ if ($PageNumber>1){
+ $pdf->newPage();
+ }
+ $pdf->addJpegFromFile($_SESSION['LogoFile'] ,$FormDesign->logo->x,$Page_Height-$FormDesign->logo->y,$FormDesign->logo->width,$FormDesign->logo->height);
+ $LeftOvers = $pdf->addText($FormDesign->ItemNbr->x,$Page_Height-$FormDesign->ItemNbr->y,$FormDesign->ItemNbr->FontSize,'Item: ' . $myrow['itemcode']);
+ $LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
+ $LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
+ $LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $SerialStockMoves['serialno']);
+ $LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $SerialStockMoves['serialno']);
+ $LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
+ $LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
+ $PageNumber++;
+ } //while SerialStockMoves
+
+ } //controlled item*/
+ else {
+ $pdf->addJpegFromFile($_SESSION['LogoFile'] ,$FormDesign->logo->x,$Page_Height-$FormDesign->logo->y,$FormDesign->logo->width,$FormDesign->logo->height);
+ $LeftOvers = $pdf->addText($FormDesign->ItemNbr->x,$Page_Height-$FormDesign->ItemNbr->y,$FormDesign->ItemNbr->FontSize,'Item: ' . $myrow['itemcode']);
+ $LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
+ $LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
+ //$LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $myrow['serialno']);
+ //$LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $myrow['serialno']);
+ $LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
+ $LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
+ if ($PageNumber>1){
+ $pdf->newPage();
+ }
+ $PageNumber++;
+ } //else not controlled
+ } //end of loop around GRNs to print
+
+
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_GRN_' . $GRNNo . '_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
+} else { //there were not GRNs to print
+ $Title = _('GRN Error');
+ include('includes/header.inc');
+ prnMsg(_('There were no GRNs to print'),'warn');
+ echo '<br /><a href="'.$RootPath.'/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+}
+?>
Modified: trunk/Z_MakeNewCompany.php
===================================================================
--- trunk/Z_MakeNewCompany.php 2014-04-07 14:26:40 UTC (rev 6679)
+++ trunk/Z_MakeNewCompany.php 2014-04-08 08:27:07 UTC (rev 6680)
@@ -138,6 +138,9 @@
copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/GoodsReceived.xml', './companies/' .$_POST['NewDatabase'] . '/FormDesigns/GoodsReceived.xml');
copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/PickingList.xml', './companies/' .$_POST['NewDatabase'] . '/FormDesigns/PickingList.xml');
copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/PurchaseOrder.xml', './companies/' .$_POST['NewDatabase'] . '/FormDesigns/PurchaseOrder.xml');
+ copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/FGLabel.xml', './companies/' . $_POST['NewDatabase'] . '/FormDesigns/FGLabel.xml');
+ copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/WOPaperwork.xml', './companies/' . $_POST['NewDatabase'] . '/FormDesigns/WOPaperwork.xml');
+ copy ('./companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/QALabel.xml', './companies/' . $_POST['NewDatabase'] . '/FormDesigns/QALabel.xml');
/*OK Now upload the logo */
if ($UploadTheLogo=='Yes'){
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X