diff --git a/FixedAssetRegister.php b/FixedAssetRegister.php index 9a59da9af..9f94e8f00 100644 --- a/FixedAssetRegister.php +++ b/FixedAssetRegister.php @@ -76,7 +76,7 @@ } elseif (isset($_POST['csv'])) { $csv_output = "'Asset ID','Description','Serial Number','Location','Date Acquired','Cost B/Fwd','Period Additions','Depn B/Fwd','Period Depreciation','Cost C/Fwd', 'Accum Depn C/Fwd','NBV','Disposal Value'\n"; } else { - echo '
+ echo '
'; echo ''; echo '
' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '
'; diff --git a/FormDesigner.php b/FormDesigner.php index 9cd95f397..99101c3d0 100644 --- a/FormDesigner.php +++ b/FormDesigner.php @@ -147,25 +147,25 @@ function SelectShowElement($keyName, $keyValue) { $FormDesign->asXML(sys_get_temp_dir().'/'.$_POST['FormName']); switch ($_POST['FormName']) { case 'PurchaseOrder.xml': - echo ''; + echo ''; break; case 'GoodsReceived.xml': - echo ''; + echo ''; break; case 'PickingList.xml': - echo ''; + echo ''; break; case 'QALabel.xml': - echo ''; + echo ''; break; case 'WOPaperwork.xml': - echo ''; + echo ''; break; case 'FGLabel.xml': - echo ''; + echo ''; break; case 'ShippingLabel.xml': - echo ''; + echo ''; break; } } else { @@ -183,7 +183,7 @@ function SelectShowElement($keyName, $keyValue) { * drop down list of possible forms */ if (empty($_POST['FormName'])) { echo '

' . ' ' . $Title . '


'; - echo ''; + echo ''; echo '
'; echo ''; echo ''; @@ -219,7 +219,7 @@ function SelectShowElement($keyName, $keyValue) { _('All coordinates are measured from the lower left corner of the sheet to the top left corner of the element.') . '
'; $Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A6_Landscape', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations -echo ''; +echo ''; echo '
'; echo ''; echo ''; diff --git a/MRPReschedules.php b/MRPReschedules.php index 9c365e9e2..1cdbae10a 100644 --- a/MRPReschedules.php +++ b/MRPReschedules.php @@ -12,7 +12,7 @@ include('includes/header.php'); echo '
'; prnMsg( _('The MRP calculation must be run before you can run this report') . '
' . - _('To run the MRP calculation click').' ' . '' . _('here') . '', 'error'); + _('To run the MRP calculation click').' ' . '' . _('here') . '', 'error'); include('includes/footer.php'); exit; } @@ -55,7 +55,7 @@ $Title = _('MRP Reschedules') . ' - ' . _('Problem Report'); include('includes/header.php'); prnMsg( _('No MRP reschedule retrieved'), 'warn'); - echo '
' . _('Back to the menu') . ''; + echo '
' . _('Back to the menu') . ''; if ($debug==1){ echo '
' . $sql; } diff --git a/SuppShiptChgs.php b/SuppShiptChgs.php index f668d4a25..f9633b698 100644 --- a/SuppShiptChgs.php +++ b/SuppShiptChgs.php @@ -87,7 +87,7 @@ echo '
- '; + '; $TotalShiptValue = $TotalShiptValue + $EnteredShiptRef->Amount; diff --git a/SupplierCredit.php b/SupplierCredit.php index 860857fe8..18461127a 100644 --- a/SupplierCredit.php +++ b/SupplierCredit.php @@ -30,9 +30,6 @@ include('includes/header.php'); include('includes/SQL_CommonFunctions.inc'); -//this is available from the menu on this page already -//echo "" . _('Back to Suppliers') . '
'; - if (isset($_GET['New'])) { unset($_SESSION['SuppTrans']); } diff --git a/Z_DataExport.php b/Z_DataExport.php index cd7a027fe..72da180f8 100644 --- a/Z_DataExport.php +++ b/Z_DataExport.php @@ -69,7 +69,7 @@ function NULLToPrice( &$Field ) { $Title = _('Price List Export Problem ....'); include('includes/header.php'); prnMsg( _('The Price List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error'); - echo '
' . _('Back to the menu'). ''; + echo '
' . _('Back to the menu'). ''; if ($debug==1){ echo '
' . $SQL; } @@ -344,7 +344,7 @@ function NULLToPrice( &$Field ) { $Title = _('Security Token List Export Problem ....'); include('includes/header.php'); prnMsg( _('The Security Token List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error'); - echo '
' . _('Back to the menu'). ''; + echo '
' . _('Back to the menu'). ''; if ($debug==1){ echo '
' . $SQL; } @@ -416,7 +416,7 @@ function NULLToPrice( &$Field ) { $Title = _('Security Group List Export Problem ....'); include('includes/header.php'); prnMsg( _('The Security Group List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error'); - echo '
' . _('Back to the menu'). ''; + echo '
' . _('Back to the menu'). ''; if ($debug==1){ echo '
' . $SQL; } diff --git a/Z_ImportGLAccountGroups.php b/Z_ImportGLAccountGroups.php index 6298725fb..b99d194a1 100644 --- a/Z_ImportGLAccountGroups.php +++ b/Z_ImportGLAccountGroups.php @@ -66,7 +66,7 @@ prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '
' . _('The first line must contain the field names that you wish to import. '). '' . _('The field names can be found here'). '', 'info'); - echo ''; + echo ''; echo '
'; echo ''; echo '
' . $EnteredShiptRef->ShiptRef . ' ' . locale_number_format($EnteredShiptRef->Amount,2) . '' . _('Delete') . '
' . _('Delete') . '
' . diff --git a/Z_ImportGLAccountSections.php b/Z_ImportGLAccountSections.php index 82c0b4b4a..761a027c0 100644 --- a/Z_ImportGLAccountSections.php +++ b/Z_ImportGLAccountSections.php @@ -70,7 +70,7 @@ prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '
' . _('The first line must contain the field names that you wish to import. '). '' . _('The field names can be found here'). '', 'info'); - echo ''; + echo ''; echo '
'; echo ''; echo '
' . _('File to import') . '
' . diff --git a/Z_ImportPartCodes.php b/Z_ImportPartCodes.php index 4c426ab9b..f32d47099 100644 --- a/Z_ImportPartCodes.php +++ b/Z_ImportPartCodes.php @@ -77,7 +77,7 @@ prnMsg( _('Select a csv file containing the details of the parts that you wish to import into webERP. '). '
' . _('The first line must contain the field names that you wish to import. '). '' . _('The field names can be found here'). '', 'info'); - echo ''; + echo ''; echo '
'; echo ''; echo '
' . _('File to import') . '
' . diff --git a/Z_MakeNewCompany.php b/Z_MakeNewCompany.php index b8ed30b05..fe334f94d 100644 --- a/Z_MakeNewCompany.php +++ b/Z_MakeNewCompany.php @@ -9,7 +9,7 @@ if (isset($_POST['EnterCompanyDetails'])) { - header ('Location:' . $RootPath . '/CompanyPreferences.php?' . SID); + header ('Location:' . $RootPath . '/CompanyPreferences.php'); exit; } $Title = _('Make New Company Database Utility'); @@ -31,7 +31,7 @@ prnMsg(_('Company database must not contain spaces, \& or " or \''),'error'); } else { $_POST['NewDatabase'] = strtolower($_POST['NewDatabase']); - echo ''; + echo ''; echo '
'; echo ''; /* check for directory existence */ @@ -229,7 +229,7 @@ prnMsg (_('This utility will create a new company') . '

' . _('If the company name already exists then you cannot recreate it'), 'info', _('PLEASE NOTE')); echo '
'; -echo ''; +echo ''; echo '
'; echo ''; diff --git a/Z_ReApplyCostToSA.php b/Z_ReApplyCostToSA.php index 69479ccba..90fb2f5ae 100755 --- a/Z_ReApplyCostToSA.php +++ b/Z_ReApplyCostToSA.php @@ -8,7 +8,7 @@ $Period = 42; -echo ""; +echo ''; echo '
'; echo ''; diff --git a/Z_RemovePurchaseBackOrders.php b/Z_RemovePurchaseBackOrders.php index 12473ff43..040ec36d4 100644 --- a/Z_RemovePurchaseBackOrders.php +++ b/Z_RemovePurchaseBackOrders.php @@ -6,7 +6,7 @@ $Title=_('Remove Purchase Order Back Orders'); include('includes/header.php'); -echo ""; +echo ''; echo ''; echo '
diff --git a/Z_Upgrade3.10.php b/Z_Upgrade3.10.php index d8cdd6947..4c59c12dd 100644 --- a/Z_Upgrade3.10.php +++ b/Z_Upgrade3.10.php @@ -9,7 +9,7 @@ prnMsg(_('This script will perform any modifications to the database since v 3.10 required to allow the additional functionality in version 3.10 scripts'),'info'); if (!isset($_POST['DoUpgrade'])) { - echo "
"; + echo '
'; echo ''; echo '
'; echo ''; diff --git a/Z_Upgrade_3.04-3.05.php b/Z_Upgrade_3.04-3.05.php index 23aa70fdf..564437842 100644 --- a/Z_Upgrade_3.04-3.05.php +++ b/Z_Upgrade_3.04-3.05.php @@ -9,8 +9,8 @@ prnMsg(_('This script will run perform any modifications to the database required to allow the additional functionality in version 3.05 scripts'),'info'); -echo "

"; - echo ''; +echo '

'; +echo ''; echo ''; echo ''; diff --git a/Z_Upgrade_3.05-3.06.php b/Z_Upgrade_3.05-3.06.php index 1a41fc31d..e98b50e20 100644 --- a/Z_Upgrade_3.05-3.06.php +++ b/Z_Upgrade_3.05-3.06.php @@ -8,7 +8,7 @@ prnMsg(_('This script will run perform any modifications to the database since v 3.06 required to allow the additional functionality in version 3.07 scripts'),'info'); -echo "

"; +echo '

'; echo ''; echo ''; echo ''; diff --git a/Z_Upgrade_3.07-3.08.php b/Z_Upgrade_3.07-3.08.php index 768db3c04..ee3132c04 100644 --- a/Z_Upgrade_3.07-3.08.php +++ b/Z_Upgrade_3.07-3.08.php @@ -8,7 +8,7 @@ prnMsg(_('This script will run perform any modifications to the database since v 3.071 required to allow the additional functionality in version 3.08 scripts'),'info'); -echo "

"; +echo '

'; echo ''; echo ''; echo ''; diff --git a/Z_Upgrade_3.08-3.09.php b/Z_Upgrade_3.08-3.09.php index 0d8949d0f..aa1e2858b 100644 --- a/Z_Upgrade_3.08-3.09.php +++ b/Z_Upgrade_3.08-3.09.php @@ -8,8 +8,8 @@ prnMsg(_('This script will run perform any modifications to the database since v 3.08 required to allow the additional functionality in version 3.09 scripts'),'info'); -echo "

"; - echo ''; +echo '

'; +echo ''; echo ''; echo ''; diff --git a/Z_Upgrade_3.09-3.10.php b/Z_Upgrade_3.09-3.10.php index 005dc9b7e..34f3263ce 100644 --- a/Z_Upgrade_3.09-3.10.php +++ b/Z_Upgrade_3.09-3.10.php @@ -8,8 +8,8 @@ prnMsg(_('This script will run perform any modifications to the database since v 3.09 required to allow the additional functionality in version 3.09 scripts'),'info'); -echo "

"; - echo ''; +echo '

'; +echo ''; echo ''; echo ''; diff --git a/Z_Upgrade_3.10-3.11.php b/Z_Upgrade_3.10-3.11.php index 02de45421..69f928c0d 100644 --- a/Z_Upgrade_3.10-3.11.php +++ b/Z_Upgrade_3.10-3.11.php @@ -9,7 +9,7 @@ if (empty($_POST['DoUpgrade'])){ prnMsg(_('This script will run perform any modifications to the database since v 3.10 required to allow the additional functionality in version 3.11 scripts'),'info'); - echo "

"; + echo '

'; echo ''; echo '

'; echo ''; diff --git a/Z_Upgrade_3.11-4.00.php b/Z_Upgrade_3.11-4.00.php index 52245b2f1..8bd0a51e1 100644 --- a/Z_Upgrade_3.11-4.00.php +++ b/Z_Upgrade_3.11-4.00.php @@ -9,7 +9,7 @@ if (empty($_POST['DoUpgrade'])){ prnMsg(_('This script will run perform any modifications to the database since v 3.11 required to allow the additional functionality in version 4.00 scripts'),'info'); - echo "

"; + echo '

'; echo ''; echo '

'; echo ''; diff --git a/Z_poAddLanguage.php b/Z_poAddLanguage.php index f539216c1..87ed27c95 100644 --- a/Z_poAddLanguage.php +++ b/Z_poAddLanguage.php @@ -12,7 +12,7 @@ if (isset($_POST['cancel'])) { - header ('Location:' . $RootPath . '/Z_poAdmin.php?' . SID); + header ('Location:' . $RootPath . '/Z_poAdmin.php'); exit; } @@ -50,7 +50,7 @@ echo '
'; echo '
'; - echo '
'; + echo ''; echo ''; @@ -87,7 +87,7 @@ prnMsg (_('This utility will create a new language and a new language translation file for it from the system default') . '

' . _('If the language already exists then you cannot recreate it'), 'info', _('PLEASE NOTE')); echo '
'; -echo ''; +echo ''; echo ''; echo '
' . _('File to import') . '
'; diff --git a/Z_poAdmin.php b/Z_poAdmin.php index 447d77fbb..69e2c813c 100644 --- a/Z_poAdmin.php +++ b/Z_poAdmin.php @@ -25,13 +25,13 @@ if (!is_writable('./locale/' . $_SESSION['Language'])) { prnMsg(_('You do not have write access to the required files please contact your system administrator'),'error'); } else { - echo '

' . _('Rebuild the System Default Language File') . ''; - echo '

' . _('Add a New Language to the System') . ''; - echo '

' . _('Edit a Language File Header') . ''; - echo '

' . _('Edit a Language File Module') . ''; - echo '

' . _('Edit Remaining Strings For This Language') . ''; - echo '

' . _('Download messages.po file') . ''; - echo '

' . _('Download messages.mo file') . ''; + echo '

' . _('Rebuild the System Default Language File') . ''; + echo '

' . _('Add a New Language to the System') . ''; + echo '

' . _('Edit a Language File Header') . ''; + echo '

' . _('Edit a Language File Module') . ''; + echo '

' . _('Edit Remaining Strings For This Language') . ''; + echo '

' . _('Download messages.po file') . ''; + echo '

' . _('Download messages.mo file') . ''; } include('includes/footer.php'); diff --git a/Z_poEditLangHeader.php b/Z_poEditLangHeader.php index 7794f1135..e0ce0d80c 100644 --- a/Z_poEditLangHeader.php +++ b/Z_poEditLangHeader.php @@ -33,7 +33,7 @@ if (isset($_POST['submit'])) { echo '

'; - echo ''; + echo ''; echo ''; /* write the new header then the rest of the language file to a new file */ @@ -90,7 +90,7 @@ prnMsg (_('Your existing translation file (messages.po) will be backed up as messages.po.old') . '

' . _('Make sure you know what you are doing BEFORE you edit the header'), 'info', _('PLEASE NOTE')); echo '
'; - echo ''; + echo ''; echo ''; echo '' . _('Language File Header for') . ' "' . $_POST['language'] . '"'; diff --git a/Z_poEditLangRemaining.php b/Z_poEditLangRemaining.php index 42c2e9acd..ed5375dfb 100644 --- a/Z_poEditLangRemaining.php +++ b/Z_poEditLangRemaining.php @@ -38,7 +38,7 @@ // save the modifications echo '
'; - echo ''; + echo ''; echo ''; /* write the new language file */ @@ -105,7 +105,7 @@ prnMsg (_('Your existing translation file (messages.po) will be saved as messages.po.old') . '
', 'info', _('PLEASE NOTE')); echo '
'; echo ''; - echo ''; + echo ''; echo ''; echo ''; diff --git a/Z_poRebuildDefault.php b/Z_poRebuildDefault.php index 590d42ca7..948339e8f 100644 --- a/Z_poRebuildDefault.php +++ b/Z_poRebuildDefault.php @@ -32,7 +32,7 @@ if (isset($_POST['submit'])) { echo '
'; - echo ''; + echo ''; echo ''; prnMsg (_('Rebuilding the default language file ') . '.....
', 'info', ' '); $Result = rename($PathToDefault, $PathToDefault . '.old');// Renames pot file to bak. @@ -51,7 +51,7 @@ _('This is not usually necessary but if done before a new language is created then that language will have any new or recently modified strings') . '.
' . _('Existing languages are not affected.') . '.', 'info', _('PLEASE NOTE')); echo '
'; - echo ''; + echo ''; echo ''; echo '  '; echo ''; diff --git a/doc/Change.log b/doc/Change.log index 2820f15dc..b68dd01db 100644 --- a/doc/Change.log +++ b/doc/Change.log @@ -1,5 +1,6 @@ webERP Change Log +9/2/18 PaulT: Remove the last of the remaining URL 'SID' references. 9/2/18 Paul Becker (PaulT commit): StockLocMovements.php, StockMovements.php: Add serial number column to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8088) 9/2/18 Paul Becker (PaulT commit): InternalStockRequestFulfill.php: Add controlled stock handling within this script. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8086) 9/2/18 Tim/PaulT: MRPPlannedPurchaseOrders.php, MRPPlannedWorkOrders.php: Fix conversion factor matter noted by Tim, use DB_table_exists() from commit 7943 to replace table check query, and minor rework to 'missing cell' handling from commit 7939.