From a02e687697549fcc9e911e0529aaec892ba3c2d9 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 2 Sep 2010 23:58:35 +0000 Subject: [PATCH] Added possibility to put dimensions on Delivery from sales order Changed update.html to be more readable --- CHANGELOG.txt | 6 ++ sales/customer_delivery.php | 27 +++++ update.html | 196 +++++++++++++++++++++++++++--------- 3 files changed, 181 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 43370d84..3f38802f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +03-"3p-2010 Joe Hunt ++ Added possibility to put dimensions on Delivery from sales order +$ /sales/customer_delivery.php +! Changed update.html to be more readable +$ update.html + 02-Sep-2010 Janusz Dobrowolski + Preprinted forms folder moved to /reporting where it should be $ /reporting/forms diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 814ff8dc..ee19660c 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -103,6 +103,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { $ord->trans_no = 0; $ord->reference = $Refs->get_next(ST_CUSTDELIVERY); $ord->document_date = new_doc_date(); + $cust = get_customer($ord->customer_id); + // 2010-09-03 Joe Hunt + $ord->dimension_id = $cust['dimension_id']; + $ord->dimension2_id = $cust['dimension2_id']; $_SESSION['Items'] = $ord; copy_from_cart(); @@ -210,6 +214,8 @@ function copy_to_cart() $cart->due_date = $_POST['due_date']; $cart->Location = $_POST['Location']; $cart->Comments = $_POST['Comments']; + $cart->dimension_id = $_POST['dimension_id']; + $cart->dimension2_id = $_POST['dimension2_id']; if ($cart->trans_no == 0) $cart->reference = $_POST['ref']; @@ -225,6 +231,8 @@ function copy_from_cart() $_POST['due_date'] = $cart->due_date; $_POST['Location'] = $cart->Location; $_POST['Comments'] = $cart->Comments; + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; $_POST['cart_id'] = $cart->cart_id; $_POST['ref'] = $cart->reference; } @@ -378,6 +386,25 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']); } customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'"); +// 2010-09-03 Joe Hunt +$dim = get_company_pref('use_dimension'); +if ($dim > 0) { + start_row(); + label_cell(_("Dimension").":", "class='tableheader2'"); + dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false); + end_row(); +} +else + hidden('dimension_id', 0); +if ($dim > 1) { + start_row(); + label_cell(_("Dimension")." 2:", "class='tableheader2'"); + dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false); + end_row(); +} +else + hidden('dimension2_id', 0); +//--------- start_row(); date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'"); end_row(); diff --git a/update.html b/update.html index a00865de..414b8e88 100644 --- a/update.html +++ b/update.html @@ -1,49 +1,149 @@ - - - + + + + + FrontAccounting Update + + - - FrontAccounting Update - -
FrontAccounting Update
-
-

Important Notes

- - \ No newline at end of file + +

FrontAccounting +Update

+

Important Notes

+

Upgrade process can be done only by administrator of the first +company created during FrontAccounting installation. This person is +considered as a site admin who have granted access to potentially +dangerous setup options, like Setup/Software Upgrade.

+

In the following description sections related to older FA versions are +prefixed with [color tags] +. You can skip tagged fragment safely if currently FA +application is newer than the version in tag.

+

Upgrade process consists of up to four stages, some of them are +optional:

+
    +
  1. Application source files update +

    +
  2. Database upgrade – this step is needed only during + upgrade which involves change in major application version number + (e.g. from 2.2.x to 2.3.x), and sometimes during upgrade from beta + release to stable version. Otherwise this step can be skipped.

    +
  3. Final cleanup – is needed when some old source files, + obsoleted by new release should be removed.

    +
  4. New features configuration – this is optional step + needed for most major releases and some minor ones. +

    +
+

Before starting upgrade ensure nobody +is using the application and make database backup for all companies. +To be on safe side backup also old source files, especially those +locally customized (if any).

+

Log into admin account of first company. If +you use a theme other than the standard 3 (aqua, cool or default), +switch to one of these before going further.

+

1. Application files update

+

a. Source +files update

+

Extract distribution +zip/tar.gz file in empty directory, and copy all the files to your +FrontAccounting directory overwriting old files. If it is major +release upgrade you can skip next step and go directly to cleanup.

+

b. Configuration +files update

+

Compare new +config.default.php +file with the old +config.php and +add all new +settings (if any). +

+

[<FA +2.2beta]

+

$show_users_online = 0;

+

$def_print_destination += 0;

+

$dflt_date_fmt=0;

+

$dflt_date_sep=0;

+

$table_style,table_style2 +changed

+

[<FA +2.3beta]

+

$alternative_tax_include_on_doc=0;

+

$suppress_tax_rates = 0;

+

[<FA +2.3RC1] +

+

Application version +information and a couple of other private FA variables are stored in +version.php +file. The +application version displayed in footer is defined in $version +variable unless this is set in config.php file. If you want current +release version to be displayed on every FA update just remove or +comment out $version variable in config.php.

+

2. Database upgrade

+

This step can be skipped +for small version updates i.e. when you have already installed +FrontAccounting version 2.3.1 or later. Before database upgrade is +done on all company databases backup file is created automatically to +enable database restore after failure.

+

After major version +upgrade overwriting files in first step makes the system unaccessible +for all users but site admin, who have to run upgrade procedures to +update all company databases to the new version provided with the +release. After logging to administrator account of first installed +company go directly to Setup/Software Upgrade screen, mark all +subsequent 'Install' checkboxes and press 'Upgrade System'.

+

If something goes wrong during +upgrade, you can eventually try forced upgrade option. Forced upgrade +ignores some smaller errors which can arise during upgrade due to +some exotic database configuration. This is depreciated option, so +first read error messages if any, try to fix signalized problems, +restore databases from backup and retry normal installation. To run +upgrade in forced mode check box 'Force Upgrade', and press 'Upgrade +System' again.

+

3. Final cleanup

+

Remove or rename install folder in main FrontAccounting directory. +

+

After upgrade is installed you can remove files obsoleted by new +FrontAccounting version. Also old, unused settings can +be removed from config.php +file.

+

a. +Source files cleanup

+

[<FA +2.2beta]

+

/includes/reserved.inc +– removed.

+

[<FA +2.1] +

+

/admin/db/v_banktrans.inc +- removed

+

b. +Config.php cleanup +

+

[<FA +2.2RC1] +

+

$security_headings, +$security_groups arrays – moved to database (see Access Setup) + +

+

$def_app – moved +to user configuration in database.

+

$version +– moved to version.php +file. Remove

+

4. New features configuration

+

During upgrade process new features are initialized to default +status, and sometimes old settings are also changed to conform with +new security policy. This automatic process is designed to be as +neutral for end users as possible, however sometimes site or company +admin intervention can be necessary to set thing after changes to +their best state. Below you will find description of new settings +available after upgrade.

+



+

+

----------------------

+ + \ No newline at end of file -- 2.30.2