Skip to content

Commit

Permalink
Merge branch 'webERP-team-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
timschofield committed Mar 6, 2018
2 parents 35a8ea3 + 7296763 commit f451547
Show file tree
Hide file tree
Showing 589 changed files with 204 additions and 809 deletions.
1 change: 0 additions & 1 deletion AccountGroups.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Defines the groupings of general ledger accounts */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion AccountSections.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Defines the sections in the general ledger reports */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion AddCustomerContacts.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Adds customer contacts */

include('includes/session.php');
Expand Down
5 changes: 2 additions & 3 deletions AddCustomerNotes.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');
$Title = _('Customer Notes');
Expand Down Expand Up @@ -214,10 +213,10 @@
echo '<tr>
<td>' . _('Date') . '</td>';
if (isset($_POST['NoteDate'])) {
echo '<td><input type="text" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="10" maxlength="10" /></td>
echo '<td><input type="text" required name="NoteDate" class="date" value="'.ConvertSQLDate($_POST['NoteDate']).'" size="11" maxlength="10" /></td>
</tr>';
} else {
echo '<td><input type="text" required name="NoteDate" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" size="10" maxlength="10" /></td>
echo '<td><input type="text" required name="NoteDate" class="date" size="11" maxlength="10" /></td>
</tr>';
}
echo '<tr>
Expand Down
3 changes: 1 addition & 2 deletions AddCustomerTypeNotes.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/

include('includes/session.php');
$Title = _('Customer Type (Group) Notes');
Expand Down Expand Up @@ -202,7 +201,7 @@
</tr>
<tr>
<td>' . _('Date').':</td>
<td><input type="text" required="required" name="NoteDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" value="'. $_POST['NoteDate']. '" size="10" maxlength="10" /></td>
<td><input type="text" required="required" name="NoteDate" class="date" value="'. $_POST['NoteDate']. '" size="11" maxlength="10" /></td>
</tr>
<tr>
<td>' . _('Priority').':</td>
Expand Down
1 change: 0 additions & 1 deletion AgedControlledInventory.php
@@ -1,6 +1,5 @@
<?php

/* $Id: AgedControlledInventory.php 1 2014-08-08 04:47:42Z agaluski $ */

include('includes/session.php');
$PricesSecurity = 12;//don't show pricing info unless security token 12 available to user
Expand Down
1 change: 0 additions & 1 deletion AgedDebtors.php
@@ -1,5 +1,4 @@
<?php
/* $Id$ */
/* Lists customer account balances in detail or summary in selected currency */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion AgedSuppliers.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');

Expand Down
1 change: 0 additions & 1 deletion AnalysisHorizontalIncome.php
@@ -1,5 +1,4 @@
<?php
/* $Id: AnalysisHorizontalIncome.php 7349 2015-09-14 14:43:19Z rchacon $*/
/* Shows the horizontal analysis of the statement of comprehensive income. */

// BEGIN: Functions division ---------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion AnalysisHorizontalPosition.php
@@ -1,5 +1,4 @@
<?php
/* $Id: AnalysisHorizontalPosition.php 7349 2015-09-14 14:43:19Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */

function RelativeChange($selected_period, $previous_period) {
Expand Down
1 change: 0 additions & 1 deletion Areas.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');

Expand Down
5 changes: 2 additions & 3 deletions AuditTrail.php
@@ -1,6 +1,5 @@
<?php

/* $Id$ */

include('includes/session.php');

Expand Down Expand Up @@ -41,11 +40,11 @@

echo '<tr>
<td>' . _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] . '</td>
<td><input tabindex="1" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" autofocus="autofocus" required="required" value="' .$_POST['FromDate']. '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
<td><input tabindex="1" type="text" class="date" name="FromDate" size="11" maxlength="10" autofocus="autofocus" required="required" value="' .$_POST['FromDate']. '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
</tr>
<tr>
<td>' . _('To Date') . ' ' . $_SESSION['DefaultDateFormat'] . '</td>
<td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ToDate" size="11" maxlength="10" required="required" value="' . $_POST['ToDate'] . '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
<td><input tabindex="2" type="text" class="date" name="ToDate" size="11" maxlength="10" required="required" value="' . $_POST['ToDate'] . '" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')"/></td>
</tr>';

// Show user selections
Expand Down
1 change: 0 additions & 1 deletion AutomaticTranslationDescriptions.php
@@ -1,5 +1,4 @@
<?php
/* $Id: AutomaticTranslationDescriptions.php 7037 2014-12-22 14:45:20Z tehonu $ */

include ('includes/session.php');
$Title = _('Translate Item Descriptions');
Expand Down
1 change: 0 additions & 1 deletion BOMExtendedQty.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

// BOMExtendedQty.php - Quantity Extended Bill of Materials

Expand Down
1 change: 0 additions & 1 deletion BOMIndented.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Shows the bill of material indented for each level */

// BOMIndented.php - Indented Bill of Materials
Expand Down
1 change: 0 additions & 1 deletion BOMIndentedReverse.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

// BOMIndented.php - Reverse Indented Bill of Materials - From lowest level component to top level
// assembly
Expand Down
1 change: 0 additions & 1 deletion BOMInquiry.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');
$Title = _('Costed Bill Of Material');
Expand Down
1 change: 0 additions & 1 deletion BOMListing.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');

Expand Down
7 changes: 3 additions & 4 deletions BOMs.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');

Expand Down Expand Up @@ -464,7 +463,7 @@ function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level) {
WHERE parent='" . $SelectedParent ."'";
$ComponentResult = DB_query($ComponentSQL);
$ComponentArray = DB_fetch_row($ComponentResult);

if ($_SESSION['WeightedAverageCosting'] != 1) {//only update the cost for standard cost
UpdateCost($ComponentArray[0]);
}
Expand Down Expand Up @@ -876,11 +875,11 @@ function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level) {

echo '<tr>
<td>' . _('Effective After') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="5" type="text" required="required" name="EffectiveAfter" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" size="11" maxlength="10" value="' . $_POST['EffectiveAfter'] .'" /></td>
<td><input ' . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="5" type="text" required="required" name="EffectiveAfter" class="date" size="11" maxlength="10" value="' . $_POST['EffectiveAfter'] .'" /></td>
</tr>
<tr>
<td>' . _('Effective To') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="6" type="text" name="EffectiveTo" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" size="11" maxlength="10" value="' . $_POST['EffectiveTo'] .'" /></td>
<td><input ' . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="6" type="text" name="EffectiveTo" class="date" size="11" maxlength="10" value="' . $_POST['EffectiveTo'] .'" /></td>
</tr>';

if ($ParentMBflag=='M' OR $ParentMBflag=='G'){
Expand Down
5 changes: 2 additions & 3 deletions BOMs_SingleLevel.php
@@ -1,6 +1,5 @@
<?php

/* $Id: BOMs.php 6942 2014-10-27 02:48:29Z daintree $*/

include('includes/session.inc');

Expand Down Expand Up @@ -766,11 +765,11 @@ function DisplayBOMItems($UltimateParent, $Parent, $Component,$Level, $db) {

echo '<tr>
<td>' . _('Effective After') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="5" type="text" required="required" name="EffectiveAfter" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" size="11" maxlength="10" value="' . $_POST['EffectiveAfter'] .'" /></td>
<td><input ' . (in_array('EffectiveAfter',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="5" type="text" required="required" name="EffectiveAfter" class="date" size="11" maxlength="10" value="' . $_POST['EffectiveAfter'] .'" /></td>
</tr>
<tr>
<td>' . _('Effective To') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input ' . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="6" type="text" name="EffectiveTo" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" size="11" maxlength="10" value="' . $_POST['EffectiveTo'] .'" /></td>
<td><input ' . (in_array('EffectiveTo',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="6" type="text" name="EffectiveTo" class="date" size="11" maxlength="10" value="' . $_POST['EffectiveTo'] .'" /></td>
</tr>';

if ($ParentMBflag=='M' OR $ParentMBflag=='G'){
Expand Down
1 change: 0 additions & 1 deletion BackupDatabase.php
@@ -1,5 +1,4 @@
<?php
/* $Id BackupDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */

$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved

Expand Down
1 change: 0 additions & 1 deletion BankAccountUsers.php
@@ -1,5 +1,4 @@
<?php
/* $Id: BankAccountUsers.php 6946 2014-10-27 07:30:11Z daintree $*/
/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP) */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion BankAccounts.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* This script defines the general ledger code for bank accounts and specifies that bank transactions be created for these accounts for the purposes of reconciliation. */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion BankMatching.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* This script allows payments and receipts to be matched off against bank statements. */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion BankReconciliation.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* This script displays the bank reconciliation for a selected bank account. */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion COGSGLPostings.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Defines the general ledger account to be used for cost of sales entries */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion CollectiveWorkOrderCost.php
@@ -1,5 +1,4 @@
<?php
/* $Id: CollectiveWorkOrderCost.php 6946 2016-05-06 07:30:11Z exsonqu $*/
/* Multiple work orders cost review */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion CompanyPreferences.php
@@ -1,5 +1,4 @@
<?php
/* $Id$ */
/* Defines the settings applicable for the company, including name, address, tax authority reference, whether GL integration used etc. */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion ConfirmDispatchControlled_Invoice.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
Expand Down
3 changes: 1 addition & 2 deletions ConfirmDispatch_Invoice.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Creates sales invoices from entered sales orders based on the quantities dispatched that can be modified */

/* Session started in session.php for password checking and authorisation level check */
Expand Down Expand Up @@ -1782,7 +1781,7 @@
echo '<table class="selection">
<tr>
<td>' ._('Date On Invoice'). ':</td>
<td><input tabindex="'.$j.'" type="text" required="required" maxlength="10" size="15" required="required" name="DispatchDate" value="' . $DefaultDispatchDate . '" id="datepicker" alt="' . $_SESSION['DefaultDateFormat'] . '" class="date" /></td>
<td><input tabindex="'.$j.'" type="text" required="required" maxlength="10" size="11" required="required" name="DispatchDate" value="' . $DefaultDispatchDate . '" class="date" /></td>
</tr>';
$j++;
echo '<tr>
Expand Down
1 change: 0 additions & 1 deletion ContractBOM.php
@@ -1,5 +1,4 @@
<?php
/* $Id: ContractBOM.php 4553 2011-04-18 00:09:23Z daintree $*/

include('includes/DefineContractClass.php');

Expand Down
1 change: 0 additions & 1 deletion ContractCosting.php
@@ -1,6 +1,5 @@
<?php

/* $Id: ContractCosting.php 3692 2010-08-15 09:22:08Z daintree $*/

include('includes/DefineContractClass.php');
include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion ContractOtherReqts.php
@@ -1,5 +1,4 @@
<?php
/* $Id: ContractOtherReqts.php 3692 2010-08-15 09:22:08Z daintree $*/

include('includes/DefineContractClass.php');

Expand Down
3 changes: 1 addition & 2 deletions Contracts.php
@@ -1,6 +1,5 @@
<?php

/* $Id: Contracts.php 3692 2010-08-15 09:22:08Z daintree $ */

include('includes/DefineContractClass.php');
include('includes/session.php');
Expand Down Expand Up @@ -931,7 +930,7 @@

echo '<tr>
<td>' . _('Required Date') . ':</td>
<td><input type="text" required="required" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredDate" size="11" value="' . $_SESSION['Contract'.$identifier]->RequiredDate . '" /></td>
<td><input type="text" required="required" class="date" name="RequiredDate" maxlength="10" size="11" value="' . $_SESSION['Contract'.$identifier]->RequiredDate . '" /></td>
</tr>';

echo '<tr>
Expand Down
1 change: 0 additions & 1 deletion CopyBOM.php
Expand Up @@ -4,7 +4,6 @@
*
* Script to duplicate BoMs.
*/
/* $Id$*/

include('includes/session.php');

Expand Down
1 change: 0 additions & 1 deletion CounterReturns.php
@@ -1,5 +1,4 @@
<?php
/* $Id: CounterReturns.php 4469 2011-01-15 02:28:37Z daintree $*/

include('includes/DefineCartClass.php');

Expand Down
1 change: 0 additions & 1 deletion CounterSales.php
@@ -1,5 +1,4 @@
<?php
/* $Id: CounterSales.php 4469 2011-01-15 02:28:37Z daintree $*/

include('includes/DefineCartClass.php');

Expand Down
1 change: 0 additions & 1 deletion CreditItemsControlled.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
Expand Down
1 change: 0 additions & 1 deletion CreditStatus.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');
$Title = _('Credit Status Code Maintenance');
Expand Down
1 change: 0 additions & 1 deletion Credit_Invoice.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/

/*Functions to get the GL codes to post the transaction to */
include('includes/GetSalesTransGLCodes.inc');
Expand Down
1 change: 0 additions & 1 deletion Currencies.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* This script defines the currencies available. Each customer and supplier must be defined as transacting in one of the currencies defined here. */

include('includes/session.php');
Expand Down
1 change: 0 additions & 1 deletion CustEDISetup.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');
$Title = _('Customer EDI Set Up');
Expand Down
1 change: 0 additions & 1 deletion CustItem.php
@@ -1,5 +1,4 @@
<?php
/* $Id: CustItem.php 1 2014-04-23 05:10:46Z agaluski $*/

include ('includes/session.php');

Expand Down
1 change: 0 additions & 1 deletion CustLoginSetup.php
@@ -1,6 +1,5 @@
<?php

/* $Id$*/

include('includes/session.php');
$Title = _('Customer Login Configuration');
Expand Down
1 change: 0 additions & 1 deletion CustWhereAlloc.php
@@ -1,5 +1,4 @@
<?php
/* $Id$*/
/* Shows to which invoices a receipt was allocated to */

include('includes/session.php');
Expand Down
3 changes: 1 addition & 2 deletions CustomerAccount.php
@@ -1,5 +1,4 @@
<?php
/* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/
/* Shows customer account/statement on screen rather than PDF. */

include('includes/session.php');
Expand Down Expand Up @@ -238,7 +237,7 @@
}
echo '<br /><form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="centre noprint">
<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
_('Show all transactions after'), ':<input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="datepicker" maxlength="10" minlength="0" name="TransAfterDate" required="required" size="12" tabindex="1" type="text" value="', $_POST['TransAfterDate'], '" />',
_('Show all transactions after'), ':<input class="date" maxlength="10" name="TransAfterDate" required="required" size="11" tabindex="1" type="text" value="', $_POST['TransAfterDate'], '" />',
'<input name="Refresh Inquiry" tabindex="3" type="submit" value="', _('Refresh Inquiry'), '" />
</form>';

Expand Down

0 comments on commit f451547

Please sign in to comment.