From: <tim...@us...> - 2010-06-05 12:55:01
|
Revision: 3480 http://web-erp.svn.sourceforge.net/web-erp/?rev=3480&view=rev Author: tim_schofield Date: 2010-06-05 12:54:55 +0000 (Sat, 05 Jun 2010) Log Message: ----------- ChenJohn: SalesTypes.php - upgrade3.11.1-3.12.sql - to allow sales type description up to 40 char length Modified Paths: -------------- trunk/SalesTypes.php trunk/doc/Change.log.html trunk/sql/mysql/upgrade3.11.1-3.12.sql Modified: trunk/SalesTypes.php =================================================================== --- trunk/SalesTypes.php 2010-06-04 11:13:08 UTC (rev 3479) +++ trunk/SalesTypes.php 2010-06-05 12:54:55 UTC (rev 3480) @@ -40,9 +40,9 @@ prnMsg('<br>' . _('The sales type (price list) code cannot be an empty string or spaces'),'error'); $Errors[$i] = 'SalesType'; $i++; - } elseif (strlen($_POST['Sales_Type']) >20) { + } elseif (strlen($_POST['Sales_Type']) >40) { $InputError = 1; - echo prnMsg(_('The sales type (price list) description must be twenty characters or less long'),'error'); + echo prnMsg(_('The sales type (price list) description must be forty characters or less long'),'error'); $Errors[$i] = 'SalesType'; $i++; } elseif ($_POST['TypeAbbrev']=='AN'){ Modified: trunk/doc/Change.log.html =================================================================== --- trunk/doc/Change.log.html 2010-06-04 11:13:08 UTC (rev 3479) +++ trunk/doc/Change.log.html 2010-06-05 12:54:55 UTC (rev 3480) @@ -1,10 +1,11 @@ <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p> <p></p> -<p>03/06/10 Phil: Added a bit of error trapping to ensure customer/branch set up when going into CounterSales.php +<p>03/06/10 Phil: Added a bit of error trapping to ensure customer/branch set up when going into CounterSales.php</p> <p>03/06/10 Otandeka: Locations.php used explode function rather than substr function to split the cashsalecustomer to get Branch and Debtorno codes - also changed format to just a hypen between debtorno and branchcode</p> -<p>03/06/10 Otandeka: CounterSales php changed to use explode to get branch and debtorno from cashsalecustomer - and changed format to debtorno-branchcode and rather than debtorno - branchcode (spaces removed)</p> +<p>03/06/10 Otandeka: CounterSales php changed to use explode to get branch and debtorno from cashsalecustomer - and changed format to debtorno-branchcode and rather than debtorno - branchcode (spaces removed)</p> <p>31/5/10 Phil: BankMatching script took out double quotes reformated indenting - a hard one to read - my bad!</p> <p>31/5/10 Phil: New script CounterSales.php to allow entry of sale and payment over the counter as a half way step to POS - the customer account is defaulted based on the users default stock location. The locations table now has a default cash sales account - see below</p> +<P>29/05/10 ChenJohn: SalesTypes.php - upgrade3.11.1-3.12.sql - to allow sales type description up to 40 char length</p> <p>28/5/10 Phil: New field in locations table to allow a default cash sales account to be setup by location -modifications to Locations.php to allow it to be entered and error-trapping for debtor - branch format required for specification. This will be used in a new CounterSales.php script I am working on</p> <P>27/05/10 Tim: PurchData.php - Show the uom name, not the number</p> <P>27/05/10 Tim: CustomerAllocations.php - Show the right balance, and the allocate link where needed</p> @@ -21,8 +22,8 @@ <p>16/05/10 Phil: reworked PricesByCost.php this was bit of a dodgy script - well I found it hard to follow - in the words of Frank Sinatra - I did it my way! Also built in effectivity dates to display and ensure correct prices updated now the primary key of prices is changed.</p> <p>16/05/10 Phil: Wrote up the manual so that the logic of pricing with effective dates is explained</p> <p>15/05/10 Phil: Used Lindsay/Ngaraj's nice email address checking function to replace the existing function in MiscFunctions.php and includes MiscFunctions.php in install/save.php to avoid duplication of the function</p> -<p>15/05/10 Phil: $debug variable in UserLogin.php was only set on first login - not subsequent page calls (its not a session variable) - moved it back into session.inc so that full info about bugs is available to sysadmins -<p>15/05/10 Phil: GetPrices.inc Prices.php and Prices_Customer.php - modified to allow default prices - with no end dates - reducing requirement to administer - also updated Prices section of the manual +<p>15/05/10 Phil: $debug variable in UserLogin.php was only set on first login - not subsequent page calls (its not a session variable) - moved it back into session.inc so that full info about bugs is available to sysadmins</p> +<p>15/05/10 Phil: GetPrices.inc Prices.php and Prices_Customer.php - modified to allow default prices - with no end dates - reducing requirement to administer - also updated Prices section of the manual</p> <p>11/05/10 Tim: Exit MRP scripts gracefully if no MRP calculation has been done.</p> <p>08/05/10 Lindsay: API was broken after adding a test for global variable $DatabaseName in ConnectDB_mysql* for this variable being set and using it as DB name if so. The variable of that name in the api_php.php has been changed to $api_DatabaseName.</p> <p>08/05/10 Phil: GetPrices.inc now uses the new price startdate and enddate to return the price which falls within the date range base on the current date. Changes to Prices.php and Prices_Customer.php to allow entry of effective from and effective to dates and updating/deleting of prices with appropriate error trapping and rescheduling of enddates where start and end dates would otherwise overlap.</p> Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql =================================================================== --- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-06-04 11:13:08 UTC (rev 3479) +++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-06-05 12:54:55 UTC (rev 3480) @@ -162,4 +162,10 @@ ALTER TABLE stockcheckfreeze ADD COLUMN stockcheckdate date NOT NULL; ALTER TABLE suppliers add (email varchar(55),fax varchar(25), telephone varchar(25)); + +ALTER TABLE `www_users` add `supplierid` varchar(10) NOT NULL DEFAULT '' AFTER `customerid`; +INSERT INTO `securityroles` VALUES (9,'Supplier Log On Only'); + ALTER TABLE locations add cashsalecustomer VARCHAR(21) NOT NULL DEFAULT ''; + +ALTER TABLE `salestypes` CHANGE COLUMN `sales_type` `sales_type` VARCHAR(40) NOT NULL DEFAULT ''; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |