Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2012-07-26 10:12:39
|
Revision: 5560
http://web-erp.svn.sourceforge.net/web-erp/?rev=5560&view=rev
Author: daintree
Date: 2012-07-26 10:12:33 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
fix headings
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/PDFInventoryValnPageHeader.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-26 08:27:54 UTC (rev 5559)
+++ trunk/doc/Change.log 2012-07-26 10:12:33 UTC (rev 5560)
@@ -1,4 +1,5 @@
webERP Change Log
+26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used - using <div> tags instead of tables for layout of the main menu
25/7/2012 Exson: Fix the typo to make the $TotalQuantityOnHand is correct in SupplierInvoice.php
24/7/2012 Exson/Phil: SupplierInvoice.php incorrect calculation of weighted average cost just using the stock quantity at a single location, now corrected
24/7/2012 Phil: includes/Z_POSDataCreation.php - added system default date format config to POS data upload file
Modified: trunk/includes/PDFInventoryValnPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryValnPageHeader.inc 2012-07-26 08:27:54 UTC (rev 5559)
+++ trunk/includes/PDFInventoryValnPageHeader.inc 2012-07-26 10:12:33 UTC (rev 5560)
@@ -35,8 +35,9 @@
$LeftOvers = $pdf->addTextWrap(437,$YPos,60,$FontSize,_('Cost'), 'right');
$LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,_('Extended Cost'), 'right');
} else {
- $LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320-$Left_Margin,$FontSize,_('Category'), 'right');
- $LeftOvers = $pdf->addTextWrap(510,$YPos,60,$FontSize,_('Cost'), 'right');
+ $LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320-$Left_Margin,$FontSize,_('Category'), 'center');
+ $LeftOvers = $pdf->addTextWrap(360,$YPos,60,$FontSize,_('Quantity'), 'right');
+ $LeftOvers = $pdf->addTextWrap(490,$YPos,60,$FontSize,_('Cost'), 'right');
}
$FontSize=8;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-07-26 10:12:43
|
Revision: 5560
http://web-erp.svn.sourceforge.net/web-erp/?rev=5560&view=rev
Author: daintree
Date: 2012-07-26 10:12:33 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
fix headings
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/PDFInventoryValnPageHeader.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-26 08:27:54 UTC (rev 5559)
+++ trunk/doc/Change.log 2012-07-26 10:12:33 UTC (rev 5560)
@@ -1,4 +1,5 @@
webERP Change Log
+26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used - using <div> tags instead of tables for layout of the main menu
25/7/2012 Exson: Fix the typo to make the $TotalQuantityOnHand is correct in SupplierInvoice.php
24/7/2012 Exson/Phil: SupplierInvoice.php incorrect calculation of weighted average cost just using the stock quantity at a single location, now corrected
24/7/2012 Phil: includes/Z_POSDataCreation.php - added system default date format config to POS data upload file
Modified: trunk/includes/PDFInventoryValnPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryValnPageHeader.inc 2012-07-26 08:27:54 UTC (rev 5559)
+++ trunk/includes/PDFInventoryValnPageHeader.inc 2012-07-26 10:12:33 UTC (rev 5560)
@@ -35,8 +35,9 @@
$LeftOvers = $pdf->addTextWrap(437,$YPos,60,$FontSize,_('Cost'), 'right');
$LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,_('Extended Cost'), 'right');
} else {
- $LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320-$Left_Margin,$FontSize,_('Category'), 'right');
- $LeftOvers = $pdf->addTextWrap(510,$YPos,60,$FontSize,_('Cost'), 'right');
+ $LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320-$Left_Margin,$FontSize,_('Category'), 'center');
+ $LeftOvers = $pdf->addTextWrap(360,$YPos,60,$FontSize,_('Quantity'), 'right');
+ $LeftOvers = $pdf->addTextWrap(490,$YPos,60,$FontSize,_('Cost'), 'right');
}
$FontSize=8;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-07-29 00:57:25
|
Revision: 5567
http://web-erp.svn.sourceforge.net/web-erp/?rev=5567&view=rev
Author: daintree
Date: 2012-07-29 00:57:18 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Hindra professional-rtl theme update
Modified Paths:
--------------
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/login.css
trunk/doc/Change.log
Removed Paths:
-------------
trunk/css/professional/images/Graphique-32.png
trunk/css/professional/images/accept.png
trunk/css/professional/images/back.png
trunk/css/professional/images/bar.png
trunk/css/professional/images/button_bg.png
trunk/css/professional/images/company.gif
trunk/css/professional/images/gelblue.png
trunk/css/professional/images/gelbluebutton.png
trunk/css/professional/images/gelblueh.png
trunk/css/professional/images/hoverbuttonblue.png
trunk/css/professional/images/input.png
trunk/css/professional/images/inputh.png
trunk/css/professional/images/inputhtxt.png
trunk/css/professional/images/inventory.gif
trunk/css/professional/images/maintenance.gif
trunk/css/professional/images/menu_bg.png
trunk/css/professional/images/menu_bg_blue.png
trunk/css/professional/images/menu_bg_dblue.png
trunk/css/professional/images/menu_bg_grey.png
trunk/css/professional/images/menu_bg_indigo.png
trunk/css/professional/images/menu_bg_white.png
trunk/css/professional/images/menucurve.gif
trunk/css/professional-rtl/images/Graphique-32.png
trunk/css/professional-rtl/images/accept.png
trunk/css/professional-rtl/images/back.png
trunk/css/professional-rtl/images/bar.png
trunk/css/professional-rtl/images/button_bg.png
trunk/css/professional-rtl/images/company.gif
trunk/css/professional-rtl/images/currency.gif
trunk/css/professional-rtl/images/gelblue.png
trunk/css/professional-rtl/images/gelbluebutton.png
trunk/css/professional-rtl/images/gelblueh.png
trunk/css/professional-rtl/images/hoverbuttonblue.png
trunk/css/professional-rtl/images/input.png
trunk/css/professional-rtl/images/inputh.png
trunk/css/professional-rtl/images/inputhtxt.png
trunk/css/professional-rtl/images/inquiries.png
trunk/css/professional-rtl/images/inventory.gif
trunk/css/professional-rtl/images/maintenance.gif
trunk/css/professional-rtl/images/menu_bg.png
trunk/css/professional-rtl/images/menu_bg_blue.png
trunk/css/professional-rtl/images/menu_bg_dblue.png
trunk/css/professional-rtl/images/menu_bg_grey.png
trunk/css/professional-rtl/images/menu_bg_indigo.png
trunk/css/professional-rtl/images/menu_bg_white.png
trunk/css/professional-rtl/images/menucurve.gif
trunk/css/professional-rtl/images/stripe.png
trunk/css/professional-rtl/images/transactions.gif
Deleted: trunk/css/professional/images/Graphique-32.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/accept.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/back.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/bar.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/button_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/company.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelbluebutton.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelblueh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/hoverbuttonblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/input.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inputh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inputhtxt.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inventory.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/maintenance.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_blue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_dblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_grey.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_indigo.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_white.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menucurve.gif
===================================================================
(Binary files differ)
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/css/professional-rtl/default.css 2012-07-29 00:57:18 UTC (rev 5567)
@@ -1,127 +1,84 @@
-/*--------------------------------------------------\
-| | | default.css |
-|---------------------------------------------------|
-| For use with: |
-| Web-ERP - http://web-erp.sourceforge.net |
-| by Logic Works Ltd |
-|---------------------------------------------------|
-| Developer: |
-| Shane Barnaby |
-| Steve Kaill |
-| Ali Hosseini |
-|---------------------------------------------------|
-| Note: |
-| Changes can be made to this CSS that will be |
-| reflected throughout Web-ERP. |
-|
-\--------------------------------------------------*/
-/* $Id$*/
+/***
+New "Professional RTL" Theme for WebERP
+For Right-To-Left Languages
+
+by Hindra Joshua
+
+*** This a very clean professional-looking theme - handsome!
+
+Based from the previous theme "SilverWolf"
+Credits to the original authors.
+
+NOTE:
+This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
+but for the obvious one it will be cleaned up.
+To optimized the rest we should examined the whole codes! That would be for
+the next project. :)
+
+***/
+
body {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
- background-color: #DDDDDD;
- margin-left: 10px;
- margin-top: 5px;
- margin-bottom: 0px;
- margin-right: 10px;
- padding: 0px;
- direction: rtl;
+ background-color: #ddd;
+ margin:0;
+ padding:0;
+ direction:rtl;
}
img {
border:none;
+ vertical-align:middle;
}
-
-/*links before selection */
a {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- text-decoration: none;
- color: #0000FF;
+ color:blue;
+ text-decoration:none;
}
-
-/*links on any screen when mouse is hovering over them */
a:hover {
- color: #0000AA;
- text-decoration: underline;
+ color:blue;
+ text-decoration:underline;
}
-table {
- background-color: #EEEEFF;
+.centre { /* used */
margin: 0 auto;
-}
-
-.dpTbl {
- border: solid navy 1px;
-}
-
-div.centre {
- margin: 0 auto;
text-align:center;
}
/*table detail items default format */
td {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
text-align: left;
}
-
td.select {
background-color:#eee;
}
-
-table.selection {
- background-color:#eee;
- outline-style:solid;
- outline-width:1px;
-}
-
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
td.number {
text-align: right;
}
.EvenTableRows {
- background: #CCCCCC;
+ background-color: #CCCCCC;
}
-
.OddTableRows {
- background: #EEEEEE;
+ background-color: #EEEEEE;
}
-th {
+th { /* table heading */
font-weight: normal;
font-size: 10px;
background-color: #cccce5;
color: #330000;
text-align: center;
}
+th.number {
+ font-weight: normal;
+ font-size: 10px;
+ background-color: #cccce5;
+ color: #330000;
+ text-align: right;
+}
div.error {
background-color:#fddbdb;
@@ -134,87 +91,75 @@
color: maroon;
border: 1px solid maroon;
}
-
div.success {
background-color:#b9ecb4;
color: darkgreen;
border: 1px solid darkgreen;
}
-
div.info {
background-color:#c7ccf6;
color: navy;
border: 1px solid navy;
}
+/* input as button or text */
+/* NOTE: input for button should have different class, one for 'normal' and one for 'input button inside a table,
+which should have the same width as the column where it is located
+e.g.: class input_button, input_column_button, input_text */
input {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
-
input.number{
text-align: right;
}
-
input.image {
border-width:0px;
background-color: transparent;
}
-
input:hover{
+ background:lightblue;
}
+input.big {
+ width: 100px;
+}
+input.small {
+ width: 50px;
+}
+input.inputerror {
+ background-color: #fddbdb;
+}
+/* for buttons ***HJ***/
+button{
+ font-size:10px;
+}
+button:hover{
+ background:lightblue;
+}
+
+/* dropdown box */
+
select {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
+select.selecterror {
+ background-color: #fddbdb;
+}
+select:hover{
+ background:lightblue;
+}
p.good {
font-weight: bold;
color: green;
}
-
p.bad {
font-weight: bold;
color:red;
}
-#topMenu {
- width: 100%;
- color: black;
- background-color: white;
- border: none;
- border-bottom: 1px solid #999999;
-}
-
-#trim {
- background: white;
-}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: none;
-}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
-}
-
-#mainMenu {
- width: 100%;
- color: black;
- background-color: white;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
.header {
background-image: url("");
background-repeat: no-repeat;
@@ -224,18 +169,13 @@
padding: 0px;
}
-.login {
- background-color: white;
- border: none;
-}
-
-textarea{
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+textarea{ /* default style for textarre */
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
-
textarea:hover{
}
+
/* Table type is used for UI tables type 1 */
.table1 {
width:90%;
@@ -259,7 +199,7 @@
VISIBILITY: visible;
MARGIN: 0 auto;
POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
padding-top: 1px;
padding-bottom: 1px;
font-weight: normal;
@@ -267,417 +207,290 @@
TEXT-ALIGN:center;
}
-.callout_main {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
+.page_title_text { /* used */
+ font-family: Arial, Verdana, Helvetica;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ font-weight: bold;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
}
-.main_page {
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
- font-size: 10px;
+DIV.page_help_text {
+ background: lightgrey url(images/help.png) top left no-repeat;
+ BORDER: #a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ PADDING-LEFT: 10px;
+ Z-INDEX: 1;
+ width: 80%;
+ FLOAT: none;
+ VISIBILITY: visible;
+ MARGIN: 0 auto;
+ POSITION: static;
+ font-family: Arial, Verdana, Helvetica;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
}
-/* Main page heading with quick menu within */
-.quick_menu {
- width: 100%;
- background-color: white;
- border: none;
- margin: 0px;
- padding: 0px;
- color: black;
- border-top: 2px #AAAAAA solid;
- border-left: 2px #AAAAAA solid;
- border-right: 2px white solid;
- border-bottom: 4px white solid;
- text-align: right;
- /* position: relative;
- top: 3px; */
+.menu_group_item a {
}
-
-#quick_menu{
+.menu_group_items a:hover {
+ color: #0000aa;
+ text-decoration: underline;
}
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- border: 0px;
- white-space: nowrap;
- margin: 2px;
- padding: 2px;
- color: black;
-}
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin: 0px;
- padding: 0px;
- text-align: right;
-}
-.quick_menu_tab{
- background: #EEEEFF;
- height:28pt;
- white-space: nowrap;
- border-left: solid 1px #aaa;
- border-right: solid 1px #aaa;
- padding-left: 10px;
- padding-right: 10px;
- text-align: right;
+textarea.texterror {
+ background-color: #fddbdb;
}
-.quick_menu_tab a{
- color:#fff;
- font-weight:bold;
-}
-.quick_menu_left a{
- color:#fff;
-}
-.quick_menu_tab a:hover{
- color:#ffc;
- text-decoration:none;
- font-weight:bold;
+.tableheader {
+ font-weight: normal;
+ background-color: #cccce5;
+ color: #330000;
}
-.quick_menu_left a:hover{
- color:#ffc;
- text-decoration:none;
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
}
-.quick_menu_tab:hover{
- color:#ffd;
+.label { /* used */
+ font-weight:bold;
+ font-style:normal;
+ font-size:12px;
+ color:black;
+ background-color:#cccccc;
}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+.OsRow {
+ background-color: #234567;
+ color: white;
}
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+.table_index {
+ background-color: #F1FFDD;
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+li {
+ list-style-image: url(bullet.gif);
}
-.main_area {
- border: 2px inset white;
- width: 100%;
- background-color: white;
-}
+/*** CANVAS ***/
-.main_menu {
- border: 2px inset white;
+#CanvasDiv{
+ background:#fff;
+ margin:5px;
+ border:thin inset #ddd;
}
-.main_menu table {
- border: 0px;
- width: 100%;
- margin-top: 2px;
- margin-bottom: 2px;
-}
+/*** HEADER ***/
-.main_menu_unselected {
- background-color: #CCCCCC;
- border: 2px outset white;
-/* position: relative; */
- text-align: center;
- white-space: nowrap;
+#HeaderDiv {
+ overflow:hidden; /* REQUIRED: height according to items contained */
+ color:black;
+ padding-right:3px;
}
-
-.main_menu_unselected:hover{
+#HeaderWrapDiv{
}
-.main_menu_selected:hover{
-}
-.main_menu_unselected a{
-}
+/*** HEADER - APP INFO ***/
-.main_menu_unselected a:hover{
+#AppInfoDiv{
+ float:right; /* REQUIRED: to the RIGHT */
}
-
-.main_menu_selected {
- background-color: #CCCCCC;
- border: 2px inset white;
-/* position: relative; */
- text-align: center;
- white-space: nowrap;
+#AppInfoDiv img{
+ vertical-align:middle; /* center image and text vertically */
}
-
-.main_menu_selected a{
- color: #eee;
- font-weight:bold;
+#AppInfoCompanyDiv{
+ display:table-cell; /* REQUIRED: as a cell */
}
-
-.main_menu_selected a:hover{
- color: #fff;
- text-decoration: none;
+#AppInfoUserDiv{
+ display:table-cell; /* REQUIRED: as a cell */
}
-
-span.main_menu_nolink {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+#AppInfoUserDiv a{
+ color:black;
}
-
-.main_menu a {
- font-weight: normal;
+#AppInfoUserDiv a:hover{
+ color:blue;
+ text-decoration:underline;
}
-
-.main_menu a:hover {
- color: #0000aa;
- text-decoration: underline;
+#AppInfoModuleDiv{
}
-.menu_group_img {
- background-color: #CCCCCC;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
+/*** HEADER - QUICK MENU ***/
-.menu_group_img img{
- position: relative;
- top: 10px;
+#QuickMenuDiv{
+ float:left; /* to the right side */
+ margin-top:3px;
}
-
-.menu_group_area {
- border: 2px inset white;
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
}
-
-.blank_area table {
- border: 0px;
- width: 100%;
+#QuickMenuDiv li{
+ display:inline; /* items are inline */
+ float:right; /* right to left */
}
-.menu_group_headers {
- border: 2px outset #AAAAAA;
- width: 25%;
+/*** links as buttons!!! clicking anywhere in the button will activate
+ the link!!! ***HJ***/
+
+#QuickMenuDiv li a{
+ padding:3px; /* links as button */
+ border:thin outset #ddd; /* un-pressed state */
+ background:#ddd;
}
-
-.menu_group_headers table{
+#QuickMenuDiv li a:hover{
+ padding:3px; /* links as button */
+ border:thin inset #ddd; /* pressed state */
+ text-decoration:none; /* no underline */
+ color:blue;
}
-.menu_group_headers_text {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: black;
-}
+/*** BODY ***/
-.menu_group_items {
- vertical-align: top;
- background-color: white;
- border: 2px outset #AAAAAA;
- padding: 10px;
+#BodyDiv {
+ clear:both; /* REQUIRED */
+ overflow:hidden; /* REQUIRED */
+ color:black;
+ background:white;
}
-
-.menu_group_item {
- background-color: white;
- padding-top: 2px;
- padding-bottom: 2px;
+#BodyDiv table {
+ width:auto; /* automatic width */
+ margin: 0 auto;
+ margin-bottom:10px;
}
-
-.menu_group_item p {
- color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
+#BodyDiv table.selection {
+ background:#eee;
+ padding:5px;
+ border:thin outset #eee;
}
+/*#BodyDiv .centre{
+ margin:0 auto 10px;
+ text-align:center;
+}*/
-.page_title_text {
- font-family: Arial, Verdana, Helvetica;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
-}
+/*** BODY - MAIN MENU ***/
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv{
+ float:right; /* REQUIRED: to the RIGHT side */
+ white-space:nowrap; /* don't break text */
+ text-align:center;
+ width:11%;
+ background:#ddd;
}
-
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#MainMenuDiv ul{
+ list-style:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:0;
}
-
-span.menu_group_nolink {
- font-family: Tahoma, Arial, Verdana, Helvetica;
- font-size: 10px;
- font-weight: normal;
- color: #777777;
- text-decoration: none;
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
}
-
-.menu_group_item a {
+#MainMenuDiv li a{ /* link as button!!! not-pressed state */
+ display:block; /* REQUIRED */
+ padding:3px;
+ border:thin outset #ddd;
+ color:blue;
}
-
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
+ text-decoration:none;
+ padding:3px;
+ border:thin inset #ddd;
+ background:#ddd;
}
-
-#footer {
- position: relative;
- bottom: -3px;
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ border:thin inset #ccc;
+ background:#ccc;
+ color:blue;
+ text-decoration:none;
}
-a.footer {
- font-family: Arial, Verdana, Helvetica;
- color: black;
- font-weight: normal;
- font-size: 8px;
-}
+/*** BODY - SUB MENU ***/
-.footer {
- font-family: Tahoma, Arial, Verdana, Helvetica;
- color: black;
- font-weight: normal;
- font-size: 8px;
- text-align: center;
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:89%; /* main menu is 10% */
}
-
-.legal {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#SubMenuDiv ul{
+ list-style-type:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin-top:0px;
+ margin-left:3px;
+ border:thin outset #ddd;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#SubMenuDiv li{
+ /*list-style:none;*/ /* REQUIRED: hide the bullets */
+ background:#eee;
+ padding:2px;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#SubMenuDiv li img{
+ vertical-align:middle; /* verticall align icon with the text */
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 9px;
- color: white;
- background-color: #336699;
+#SubMenuDiv .menu_group_headers {
+ background:#ddd;
+ outline:thin outset #ddd;
+ text-align:center;
+ color:black;
}
-
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+#TransactionsDiv{
+ display:table-cell;
}
-
-input.big {
- width: 100px;
+#InquiriesDiv{
+ display:table-cell;
}
-
-input.small {
- width: 50px;
+#InquiriesDiv div{ /* default div, used for custom report header */
+ background:#ddd;
+ color:black;
+ padding:2px;
+ border:thin outset #ddd;
}
-
-input.inputerror {
- background-color: #fddbdb;
+#InquiriesDiv body{
+ background:#eee;
+ color:red;
+ padding:2px;
}
-
-textarea.texterror {
- background-color: #fddbdb;
+#MaintenanceDiv{
+ display:table-cell;
+/* float:left;*/
+/* width:32.5%;
+ border:thin solid black;*/
+
}
-
-select.selecterror {
- background-color: #fddbdb;
+.menu_group_item p {
+ color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: 3px; /* this makes the bullet to appear as the li tag previously used */
+ margin:0px; /* One thing that I didnÃÂôt like of the li was that it had no left margin applied */
}
-.tableheader {
- font-weight: normal;
- background-color: #cccce5;
- color: #330000;
-}
+/*** FOOTER ***/
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+#FooterDiv{
+ clear:both; /* REQUIRED */
+ overflow:hidden;
+ color:gray;
}
-
-.label {
- font-weight:bold;
- font-style:normal;
- font-size:12px;
- color:black;
- background-color:#cccccc;
+#FooterWrapDiv{
+ overflow:hidden;
+ padding:3px;
}
-
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterLogoDiv{
+ float:left; /* right side */
}
-
-.table_index {
- background-color: #F1FFDD;
+#FooterVersionDiv{
+ float:right; /* left side */
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterTimeDiv{
+ clear:right; /* below */
}
+
+/*** END ***/
\ No newline at end of file
Deleted: trunk/css/professional-rtl/images/Graphique-32.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/accept.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/back.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/bar.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/button_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/company.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/currency.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelbluebutton.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelblueh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/hoverbuttonblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/input.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inputh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inputhtxt.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inquiries.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inventory.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/maintenance.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_blue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_dblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_grey.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_indigo.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_white.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menucurve.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/stripe.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/transactions.gif
===================================================================
(Binary files differ)
Modified: trunk/css/professional-rtl/login.css
===================================================================
--- trunk/css/professional-rtl/login.css 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/css/professional-rtl/login.css 2012-07-29 00:57:18 UTC (rev 5567)
@@ -3,10 +3,9 @@
padding: 0px;
margin: 0px;
text-align: center;
- font: 14px "Tahoma", "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
+ font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
background: #fff;
color: #777;
- direction: rtl;
}
#container {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/doc/Change.log 2012-07-29 00:57:18 UTC (rev 5567)
@@ -1,5 +1,6 @@
webERP Change Log
+29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
28/7/2012 Hindra Joshua: Fix for Gel theme and default theme to work with new styles
26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used...
[truncated message content] |
|
From: <dai...@us...> - 2012-07-29 00:57:25
|
Revision: 5567
http://web-erp.svn.sourceforge.net/web-erp/?rev=5567&view=rev
Author: daintree
Date: 2012-07-29 00:57:18 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Hindra professional-rtl theme update
Modified Paths:
--------------
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/login.css
trunk/doc/Change.log
Removed Paths:
-------------
trunk/css/professional/images/Graphique-32.png
trunk/css/professional/images/accept.png
trunk/css/professional/images/back.png
trunk/css/professional/images/bar.png
trunk/css/professional/images/button_bg.png
trunk/css/professional/images/company.gif
trunk/css/professional/images/gelblue.png
trunk/css/professional/images/gelbluebutton.png
trunk/css/professional/images/gelblueh.png
trunk/css/professional/images/hoverbuttonblue.png
trunk/css/professional/images/input.png
trunk/css/professional/images/inputh.png
trunk/css/professional/images/inputhtxt.png
trunk/css/professional/images/inventory.gif
trunk/css/professional/images/maintenance.gif
trunk/css/professional/images/menu_bg.png
trunk/css/professional/images/menu_bg_blue.png
trunk/css/professional/images/menu_bg_dblue.png
trunk/css/professional/images/menu_bg_grey.png
trunk/css/professional/images/menu_bg_indigo.png
trunk/css/professional/images/menu_bg_white.png
trunk/css/professional/images/menucurve.gif
trunk/css/professional-rtl/images/Graphique-32.png
trunk/css/professional-rtl/images/accept.png
trunk/css/professional-rtl/images/back.png
trunk/css/professional-rtl/images/bar.png
trunk/css/professional-rtl/images/button_bg.png
trunk/css/professional-rtl/images/company.gif
trunk/css/professional-rtl/images/currency.gif
trunk/css/professional-rtl/images/gelblue.png
trunk/css/professional-rtl/images/gelbluebutton.png
trunk/css/professional-rtl/images/gelblueh.png
trunk/css/professional-rtl/images/hoverbuttonblue.png
trunk/css/professional-rtl/images/input.png
trunk/css/professional-rtl/images/inputh.png
trunk/css/professional-rtl/images/inputhtxt.png
trunk/css/professional-rtl/images/inquiries.png
trunk/css/professional-rtl/images/inventory.gif
trunk/css/professional-rtl/images/maintenance.gif
trunk/css/professional-rtl/images/menu_bg.png
trunk/css/professional-rtl/images/menu_bg_blue.png
trunk/css/professional-rtl/images/menu_bg_dblue.png
trunk/css/professional-rtl/images/menu_bg_grey.png
trunk/css/professional-rtl/images/menu_bg_indigo.png
trunk/css/professional-rtl/images/menu_bg_white.png
trunk/css/professional-rtl/images/menucurve.gif
trunk/css/professional-rtl/images/stripe.png
trunk/css/professional-rtl/images/transactions.gif
Deleted: trunk/css/professional/images/Graphique-32.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/accept.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/back.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/bar.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/button_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/company.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelbluebutton.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/gelblueh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/hoverbuttonblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/input.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inputh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inputhtxt.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/inventory.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/maintenance.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_blue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_dblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_grey.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_indigo.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menu_bg_white.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/menucurve.gif
===================================================================
(Binary files differ)
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/css/professional-rtl/default.css 2012-07-29 00:57:18 UTC (rev 5567)
@@ -1,127 +1,84 @@
-/*--------------------------------------------------\
-| | | default.css |
-|---------------------------------------------------|
-| For use with: |
-| Web-ERP - http://web-erp.sourceforge.net |
-| by Logic Works Ltd |
-|---------------------------------------------------|
-| Developer: |
-| Shane Barnaby |
-| Steve Kaill |
-| Ali Hosseini |
-|---------------------------------------------------|
-| Note: |
-| Changes can be made to this CSS that will be |
-| reflected throughout Web-ERP. |
-|
-\--------------------------------------------------*/
-/* $Id$*/
+/***
+New "Professional RTL" Theme for WebERP
+For Right-To-Left Languages
+
+by Hindra Joshua
+
+*** This a very clean professional-looking theme - handsome!
+
+Based from the previous theme "SilverWolf"
+Credits to the original authors.
+
+NOTE:
+This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
+but for the obvious one it will be cleaned up.
+To optimized the rest we should examined the whole codes! That would be for
+the next project. :)
+
+***/
+
body {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
- background-color: #DDDDDD;
- margin-left: 10px;
- margin-top: 5px;
- margin-bottom: 0px;
- margin-right: 10px;
- padding: 0px;
- direction: rtl;
+ background-color: #ddd;
+ margin:0;
+ padding:0;
+ direction:rtl;
}
img {
border:none;
+ vertical-align:middle;
}
-
-/*links before selection */
a {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- text-decoration: none;
- color: #0000FF;
+ color:blue;
+ text-decoration:none;
}
-
-/*links on any screen when mouse is hovering over them */
a:hover {
- color: #0000AA;
- text-decoration: underline;
+ color:blue;
+ text-decoration:underline;
}
-table {
- background-color: #EEEEFF;
+.centre { /* used */
margin: 0 auto;
-}
-
-.dpTbl {
- border: solid navy 1px;
-}
-
-div.centre {
- margin: 0 auto;
text-align:center;
}
/*table detail items default format */
td {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
text-align: left;
}
-
td.select {
background-color:#eee;
}
-
-table.selection {
- background-color:#eee;
- outline-style:solid;
- outline-width:1px;
-}
-
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
td.number {
text-align: right;
}
.EvenTableRows {
- background: #CCCCCC;
+ background-color: #CCCCCC;
}
-
.OddTableRows {
- background: #EEEEEE;
+ background-color: #EEEEEE;
}
-th {
+th { /* table heading */
font-weight: normal;
font-size: 10px;
background-color: #cccce5;
color: #330000;
text-align: center;
}
+th.number {
+ font-weight: normal;
+ font-size: 10px;
+ background-color: #cccce5;
+ color: #330000;
+ text-align: right;
+}
div.error {
background-color:#fddbdb;
@@ -134,87 +91,75 @@
color: maroon;
border: 1px solid maroon;
}
-
div.success {
background-color:#b9ecb4;
color: darkgreen;
border: 1px solid darkgreen;
}
-
div.info {
background-color:#c7ccf6;
color: navy;
border: 1px solid navy;
}
+/* input as button or text */
+/* NOTE: input for button should have different class, one for 'normal' and one for 'input button inside a table,
+which should have the same width as the column where it is located
+e.g.: class input_button, input_column_button, input_text */
input {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
-
input.number{
text-align: right;
}
-
input.image {
border-width:0px;
background-color: transparent;
}
-
input:hover{
+ background:lightblue;
}
+input.big {
+ width: 100px;
+}
+input.small {
+ width: 50px;
+}
+input.inputerror {
+ background-color: #fddbdb;
+}
+/* for buttons ***HJ***/
+button{
+ font-size:10px;
+}
+button:hover{
+ background:lightblue;
+}
+
+/* dropdown box */
+
select {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
+select.selecterror {
+ background-color: #fddbdb;
+}
+select:hover{
+ background:lightblue;
+}
p.good {
font-weight: bold;
color: green;
}
-
p.bad {
font-weight: bold;
color:red;
}
-#topMenu {
- width: 100%;
- color: black;
- background-color: white;
- border: none;
- border-bottom: 1px solid #999999;
-}
-
-#trim {
- background: white;
-}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: none;
-}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
-}
-
-#mainMenu {
- width: 100%;
- color: black;
- background-color: white;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
.header {
background-image: url("");
background-repeat: no-repeat;
@@ -224,18 +169,13 @@
padding: 0px;
}
-.login {
- background-color: white;
- border: none;
-}
-
-textarea{
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
+textarea{ /* default style for textarre */
+ font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
-
textarea:hover{
}
+
/* Table type is used for UI tables type 1 */
.table1 {
width:90%;
@@ -259,7 +199,7 @@
VISIBILITY: visible;
MARGIN: 0 auto;
POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-family: Arial, Verdana, Helvetica;
padding-top: 1px;
padding-bottom: 1px;
font-weight: normal;
@@ -267,417 +207,290 @@
TEXT-ALIGN:center;
}
-.callout_main {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
+.page_title_text { /* used */
+ font-family: Arial, Verdana, Helvetica;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ font-weight: bold;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
}
-.main_page {
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
- font-size: 10px;
+DIV.page_help_text {
+ background: lightgrey url(images/help.png) top left no-repeat;
+ BORDER: #a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ PADDING-LEFT: 10px;
+ Z-INDEX: 1;
+ width: 80%;
+ FLOAT: none;
+ VISIBILITY: visible;
+ MARGIN: 0 auto;
+ POSITION: static;
+ font-family: Arial, Verdana, Helvetica;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
}
-/* Main page heading with quick menu within */
-.quick_menu {
- width: 100%;
- background-color: white;
- border: none;
- margin: 0px;
- padding: 0px;
- color: black;
- border-top: 2px #AAAAAA solid;
- border-left: 2px #AAAAAA solid;
- border-right: 2px white solid;
- border-bottom: 4px white solid;
- text-align: right;
- /* position: relative;
- top: 3px; */
+.menu_group_item a {
}
-
-#quick_menu{
+.menu_group_items a:hover {
+ color: #0000aa;
+ text-decoration: underline;
}
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- border: 0px;
- white-space: nowrap;
- margin: 2px;
- padding: 2px;
- color: black;
-}
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin: 0px;
- padding: 0px;
- text-align: right;
-}
-.quick_menu_tab{
- background: #EEEEFF;
- height:28pt;
- white-space: nowrap;
- border-left: solid 1px #aaa;
- border-right: solid 1px #aaa;
- padding-left: 10px;
- padding-right: 10px;
- text-align: right;
+textarea.texterror {
+ background-color: #fddbdb;
}
-.quick_menu_tab a{
- color:#fff;
- font-weight:bold;
-}
-.quick_menu_left a{
- color:#fff;
-}
-.quick_menu_tab a:hover{
- color:#ffc;
- text-decoration:none;
- font-weight:bold;
+.tableheader {
+ font-weight: normal;
+ background-color: #cccce5;
+ color: #330000;
}
-.quick_menu_left a:hover{
- color:#ffc;
- text-decoration:none;
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
}
-.quick_menu_tab:hover{
- color:#ffd;
+.label { /* used */
+ font-weight:bold;
+ font-style:normal;
+ font-size:12px;
+ color:black;
+ background-color:#cccccc;
}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+.OsRow {
+ background-color: #234567;
+ color: white;
}
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+.table_index {
+ background-color: #F1FFDD;
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+li {
+ list-style-image: url(bullet.gif);
}
-.main_area {
- border: 2px inset white;
- width: 100%;
- background-color: white;
-}
+/*** CANVAS ***/
-.main_menu {
- border: 2px inset white;
+#CanvasDiv{
+ background:#fff;
+ margin:5px;
+ border:thin inset #ddd;
}
-.main_menu table {
- border: 0px;
- width: 100%;
- margin-top: 2px;
- margin-bottom: 2px;
-}
+/*** HEADER ***/
-.main_menu_unselected {
- background-color: #CCCCCC;
- border: 2px outset white;
-/* position: relative; */
- text-align: center;
- white-space: nowrap;
+#HeaderDiv {
+ overflow:hidden; /* REQUIRED: height according to items contained */
+ color:black;
+ padding-right:3px;
}
-
-.main_menu_unselected:hover{
+#HeaderWrapDiv{
}
-.main_menu_selected:hover{
-}
-.main_menu_unselected a{
-}
+/*** HEADER - APP INFO ***/
-.main_menu_unselected a:hover{
+#AppInfoDiv{
+ float:right; /* REQUIRED: to the RIGHT */
}
-
-.main_menu_selected {
- background-color: #CCCCCC;
- border: 2px inset white;
-/* position: relative; */
- text-align: center;
- white-space: nowrap;
+#AppInfoDiv img{
+ vertical-align:middle; /* center image and text vertically */
}
-
-.main_menu_selected a{
- color: #eee;
- font-weight:bold;
+#AppInfoCompanyDiv{
+ display:table-cell; /* REQUIRED: as a cell */
}
-
-.main_menu_selected a:hover{
- color: #fff;
- text-decoration: none;
+#AppInfoUserDiv{
+ display:table-cell; /* REQUIRED: as a cell */
}
-
-span.main_menu_nolink {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+#AppInfoUserDiv a{
+ color:black;
}
-
-.main_menu a {
- font-weight: normal;
+#AppInfoUserDiv a:hover{
+ color:blue;
+ text-decoration:underline;
}
-
-.main_menu a:hover {
- color: #0000aa;
- text-decoration: underline;
+#AppInfoModuleDiv{
}
-.menu_group_img {
- background-color: #CCCCCC;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
+/*** HEADER - QUICK MENU ***/
-.menu_group_img img{
- position: relative;
- top: 10px;
+#QuickMenuDiv{
+ float:left; /* to the right side */
+ margin-top:3px;
}
-
-.menu_group_area {
- border: 2px inset white;
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
}
-
-.blank_area table {
- border: 0px;
- width: 100%;
+#QuickMenuDiv li{
+ display:inline; /* items are inline */
+ float:right; /* right to left */
}
-.menu_group_headers {
- border: 2px outset #AAAAAA;
- width: 25%;
+/*** links as buttons!!! clicking anywhere in the button will activate
+ the link!!! ***HJ***/
+
+#QuickMenuDiv li a{
+ padding:3px; /* links as button */
+ border:thin outset #ddd; /* un-pressed state */
+ background:#ddd;
}
-
-.menu_group_headers table{
+#QuickMenuDiv li a:hover{
+ padding:3px; /* links as button */
+ border:thin inset #ddd; /* pressed state */
+ text-decoration:none; /* no underline */
+ color:blue;
}
-.menu_group_headers_text {
- font-family: Tahoma, Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: black;
-}
+/*** BODY ***/
-.menu_group_items {
- vertical-align: top;
- background-color: white;
- border: 2px outset #AAAAAA;
- padding: 10px;
+#BodyDiv {
+ clear:both; /* REQUIRED */
+ overflow:hidden; /* REQUIRED */
+ color:black;
+ background:white;
}
-
-.menu_group_item {
- background-color: white;
- padding-top: 2px;
- padding-bottom: 2px;
+#BodyDiv table {
+ width:auto; /* automatic width */
+ margin: 0 auto;
+ margin-bottom:10px;
}
-
-.menu_group_item p {
- color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
+#BodyDiv table.selection {
+ background:#eee;
+ padding:5px;
+ border:thin outset #eee;
}
+/*#BodyDiv .centre{
+ margin:0 auto 10px;
+ text-align:center;
+}*/
-.page_title_text {
- font-family: Arial, Verdana, Helvetica;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
-}
+/*** BODY - MAIN MENU ***/
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv{
+ float:right; /* REQUIRED: to the RIGHT side */
+ white-space:nowrap; /* don't break text */
+ text-align:center;
+ width:11%;
+ background:#ddd;
}
-
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#MainMenuDiv ul{
+ list-style:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:0;
}
-
-span.menu_group_nolink {
- font-family: Tahoma, Arial, Verdana, Helvetica;
- font-size: 10px;
- font-weight: normal;
- color: #777777;
- text-decoration: none;
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
}
-
-.menu_group_item a {
+#MainMenuDiv li a{ /* link as button!!! not-pressed state */
+ display:block; /* REQUIRED */
+ padding:3px;
+ border:thin outset #ddd;
+ color:blue;
}
-
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
+ text-decoration:none;
+ padding:3px;
+ border:thin inset #ddd;
+ background:#ddd;
}
-
-#footer {
- position: relative;
- bottom: -3px;
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ border:thin inset #ccc;
+ background:#ccc;
+ color:blue;
+ text-decoration:none;
}
-a.footer {
- font-family: Arial, Verdana, Helvetica;
- color: black;
- font-weight: normal;
- font-size: 8px;
-}
+/*** BODY - SUB MENU ***/
-.footer {
- font-family: Tahoma, Arial, Verdana, Helvetica;
- color: black;
- font-weight: normal;
- font-size: 8px;
- text-align: center;
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:89%; /* main menu is 10% */
}
-
-.legal {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#SubMenuDiv ul{
+ list-style-type:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin-top:0px;
+ margin-left:3px;
+ border:thin outset #ddd;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#SubMenuDiv li{
+ /*list-style:none;*/ /* REQUIRED: hide the bullets */
+ background:#eee;
+ padding:2px;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#SubMenuDiv li img{
+ vertical-align:middle; /* verticall align icon with the text */
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 9px;
- color: white;
- background-color: #336699;
+#SubMenuDiv .menu_group_headers {
+ background:#ddd;
+ outline:thin outset #ddd;
+ text-align:center;
+ color:black;
}
-
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+#TransactionsDiv{
+ display:table-cell;
}
-
-input.big {
- width: 100px;
+#InquiriesDiv{
+ display:table-cell;
}
-
-input.small {
- width: 50px;
+#InquiriesDiv div{ /* default div, used for custom report header */
+ background:#ddd;
+ color:black;
+ padding:2px;
+ border:thin outset #ddd;
}
-
-input.inputerror {
- background-color: #fddbdb;
+#InquiriesDiv body{
+ background:#eee;
+ color:red;
+ padding:2px;
}
-
-textarea.texterror {
- background-color: #fddbdb;
+#MaintenanceDiv{
+ display:table-cell;
+/* float:left;*/
+/* width:32.5%;
+ border:thin solid black;*/
+
}
-
-select.selecterror {
- background-color: #fddbdb;
+.menu_group_item p {
+ color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: 3px; /* this makes the bullet to appear as the li tag previously used */
+ margin:0px; /* One thing that I didnÃÂôt like of the li was that it had no left margin applied */
}
-.tableheader {
- font-weight: normal;
- background-color: #cccce5;
- color: #330000;
-}
+/*** FOOTER ***/
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+#FooterDiv{
+ clear:both; /* REQUIRED */
+ overflow:hidden;
+ color:gray;
}
-
-.label {
- font-weight:bold;
- font-style:normal;
- font-size:12px;
- color:black;
- background-color:#cccccc;
+#FooterWrapDiv{
+ overflow:hidden;
+ padding:3px;
}
-
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterLogoDiv{
+ float:left; /* right side */
}
-
-.table_index {
- background-color: #F1FFDD;
+#FooterVersionDiv{
+ float:right; /* left side */
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterTimeDiv{
+ clear:right; /* below */
}
+
+/*** END ***/
\ No newline at end of file
Deleted: trunk/css/professional-rtl/images/Graphique-32.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/accept.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/back.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/bar.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/button_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/company.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/currency.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelbluebutton.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/gelblueh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/hoverbuttonblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/input.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inputh.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inputhtxt.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inquiries.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/inventory.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/maintenance.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_blue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_dblue.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_grey.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_indigo.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menu_bg_white.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/menucurve.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/stripe.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/transactions.gif
===================================================================
(Binary files differ)
Modified: trunk/css/professional-rtl/login.css
===================================================================
--- trunk/css/professional-rtl/login.css 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/css/professional-rtl/login.css 2012-07-29 00:57:18 UTC (rev 5567)
@@ -3,10 +3,9 @@
padding: 0px;
margin: 0px;
text-align: center;
- font: 14px "Tahoma", "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
+ font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
background: #fff;
color: #777;
- direction: rtl;
}
#container {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-28 10:13:11 UTC (rev 5566)
+++ trunk/doc/Change.log 2012-07-29 00:57:18 UTC (rev 5567)
@@ -1,5 +1,6 @@
webERP Change Log
+29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
28/7/2012 Hindra Joshua: Fix for Gel theme and default theme to work with new styles
26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used...
[truncated message content] |
|
From: <dai...@us...> - 2012-07-29 07:12:44
|
Revision: 5569
http://web-erp.svn.sourceforge.net/web-erp/?rev=5569&view=rev
Author: daintree
Date: 2012-07-29 07:12:37 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
few more manual links
Modified Paths:
--------------
trunk/Areas.php
trunk/COGSGLPostings.php
trunk/SalesGLPostings.php
trunk/SystemParameters.php
trunk/css/gel/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/install/save.php
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/Areas.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Sales Area Maintenance');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'Areas';
include('includes/header.inc');
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/COGSGLPostings.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Cost Of Sales GL Postings Set Up');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SalesGLPostings';
include('includes/header.inc');
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/SalesGLPostings.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -4,6 +4,8 @@
include('includes/session.inc');
$title = _('Sales GL Postings Set Up');
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SalesGLPostings';
include('includes/header.inc');
if (isset($_GET['SelectedSalesPostingID'])){
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/SystemParameters.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('System Configuration');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SystemConfiguration';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Supplier Types')
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/css/gel/default.css 2012-07-29 07:12:37 UTC (rev 5569)
@@ -247,42 +247,42 @@
TEXT-ALIGN:center;
}
-DIV.page_help_text {
+div.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ border: #a52a2a 1px solid;
padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ padding-bottom: 2px;
+ padding-left: 10px;
+ z-index: 1;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
font-family: Arial, Verdana, Helvetica, sans-serif;
font-weight: normal;
font-size: 10px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
-DIV.system_check { /*** is this used??? */
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
+div.system_check { /*** is this used??? */
+ border: #a52a2a 1px solid;
+ padding-left: 3px;
+ z-index: 1;
width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-family: arial, verdana, helvetica, sans-serif;
padding-top: 1px;
padding-bottom: 1px;
font-weight: normal;
font-size: 10px;
color: black;
- TEXT-ALIGN:left;
+ text-align:left;
}
input.big {
@@ -441,7 +441,7 @@
white-space:nowrap; /* don't break text */
text-align:center;
width:12%;
- background:url(images/gelbluev.png) repeat-y blue;
+ background:url(images/gelblue.png) repeat-y blue;
background-size:contain;
border:2px outset blue;
border-radius:20px;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/doc/Change.log 2012-07-29 07:12:37 UTC (rev 5569)
@@ -1,5 +1,6 @@
webERP Change Log
+29/7/2012 Phil: install/save.php now uses date_default_timezone_set function to set the time-zone to avoid all the nasty warnings
29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
28/7/2012 Hindra Joshua: Fix for Gel theme and default theme to work with new styles
26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used - using <div> tags instead of tables for layout of the main menu
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2012-07-29 07:12:37 UTC (rev 5569)
@@ -62,7 +62,7 @@
<!-- Help End: CompanyPreferences -->
<!-- Help Begin: SystemConfiguration -->
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
-<h2>System Configuration</h2>
+<h2><a id="SystemConfiguration">System Configuration</a></h2>
<p>
From the setup tab the main system configuration parameters can be set from the link "Configuration Settings". Narrative is shown alongside each parameter to give the user an idea of where the setting is used.</p>
@@ -385,7 +385,7 @@
<p>
However, accounts receivable also requires that certain branch information, relating to delivery address etc must be entered against each customer. But before customer branches can be created the following base information must be entered - the links to the forms that allow all this information to be defined are available from the main menu under system set up:</p>
<ul>
- <li>Sales areas - these are for analysing sales by area. Also, GL integration can be set up to look at the area of the customer to determine the GL account to post sales to. Each branch of a customer's account must refer to a sales area. If sales areas are not necessary in your business a single area must be defined - called say "default area"</li>
+ <li><a id="Areas">Sales areas</a> - these are for analysing sales by area. Also, GL integration can be set up to look at the area of the customer to determine the GL account to post sales to. Each branch of a customer's account must refer to a sales area. If sales areas are not necessary in your business a single area must be defined - called say "default area"</li>
<li>As many sales types as required can be set up. It should be borne in mind that prices are held against sales types (and currencies). The sales type would reflect whether the sale was a trade sale, retail, wholesale, indent, cash sale, special sale etc.</li>
@@ -426,7 +426,7 @@
<p>
It is not necessary to use the stock integration to the general ledger although a fully standard costing based accounting system with full general ledger integration, will arguably provide the fastest and most informative financial reporting system for manufacturers.</p>
-<h3>Sales Ledger - Accounts Receivable Integration to General Ledger Issues</h3>
+<h3><a id="SalesGLPostings">Sales Ledger - Accounts Receivable Integration to General Ledger Issues</a></h3>
<p>
Some flexibility is provided in how sales transactions are posted to the general ledger. Different sales accounts can be used depending on any combination of the sales area of the customer, the sales type and the stock category of the item sold. Before entering any sales it is important to defined the posting schema under setup - Sales GL Interface Postings. The same flexibility is also afforded to the posting of cost of goods sold (COGS)- of course these journals are only created if the stock GL interface is activated. If it is then again it is critical to ensure the proper set up of the posting schema for COGS under the setup tab - COGS GL Interface posting</p>
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/install/save.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -286,7 +286,7 @@
$msg .= "// The timezone of the business - this allows the possibility of having;\n";
-$msg .= "putenv('TZ=" . $_POST['timezone'] . "');\n";
+$msg .= "date_default_timezone_set('" . $_POST['timezone'] . "');\n";
$msg .= "\$AllowCompanySelectionBox = true;\n";
if ($_POST['DemoData'] ==false){
$msg .= "\$DefaultCompany = '" . $_POST['company_name']. "';\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-07-29 07:12:44
|
Revision: 5569
http://web-erp.svn.sourceforge.net/web-erp/?rev=5569&view=rev
Author: daintree
Date: 2012-07-29 07:12:37 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
few more manual links
Modified Paths:
--------------
trunk/Areas.php
trunk/COGSGLPostings.php
trunk/SalesGLPostings.php
trunk/SystemParameters.php
trunk/css/gel/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/install/save.php
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/Areas.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Sales Area Maintenance');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'Areas';
include('includes/header.inc');
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/COGSGLPostings.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Cost Of Sales GL Postings Set Up');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SalesGLPostings';
include('includes/header.inc');
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/SalesGLPostings.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -4,6 +4,8 @@
include('includes/session.inc');
$title = _('Sales GL Postings Set Up');
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SalesGLPostings';
include('includes/header.inc');
if (isset($_GET['SelectedSalesPostingID'])){
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/SystemParameters.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('System Configuration');
-
+$ViewTopic= 'CreatingNewSystem';
+$BookMark = 'SystemConfiguration';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Supplier Types')
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/css/gel/default.css 2012-07-29 07:12:37 UTC (rev 5569)
@@ -247,42 +247,42 @@
TEXT-ALIGN:center;
}
-DIV.page_help_text {
+div.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ border: #a52a2a 1px solid;
padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ padding-bottom: 2px;
+ padding-left: 10px;
+ z-index: 1;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
font-family: Arial, Verdana, Helvetica, sans-serif;
font-weight: normal;
font-size: 10px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
-DIV.system_check { /*** is this used??? */
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
+div.system_check { /*** is this used??? */
+ border: #a52a2a 1px solid;
+ padding-left: 3px;
+ z-index: 1;
width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-family: arial, verdana, helvetica, sans-serif;
padding-top: 1px;
padding-bottom: 1px;
font-weight: normal;
font-size: 10px;
color: black;
- TEXT-ALIGN:left;
+ text-align:left;
}
input.big {
@@ -441,7 +441,7 @@
white-space:nowrap; /* don't break text */
text-align:center;
width:12%;
- background:url(images/gelbluev.png) repeat-y blue;
+ background:url(images/gelblue.png) repeat-y blue;
background-size:contain;
border:2px outset blue;
border-radius:20px;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/doc/Change.log 2012-07-29 07:12:37 UTC (rev 5569)
@@ -1,5 +1,6 @@
webERP Change Log
+29/7/2012 Phil: install/save.php now uses date_default_timezone_set function to set the time-zone to avoid all the nasty warnings
29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
28/7/2012 Hindra Joshua: Fix for Gel theme and default theme to work with new styles
26/7/2012 Hindra Joshua: New wood theme - mods to index.php / header.inc and footer.inc and modify existing themes to work with new html tag classes used - using <div> tags instead of tables for layout of the main menu
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2012-07-29 07:12:37 UTC (rev 5569)
@@ -62,7 +62,7 @@
<!-- Help End: CompanyPreferences -->
<!-- Help Begin: SystemConfiguration -->
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
-<h2>System Configuration</h2>
+<h2><a id="SystemConfiguration">System Configuration</a></h2>
<p>
From the setup tab the main system configuration parameters can be set from the link "Configuration Settings". Narrative is shown alongside each parameter to give the user an idea of where the setting is used.</p>
@@ -385,7 +385,7 @@
<p>
However, accounts receivable also requires that certain branch information, relating to delivery address etc must be entered against each customer. But before customer branches can be created the following base information must be entered - the links to the forms that allow all this information to be defined are available from the main menu under system set up:</p>
<ul>
- <li>Sales areas - these are for analysing sales by area. Also, GL integration can be set up to look at the area of the customer to determine the GL account to post sales to. Each branch of a customer's account must refer to a sales area. If sales areas are not necessary in your business a single area must be defined - called say "default area"</li>
+ <li><a id="Areas">Sales areas</a> - these are for analysing sales by area. Also, GL integration can be set up to look at the area of the customer to determine the GL account to post sales to. Each branch of a customer's account must refer to a sales area. If sales areas are not necessary in your business a single area must be defined - called say "default area"</li>
<li>As many sales types as required can be set up. It should be borne in mind that prices are held against sales types (and currencies). The sales type would reflect whether the sale was a trade sale, retail, wholesale, indent, cash sale, special sale etc.</li>
@@ -426,7 +426,7 @@
<p>
It is not necessary to use the stock integration to the general ledger although a fully standard costing based accounting system with full general ledger integration, will arguably provide the fastest and most informative financial reporting system for manufacturers.</p>
-<h3>Sales Ledger - Accounts Receivable Integration to General Ledger Issues</h3>
+<h3><a id="SalesGLPostings">Sales Ledger - Accounts Receivable Integration to General Ledger Issues</a></h3>
<p>
Some flexibility is provided in how sales transactions are posted to the general ledger. Different sales accounts can be used depending on any combination of the sales area of the customer, the sales type and the stock category of the item sold. Before entering any sales it is important to defined the posting schema under setup - Sales GL Interface Postings. The same flexibility is also afforded to the posting of cost of goods sold (COGS)- of course these journals are only created if the stock GL interface is activated. If it is then again it is critical to ensure the proper set up of the posting schema for COGS under the setup tab - COGS GL Interface posting</p>
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2012-07-29 04:26:24 UTC (rev 5568)
+++ trunk/install/save.php 2012-07-29 07:12:37 UTC (rev 5569)
@@ -286,7 +286,7 @@
$msg .= "// The timezone of the business - this allows the possibility of having;\n";
-$msg .= "putenv('TZ=" . $_POST['timezone'] . "');\n";
+$msg .= "date_default_timezone_set('" . $_POST['timezone'] . "');\n";
$msg .= "\$AllowCompanySelectionBox = true;\n";
if ($_POST['DemoData'] ==false){
$msg .= "\$DefaultCompany = '" . $_POST['company_name']. "';\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-02 10:50:26
|
Revision: 5583
http://web-erp.svn.sourceforge.net/web-erp/?rev=5583&view=rev
Author: daintree
Date: 2012-08-02 10:50:19 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Hindra new wood mkII
Modified Paths:
--------------
trunk/api/api_debtortransactions.php
trunk/css/wood/default.css
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/api/api_debtortransactions.php 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1325,7 +1325,7 @@
}
$SQL = "SELECT id,
rate,
- ovamount+ovgst+ovidscount-alloc AS lefttoalloc
+ ovamount+ovgst+ovdiscount-alloc AS lefttoalloc
FROM debtortrans
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type='" . $AllocDetails['type'] . "'
@@ -1336,7 +1336,7 @@
$Errors[] = NoTransactionToAllocate;
}
- if ($LeftToAllocRow['lefttoalloc'] <= 0){ /* negative if there is owt to allocate */
+ if ($LeftToAllocRow['lefttoalloc'] < 0){ /* negative if it is a positive receipt to allocate against invoices */
/*Now look for invoices with the same customerref to allocate to */
$SQL = "SELECT id,
rate,
@@ -1344,7 +1344,8 @@
FROM debtortrans
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=10
- AND reference='" . $AllocDetails['customerref'] . "'";
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc <0";
$Result = api_DB_query($SQL,$db);
$OSInvRow = DB_fetch_array($Result);
@@ -1361,7 +1362,7 @@
DB_Txn_Begin($db);
/*Now insert the allocation records */
- $SQL = "INSERT INTO custallocs (amt,
+ $SQL = "INSERT INTO custallocns (amt,
datealloc,
transid_allocfrom,
transid_allocto)
@@ -1378,8 +1379,70 @@
WHERE id = '" . $OSInvRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
} /*end if the exchange rates are the same so no diff on exchange */
+ /*end if it is a normal allocation of receipt to invoice*/
+ } elseif ($LeftToAllocRow['lefttoalloc']>0) { /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to */
+ /*Now look for credit notes type 11 with the same customerref to allocate to */
+ $SQL = "SELECT id,
+ rate,
+ ovamount+ovgst+ovdiscount-alloc AS outstanding
+ FROM debtortrans
+ WHERE debtorno='" . $AllocDetails['debtorno'] . "'
+ AND type=11
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc < 0";
+ $Result = api_DB_query($SQL,$db);
+ if (DB_num_rows($Result)) { // then we need to cast the net further afield
+ $SQL = "SELECT id,
+ rate,
+ ovamount+ovgst+ovdiscount-alloc AS outstanding
+ FROM debtortrans
+ WHERE debtorno='" . $AllocDetails['debtorno'] . "'
+ AND type=12
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc < 0";
+ $Result = api_DB_query($SQL,$db);
+ }
+ $LeftToAllocate = $LeftToAllocRow['lefttoalloc'];
+
+ DB_Txn_Begin($db);
- }/*end if there is owt to allocation*/
+ while ($OSCreditRow = DB_fetch_array($Result)){
+
+ if ($OSCreditRow['rate']==$LeftToAllocRow['rate']
+ AND $OSCreditRow['outstanding']<0
+ AND $LeftToAllocate > 0){
+
+ if ($OSCreditRow['outstanding']+$LeftToAllocate<=0){
+ /*We can allocate the whole amount of the receipt */
+ $AllocateAmount = $LeftToAlloc;
+ $LeftToAllocate =0;
+ } else {
+ /*We can only allocate the rest of the invoice outstanding */
+ $AllocateAmount = -$OSCreditRow['outstanding'];
+ $LeftToAllocate -= $OSCreditRow['outstanding'];
+ }
+
+ /*Now insert the allocation records */
+ $SQL = "INSERT INTO custallocns (amt,
+ datealloc,
+ transid_allocfrom,
+ transid_allocto)
+ VALUE('" . $AllocateAmount . "',
+ '" . Date('Y-m-d') . "',
+ '" . $LeftToAllocRow['id'] . "',
+ '" . $OSCreditRow['id'] . "')";
+ $Result = api_DB_query($SQL,$db,'','',true);
+ /*Now update the allocated amounts in the debtortrans for both transactions */
+ $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
+ WHERE id = '" . $LeftToAllocRow['id'] . "'";
+ $Result = api_DB_query($SQL,$db,'','',true);
+ $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
+ WHERE id = '" . $OSCreditRow['id'] . "'";
+ $Result = api_DB_query($SQL,$db,'','',true);
+
+ }
+ } //end loop around potential positive receipts not fully allocated already
+ }
if (sizeof($Errors)==0) {
$Result = DB_Txn_Commit($db);
$Errors[0]=0;
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/css/wood/default.css 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1,329 +1,236 @@
-/***********************************
+/***
-"Wood" experimental theme for WebERP
-by Hindra Joshua
+"Wood" Theme for WebERP
-************************************/
+v2, 2012-08-02
+by Hindra Joshua
+Changes:
+- Wood textures scaled down
+- Add shadow effects
+- Light color
+- Some fixes
+
+***/
+
+
body{
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:8pt;
+ font-size:10px;
margin:10px;
- background:url(images/desk.jpg) saddlebrown;
+ background:url(images/desk.jpg) #631;
}
-/*a{
- color:blue;
- text-decoration:none;
+/*** default styles ***/
+
+a {
+ color:black;
+ text-decoration:none;
}
-a:hover{
- color:red;
+a:visited{
+ color:black;
text-decoration:underline;
-}*/
-img{
- vertical-align:middle;
}
-table{
- margin:0 auto;
- text-align:center;
+a:hover{
+ color:red;
+ text-decoration:underline;
}
+a:active{
+ color:red;
+ text-decoration:underline;
+ background:#fc8;
+}
-
-/*** CANVAS ***/
-#CanvasDiv{
- background:url(images/wood.jpg) repeat scroll 0 0 sandybrown;
- border:medium outset sandybrown;
- border-radius:15px 15px 15px 15px;
- padding:5px;
+img{ /* icon on page title, etc */
+ border:none;
+ vertical-align:middle;
}
-
-/*** HEADER *************************************************/
-#HeaderDiv{
+p.page_title_text { /* page title */
+ color:black;
+ font-weight:bold;
+ margin:5px auto;
+ padding:10px;
+ text-align:center;
}
-#HeaderDiv a:link, a:visited{
- color: black;
- font-weight: normal;
- text-decoration: none;
- border:2px outset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
-}
-#HeaderDiv a:hover{
- color: red;
- text-decoration: none;
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
-}
-#HeaderWrapDiv{
-}
-#AppInfoDiv{
- float:left;
+table{ /* most data display/input used tables */
+ background:none repeat scroll 0 0 white;
+ box-shadow:3px 3px 4px #663311;
+ margin:0 auto;
+ padding:3px;
+ text-align:center;
+ width:auto;
+ margin-bottom:10px;
}
-#AppInfoDiv{
- float:left;
+table .selection{ /* nested table for more complex data display/input */
+ background:#feb;
+ box-shadow:none;
}
-#AppInfoCompanyDiv{
- float:left;
+th { /* table headers */
+ font-weight: normal;
+ font-size: 10px;
+ background-color: #ffd980;
+ color: black;
+ text-align: center;
}
-#AppInfoUserDiv{
- float:left;
+th.number {
+ text-align: right;
+ font-weight: normal;
+ background-color: #800000;
+ color: white;
}
-#AppInfoModuleDiv{
- font-weight:bold;
- font-size:10pt;
-}
-#QuickMenuDiv{
- float:right;
-}
-#QuickMenuDiv ul{
- float:right;
-}
-#QuickMenuDiv ul li{
- display:inline;
- margin: 0px 2px;
- float: left;
-}
-/* That's it! All other 'header' styles outside this is NOT needed! */
-
-
-/*** BODY *********************************************************************/
-
-#BodyDiv {
- clear:both;
+/*table detail items default format */
+td {
+ text-align: left;
}
-#BodyWrapDiv{
-/* text-align:center;*/
+td.select {
+ background-color:#ffb;
}
-#MainMenuDiv{
- float:left;
- margin-left:0;
- width:12%;
- white-space:nowrap;
+td.number {
+ text-align: right;
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
-}
-#MainMenuDiv li{
- list-style:none;
-}
-.main_menu_unselected {
- border:2px outset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
+
+.centre{ /* used by buttons */
text-align:center;
}
-.main_menu_selected {
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
- text-align:center;
-}
-.main_menu_unselected:hover{
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
- text-align:center;
-}
-.main_menu_selected:hover{
-}
-.main_menu_unselected a{
- text-decoration:none;
-}
-.main_menu_unselected a:hover{
- color:red;
-}
-.main_menu_selected a{
- text-decoration:none;
-}
-.main_menu_selected a:hover{
- color:red;
-}
-
-/************************************/
-#SubMenuDiv{
- border:2px inset sandybrown;
- border-radius:15px 15px 15px 15px;
- float:right;
- list-style:none;
- margin:0;
- padding:5px;;
- width:86%;
- background:url(images/desk.jpg);
+input { /* used for text box and buttons (buttons should have their own styles) */
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+input.number{
+ text-align: right;
}
-#SubMenuDiv li{
- list-style:none;
+input.image {
+ border-width:0px;
+ background-color: transparent;
}
-
-#TransactionsDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+input:hover{
+ background:#fff791;
}
-#InquiriesDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+select { /* drop down */
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
}
-#MaintenanceDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+select:hover { /* drop down */
+ background:#fff791;
}
-.menu_group_headers {
- background:saddlebrown;
- border:2px outset saddlebrown;
- border-radius:10px 10px 0 0;
- padding:3px;
- text-align:center;
- color:white;
+textarea{
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
}
-/********************************************/
-
-.BodyTbl{
- width:100%;
+textarea:hover{
+ background:#fff791;
}
-/*** main menu (at left) ****************************************/
-.main_menu {
- outline:thin outset olivedrab;
- background:olivedrab;
-}
-
-.main_menu a {
- color: lightgreen;
- text-decoration:none;
+.EvenTableRows {
+ background-color: #f5e6c9;
}
-.main_menu a:hover {
- color: yellow;
- text-decoration: none;
+.OddTableRows {
+ background-color: #f2fac0;
}
-/**** CONTENT *********************************/
-table.selection {
+div.error {
+ background-color:#fddbdb;
+ color: red;
+ border: 1px solid red;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-
-.menu_group_headers table{
+div.warn {
+ background-color:#f5dbfd;
+ color: maroon;
+ border: 1px solid maroon;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-.menu_group_headers_text {
+div.success {
+ background-color:#b9ecb4;
+ color: darkgreen;
+ border: 1px solid darkgreen;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-div.centre {
- margin: 0 auto;
- text-align:center;
+div.info {
+ background-color:#C7CCF6;
+ border:0 solid navy;
+ color:navy;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-.menu_group_items {
-}
-.menu_group_item p {
- color: saddlebrown; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px;
-}
-.menu_group_item {
- padding-top: 2px;
- padding-bottom: 2px;
- border:thin inset transparent;
- border-radius:10px;
- color:black;
-}
-.menu_group_item:hover{
- border:thin inset tan;
- background:tan;
- border-radius:10px;
-}
-.menu_group_item a{
- color:darkgreen;
- text-decoration:none;
-}
-.menu_group_item a:hover{
- color:red;
- text-decoration:none;
-}
+DIV.page_help_text {
+ background: lightgrey url(images/help.png) top left no-repeat;
+ BORDER: #a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ PADDING-LEFT: 10px;
+ Z-INDEX: 1;
+ FLOAT: none;
+ VISIBILITY: visible;
+ POSITION: static;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
-
-/*** FOOTER **************************************************/
-#FooterDiv{
- clear:both;
- color:black;
- height:47px;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-#FooterWrapDiv{
- padding:5px;
+DIV.system_check {
+ BORDER: #a52a2a 1px solid;
+ Z-INDEX: 1;
+ FLOAT: none;
+ VISIBILITY: visible;
+ POSITION: static;
+ background: lightgray;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:left;
+
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-#FooterLogoDiv{
- background:white;
- border:2px outset sandybrown;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
- margin-left:-9px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-/* That's it! All other 'footer' styles outside this is NOT needed! */
-
-
-/************************************************************/
-
-.dpTbl {
- border: solid navy 1px;
+p.good {
+ font-weight: bold;
+ color: green;
}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
- text-align: left;
+p.bad {
+ font-weight: bold;
+ color:red;
}
-td.select {
- background-color:#eee;
-}
+/*** date picker ***/
-
+.dpTbl { /* date picker background */
+ border:thin solid black;
+ background:white;
+ box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
+}
.dpTD {
border: 0;
width:20px;
@@ -331,7 +238,6 @@
text-align:right;
cursor:pointer;
}
-
.dpDayHighlight {
border: 0;
width:20px;
@@ -339,7 +245,6 @@
text-align:right;
cursor:pointer;
}
-
.dpTDHover {
border: 0;
width:20px;
@@ -348,87 +253,11 @@
cursor:pointer;
}
-td.number {
- text-align: right;
-}
-.EvenTableRows {
- background-color: #f5e6c9;
-}
-.OddTableRows {
- background-color: #f2fac0;
-}
-th {
- font-weight: normal;
- font-size: 10px;
- background-color: #777C59;
- color: white;
- text-align: center;
-}
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-
-div.info {
- background-color:#c7ccf6;
- color: navy;
- border: 0px solid navy;
-}
-
-input {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
-}
-
-input.number{
- text-align: right;
-}
-
-input.image {
- border-width:0px;
- background-color: transparent;
-}
-
-input:hover{
-}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
-}
-
-p.good {
- font-weight: bold;
- color: green;
-}
-
-p.bad {
- font-weight: bold;
- color:red;
-}
-
#topMenu {
width: 100%;
color: black;
@@ -479,25 +308,19 @@
border: none;
}
-textarea{
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-textarea:hover{
-}
/* Table type is used for UI tables type 1 */
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 0px 0px 2px 2px solid #222;
margin: 0 auto;
}
/* Table type is used for UI tables type 2 */
.table2 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 0px 0px 2px 2px solid #222 ;
margin: 0 auto;
}
input.address3 {
@@ -536,225 +359,338 @@
/*top bar*/
+/*********************************************************/
-#quick_menu{
+span.main_menu_nolink {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #777777;
+ text-decoration: none;
+ white-space: nowrap;
}
+input.big {
+ width: 100px;
+}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: #ffffff;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+input.small {
+ width: 50px;
}
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+input.inputerror {
+ background-color: #fddbdb;
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+textarea.texterror {
+ background-color: #fddbdb;
}
-.main_area {
- border: 2px inset #ffffff;
- width: 100%;
- background-color: #ffffff;
+select.selecterror {
+ background-color: #fddbdb;
}
-
-/*********************************************************/
-
-
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+.tableheader {
+ font-weight: normal;
+ background-color: #777C59;
+ color: white;
}
-
-.menu_group_img {
- background-color: lightgray;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
}
-.menu_group_img img{
- position: relative;
- top: 10px;
+.label {
+ font-weight:bold;
+ font-style:normal;
+ font-size:12px;
+ color:black;
+ background-color:#cccccc;
}
-.menu_group_area {
- border: 0px inset #ffffff;
+
+.OsRow {
+ background-color: #234567;
+ color: white;
}
-.blank_area table {
- border: 0px;
- width: 100%;
+.table_index {
+ background-color: #F1FFDD;
}
-p.page_title_text {
- color:black;
- font-weight:bold;
- margin:5px auto;
- text-align:center;
- }
+/*li {
+ list-style-image: url(bullet.gif);
+}*/
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
-}
+/*** CANVAS ***/
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#CanvasDiv{
+ background:url(images/wood.jpg) #feb;
+ border:medium outset #feb;
+ border-radius:15px 15px 15px 15px;
+ padding:3px;
+ box-shadow: 5px 5px 6px #000; /* modern browser only! */
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
+/*** HEADER ***/
+
+#HeaderDiv{
+ color:black;
+ overflow:hidden;
+}
+#HeaderDiv a:link, a:visited{
+ color: black;
font-weight: normal;
- color: #777777;
text-decoration: none;
+ border:2px outset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ box-shadow:2px 2px 3px black;
+ margin-right:2px;
}
-
-.menu_group_item a {
+#HeaderDiv a:hover{
+ color: black;
font-weight: normal;
+ text-decoration: none;
+ border:2px outset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ color:red;
+ box-shadow:2px 2px 3px black;
}
+#HeaderDiv a:active{
+ color: red;
+ text-decoration: none;
+ border:2px inset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ box-shadow:2px 2px 3px black inset;
+}
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+#HeaderWrapDiv{
}
+/*** HEADER - APP INFO ***/
-.legal {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#AppInfoDiv{
+ float:left;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#AppInfoDiv{
+ float:left;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#AppInfoCompanyDiv{
+ float:left;
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 10px;
- color: white;
- background-color: #336699;
+#AppInfoUserDiv{
+ float:left;
}
+#AppInfoModuleDiv{
+ font-weight:bold;
+ font-size:12px;
+}
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+/*** HEADER - QUICK MENU ***/
+
+#QuickMenuDiv{
+ float:right; /* to the right side */
}
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
+}
+#QuickMenuDiv li{
+ display:inline; /* items are inline */
+}
+/*** BODY ***/
-input.big {
- width: 100px;
+#BodyDiv {
+ clear:both;
+ overflow:hidden;
}
+#BodyWrapDiv{
+ color:black;
+}
-input.small {
- width: 50px;
+/*** BODY - MAIN MENU ***/
+
+#MainMenuDiv{
+ float:left;
+ white-space:nowrap;
+ text-align:center;
+ width:11%;
+/* margin-left:0; */
}
+#MainMenuDiv ul{
+ margin:0 3px 0 0;
+ padding:0;
+}
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
+}
-input.inputerror {
- background-color: #fddbdb;
+/* links as buttons */
+
+#MainMenuDiv li a{
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:black;
+ border:2px outset #feb;
+ box-shadow:2px 2px 3px black;
+ margin-top:2px;
+ margin-bottom:2px;
}
+#MainMenuDiv li a:hover{
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px outset #feb;
+}
+#MainMenuDiv li a:active{ /* pressed */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:black;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
+#MainMenuDiv .main_menu_selected a:hover{ /* the selected button, pressed */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
-textarea.texterror {
- background-color: #fddbdb;
+/*** BODY - SUB MENU ***/
+
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:87%; /* main menu is 10% */
+ border:3px inset #feb;
+ border-radius:15px 15px 15px 15px;
+ margin-left:auto;
+ margin-right:auto;
+ padding:5px;
+ background:url(images/desk.jpg);
+ box-shadow: 5px 5px 6px #000 inset; /* modern browser only! */
}
+#SubMenuDiv ul{
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:5px;
+ background:/*url(images/wood.jpg) */#feb;
+ border:3px outset #feb;
+ border-radius:10px;
+ box-shadow: 5px 5px 6px #000; /* shadow: modern browser only! */
+}
+#SubMenuDiv li{
+ list-style:none; /* REQUIRED: hide bullets */
+}
-select.selecterror {
- background-color: #fddbdb;
+.menu_group_headers {
+ background:/*url(images/desk.jpg) */#631;
+ border:3px outset #631;
+ border-radius:10px 10px 0 0;
+ padding:2px;
+ text-align:center;
+ color:white;
+ font-weight:bold;
+ margin-top:-3px;
+ margin-left:-3px;
+ margin-right:-3px;
}
-.tableheader {
- font-weight: normal;
- background-color: #777C59;
- color: white;
+.menu_group_item {
+ padding:2px;
+ border:thin inset transparent;
+ color:black;
+ border-radius:7px;
}
+.menu_group_item:hover{
+ border:thin inset #ec9;
+ background:#ec9;
+ border-radius:7px;
+}
+.menu_group_item a{
+ color:black;
+ text-decoration:none;
+}
+.menu_group_item a:hover{
+ color:red;
+ text-decoration:none;
+}
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+.menu_group_item p {
+ color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px;
}
-.label {
+#TransactionsDiv{
+ display:table-cell;
+}
+#InquiriesDiv{
+ display:table-cell;
+}
+#InquiriesDiv div{ /* header for custom reports/forms */
+ background:#e9a77a;
font-weight:bold;
- font-style:normal;
- font-size:12px;
color:black;
- background-color:#cccccc;
+ padding:2px;
}
+#MaintenanceDiv{
+ display:table-cell;
+}
+/*** FOOTER ***/
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterDiv{
+ clear:both;
+ color:black;
+ overflow:hidden;
}
-
-.table_index {
- background-color: #F1FFDD;
+#FooterWrapDiv{
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterLogoDiv{
+ background:white;
+ border:2px outset #feb;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:3px;
+ margin-left:0px;
+ margin-top:3px;
+}
+#FooterVersionDiv{
+ float:left;
+ margin-left:10px;
+ margin-top:17px;
}
+#FooterTimeDiv{
+ float:right;
+ margin-top:17px;
+}
+
+/*** END ***/
\ No newline at end of file
Modified: trunk/css/wood/images/desk.jpg
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/wood.jpg
===================================================================
(Binary files differ)
Modified: trunk/css/wood/login.css
===================================================================
--- trunk/css/wood/login.css 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/css/wood/login.css 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1,71 +1,81 @@
-/* $Id: login.css 4911 2012-02-15 16:52:21Z tim_schofield $*/
+/***
+
+"Wood" Login theme for WebERP
+
+by Hindra Joshua
+
+***/
+
+
+/* $Id: login.css 4559 2011-05-01 09:45:18Z daintree $*/
body {
- padding: 0px;
- margin: 0px;
- text-align: center;
- font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
- background: #fff;
- color: #777;
+ background:url("images/desk.jpg") #663311;
+ color:black;
+ font:14px "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+ text-align:center;
}
+img{
+ vertical-align:middle;
+}
+
#container {
- text-align: left;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- position: relative;
- z-index: 1000;
- width: 300px;
- background: #F1FFDD;
+ background:url("images/wood.jpg") repeat scroll 0 0 #FFEEBB;
+ border:medium outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ box-shadow:5px 5px 6px;
+ margin-left:auto;
+ margin-right:auto;
+ margin-top:50px;
+ width:300px;
+ z-index:1000;
}
#login_logo {
- width: 200px;
- height: 75px;
- margin-left: 50px;
- margin-top: 70px;
- padding-top: 10px;
- margin-bottom: 20px;
- background: #fff url(../webERP.gif) repeat-x left bottom;
+background:url("../webERP.gif") no-repeat scroll center center #FFFFFF;
+ border:medium outset gray;
+ border-radius:19px 19px 19px 19px;
+ height:44px;
+ margin:10% auto;
+ padding:12px;
+ width:190px;
}
-input{
- width: 200px;
- border: solid #e3e3e3 1px;
- height:25px;
-/* background:url(images/input_bg.png) repeat-x left top; */
- padding:4px 0;
- vertical-align:middle;
- margin-left:50px;
- margin-bottom:10px;
+/*input{
+ background:none repeat scroll 0 0 transparent;
+ border:thick outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
}
input:hover {
- border: solid #aad4e3 1px;
- background-position:left bottom;
-}
+ background:none repeat scroll 0 0 transparent;
+ border:thick inset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+}*/
input.button {
- font-weight: bold;
- color: #000;
- background:#777C59;
- border: solid #e3e3e3 1px;
- padding: 0px;
- margin-top: 10px;
- margin-bottom: 30px;
+ background:none repeat scroll 0 0 transparent;
+ border:thick outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+ font-weight:bold;
+ box-shadow:3px 3px 4px;
}
input.button:hover {
- background: #feeC59;
+ background:none repeat scroll 0 0 transparent;
+ border:thick inset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+ box-shadow:3px 3px 4px inset;
}
-
-label{
- width:200px;
- padding-top:7px;
- padding-left:50px;
-}
-
-#demo_text{
- margin-left:50px;
- width:200px;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-02 10:50:29
|
Revision: 5583
http://web-erp.svn.sourceforge.net/web-erp/?rev=5583&view=rev
Author: daintree
Date: 2012-08-02 10:50:19 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Hindra new wood mkII
Modified Paths:
--------------
trunk/api/api_debtortransactions.php
trunk/css/wood/default.css
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/api/api_debtortransactions.php 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1325,7 +1325,7 @@
}
$SQL = "SELECT id,
rate,
- ovamount+ovgst+ovidscount-alloc AS lefttoalloc
+ ovamount+ovgst+ovdiscount-alloc AS lefttoalloc
FROM debtortrans
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type='" . $AllocDetails['type'] . "'
@@ -1336,7 +1336,7 @@
$Errors[] = NoTransactionToAllocate;
}
- if ($LeftToAllocRow['lefttoalloc'] <= 0){ /* negative if there is owt to allocate */
+ if ($LeftToAllocRow['lefttoalloc'] < 0){ /* negative if it is a positive receipt to allocate against invoices */
/*Now look for invoices with the same customerref to allocate to */
$SQL = "SELECT id,
rate,
@@ -1344,7 +1344,8 @@
FROM debtortrans
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=10
- AND reference='" . $AllocDetails['customerref'] . "'";
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc <0";
$Result = api_DB_query($SQL,$db);
$OSInvRow = DB_fetch_array($Result);
@@ -1361,7 +1362,7 @@
DB_Txn_Begin($db);
/*Now insert the allocation records */
- $SQL = "INSERT INTO custallocs (amt,
+ $SQL = "INSERT INTO custallocns (amt,
datealloc,
transid_allocfrom,
transid_allocto)
@@ -1378,8 +1379,70 @@
WHERE id = '" . $OSInvRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
} /*end if the exchange rates are the same so no diff on exchange */
+ /*end if it is a normal allocation of receipt to invoice*/
+ } elseif ($LeftToAllocRow['lefttoalloc']>0) { /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to */
+ /*Now look for credit notes type 11 with the same customerref to allocate to */
+ $SQL = "SELECT id,
+ rate,
+ ovamount+ovgst+ovdiscount-alloc AS outstanding
+ FROM debtortrans
+ WHERE debtorno='" . $AllocDetails['debtorno'] . "'
+ AND type=11
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc < 0";
+ $Result = api_DB_query($SQL,$db);
+ if (DB_num_rows($Result)) { // then we need to cast the net further afield
+ $SQL = "SELECT id,
+ rate,
+ ovamount+ovgst+ovdiscount-alloc AS outstanding
+ FROM debtortrans
+ WHERE debtorno='" . $AllocDetails['debtorno'] . "'
+ AND type=12
+ AND reference='" . $AllocDetails['customerref'] . "'
+ AND ovamount+ovgst+ovdiscount-alloc < 0";
+ $Result = api_DB_query($SQL,$db);
+ }
+ $LeftToAllocate = $LeftToAllocRow['lefttoalloc'];
+
+ DB_Txn_Begin($db);
- }/*end if there is owt to allocation*/
+ while ($OSCreditRow = DB_fetch_array($Result)){
+
+ if ($OSCreditRow['rate']==$LeftToAllocRow['rate']
+ AND $OSCreditRow['outstanding']<0
+ AND $LeftToAllocate > 0){
+
+ if ($OSCreditRow['outstanding']+$LeftToAllocate<=0){
+ /*We can allocate the whole amount of the receipt */
+ $AllocateAmount = $LeftToAlloc;
+ $LeftToAllocate =0;
+ } else {
+ /*We can only allocate the rest of the invoice outstanding */
+ $AllocateAmount = -$OSCreditRow['outstanding'];
+ $LeftToAllocate -= $OSCreditRow['outstanding'];
+ }
+
+ /*Now insert the allocation records */
+ $SQL = "INSERT INTO custallocns (amt,
+ datealloc,
+ transid_allocfrom,
+ transid_allocto)
+ VALUE('" . $AllocateAmount . "',
+ '" . Date('Y-m-d') . "',
+ '" . $LeftToAllocRow['id'] . "',
+ '" . $OSCreditRow['id'] . "')";
+ $Result = api_DB_query($SQL,$db,'','',true);
+ /*Now update the allocated amounts in the debtortrans for both transactions */
+ $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
+ WHERE id = '" . $LeftToAllocRow['id'] . "'";
+ $Result = api_DB_query($SQL,$db,'','',true);
+ $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
+ WHERE id = '" . $OSCreditRow['id'] . "'";
+ $Result = api_DB_query($SQL,$db,'','',true);
+
+ }
+ } //end loop around potential positive receipts not fully allocated already
+ }
if (sizeof($Errors)==0) {
$Result = DB_Txn_Commit($db);
$Errors[0]=0;
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/css/wood/default.css 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1,329 +1,236 @@
-/***********************************
+/***
-"Wood" experimental theme for WebERP
-by Hindra Joshua
+"Wood" Theme for WebERP
-************************************/
+v2, 2012-08-02
+by Hindra Joshua
+Changes:
+- Wood textures scaled down
+- Add shadow effects
+- Light color
+- Some fixes
+
+***/
+
+
body{
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:8pt;
+ font-size:10px;
margin:10px;
- background:url(images/desk.jpg) saddlebrown;
+ background:url(images/desk.jpg) #631;
}
-/*a{
- color:blue;
- text-decoration:none;
+/*** default styles ***/
+
+a {
+ color:black;
+ text-decoration:none;
}
-a:hover{
- color:red;
+a:visited{
+ color:black;
text-decoration:underline;
-}*/
-img{
- vertical-align:middle;
}
-table{
- margin:0 auto;
- text-align:center;
+a:hover{
+ color:red;
+ text-decoration:underline;
}
+a:active{
+ color:red;
+ text-decoration:underline;
+ background:#fc8;
+}
-
-/*** CANVAS ***/
-#CanvasDiv{
- background:url(images/wood.jpg) repeat scroll 0 0 sandybrown;
- border:medium outset sandybrown;
- border-radius:15px 15px 15px 15px;
- padding:5px;
+img{ /* icon on page title, etc */
+ border:none;
+ vertical-align:middle;
}
-
-/*** HEADER *************************************************/
-#HeaderDiv{
+p.page_title_text { /* page title */
+ color:black;
+ font-weight:bold;
+ margin:5px auto;
+ padding:10px;
+ text-align:center;
}
-#HeaderDiv a:link, a:visited{
- color: black;
- font-weight: normal;
- text-decoration: none;
- border:2px outset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
-}
-#HeaderDiv a:hover{
- color: red;
- text-decoration: none;
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
-}
-#HeaderWrapDiv{
-}
-#AppInfoDiv{
- float:left;
+table{ /* most data display/input used tables */
+ background:none repeat scroll 0 0 white;
+ box-shadow:3px 3px 4px #663311;
+ margin:0 auto;
+ padding:3px;
+ text-align:center;
+ width:auto;
+ margin-bottom:10px;
}
-#AppInfoDiv{
- float:left;
+table .selection{ /* nested table for more complex data display/input */
+ background:#feb;
+ box-shadow:none;
}
-#AppInfoCompanyDiv{
- float:left;
+th { /* table headers */
+ font-weight: normal;
+ font-size: 10px;
+ background-color: #ffd980;
+ color: black;
+ text-align: center;
}
-#AppInfoUserDiv{
- float:left;
+th.number {
+ text-align: right;
+ font-weight: normal;
+ background-color: #800000;
+ color: white;
}
-#AppInfoModuleDiv{
- font-weight:bold;
- font-size:10pt;
-}
-#QuickMenuDiv{
- float:right;
-}
-#QuickMenuDiv ul{
- float:right;
-}
-#QuickMenuDiv ul li{
- display:inline;
- margin: 0px 2px;
- float: left;
-}
-/* That's it! All other 'header' styles outside this is NOT needed! */
-
-
-/*** BODY *********************************************************************/
-
-#BodyDiv {
- clear:both;
+/*table detail items default format */
+td {
+ text-align: left;
}
-#BodyWrapDiv{
-/* text-align:center;*/
+td.select {
+ background-color:#ffb;
}
-#MainMenuDiv{
- float:left;
- margin-left:0;
- width:12%;
- white-space:nowrap;
+td.number {
+ text-align: right;
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
-}
-#MainMenuDiv li{
- list-style:none;
-}
-.main_menu_unselected {
- border:2px outset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
+
+.centre{ /* used by buttons */
text-align:center;
}
-.main_menu_selected {
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
- text-align:center;
-}
-.main_menu_unselected:hover{
- border:2px inset sandybrown;
- border-radius:10px;
- padding-left:5px;
- padding-right:5px;
- margin:2px;
- text-align:center;
-}
-.main_menu_selected:hover{
-}
-.main_menu_unselected a{
- text-decoration:none;
-}
-.main_menu_unselected a:hover{
- color:red;
-}
-.main_menu_selected a{
- text-decoration:none;
-}
-.main_menu_selected a:hover{
- color:red;
-}
-
-/************************************/
-#SubMenuDiv{
- border:2px inset sandybrown;
- border-radius:15px 15px 15px 15px;
- float:right;
- list-style:none;
- margin:0;
- padding:5px;;
- width:86%;
- background:url(images/desk.jpg);
+input { /* used for text box and buttons (buttons should have their own styles) */
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+input.number{
+ text-align: right;
}
-#SubMenuDiv li{
- list-style:none;
+input.image {
+ border-width:0px;
+ background-color: transparent;
}
-
-#TransactionsDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+input:hover{
+ background:#fff791;
}
-#InquiriesDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+select { /* drop down */
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
}
-#MaintenanceDiv{
- background:peachpuff;
- border:2px outset peachpuff;
- border-radius:10px;
- float:left;
- list-style:none;
- width:32%;
- margin:3px;
+select:hover { /* drop down */
+ background:#fff791;
}
-.menu_group_headers {
- background:saddlebrown;
- border:2px outset saddlebrown;
- border-radius:10px 10px 0 0;
- padding:3px;
- text-align:center;
- color:white;
+textarea{
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
}
-/********************************************/
-
-.BodyTbl{
- width:100%;
+textarea:hover{
+ background:#fff791;
}
-/*** main menu (at left) ****************************************/
-.main_menu {
- outline:thin outset olivedrab;
- background:olivedrab;
-}
-
-.main_menu a {
- color: lightgreen;
- text-decoration:none;
+.EvenTableRows {
+ background-color: #f5e6c9;
}
-.main_menu a:hover {
- color: yellow;
- text-decoration: none;
+.OddTableRows {
+ background-color: #f2fac0;
}
-/**** CONTENT *********************************/
-table.selection {
+div.error {
+ background-color:#fddbdb;
+ color: red;
+ border: 1px solid red;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-
-.menu_group_headers table{
+div.warn {
+ background-color:#f5dbfd;
+ color: maroon;
+ border: 1px solid maroon;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-.menu_group_headers_text {
+div.success {
+ background-color:#b9ecb4;
+ color: darkgreen;
+ border: 1px solid darkgreen;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-div.centre {
- margin: 0 auto;
- text-align:center;
+div.info {
+ background-color:#C7CCF6;
+ border:0 solid navy;
+ color:navy;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-.menu_group_items {
-}
-.menu_group_item p {
- color: saddlebrown; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px;
-}
-.menu_group_item {
- padding-top: 2px;
- padding-bottom: 2px;
- border:thin inset transparent;
- border-radius:10px;
- color:black;
-}
-.menu_group_item:hover{
- border:thin inset tan;
- background:tan;
- border-radius:10px;
-}
-.menu_group_item a{
- color:darkgreen;
- text-decoration:none;
-}
-.menu_group_item a:hover{
- color:red;
- text-decoration:none;
-}
+DIV.page_help_text {
+ background: lightgrey url(images/help.png) top left no-repeat;
+ BORDER: #a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ PADDING-LEFT: 10px;
+ Z-INDEX: 1;
+ FLOAT: none;
+ VISIBILITY: visible;
+ POSITION: static;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:center;
-
-/*** FOOTER **************************************************/
-#FooterDiv{
- clear:both;
- color:black;
- height:47px;
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-#FooterWrapDiv{
- padding:5px;
+DIV.system_check {
+ BORDER: #a52a2a 1px solid;
+ Z-INDEX: 1;
+ FLOAT: none;
+ VISIBILITY: visible;
+ POSITION: static;
+ background: lightgray;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 10px;
+ color: black;
+ TEXT-ALIGN:left;
+
+ box-shadow:3px 3px 4px;
+ margin:0 auto 10px;
+ padding:10px;
+ width:80%;
}
-#FooterLogoDiv{
- background:white;
- border:2px outset sandybrown;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
- margin-left:-9px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-/* That's it! All other 'footer' styles outside this is NOT needed! */
-
-
-/************************************************************/
-
-.dpTbl {
- border: solid navy 1px;
+p.good {
+ font-weight: bold;
+ color: green;
}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
- text-align: left;
+p.bad {
+ font-weight: bold;
+ color:red;
}
-td.select {
- background-color:#eee;
-}
+/*** date picker ***/
-
+.dpTbl { /* date picker background */
+ border:thin solid black;
+ background:white;
+ box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
+}
.dpTD {
border: 0;
width:20px;
@@ -331,7 +238,6 @@
text-align:right;
cursor:pointer;
}
-
.dpDayHighlight {
border: 0;
width:20px;
@@ -339,7 +245,6 @@
text-align:right;
cursor:pointer;
}
-
.dpTDHover {
border: 0;
width:20px;
@@ -348,87 +253,11 @@
cursor:pointer;
}
-td.number {
- text-align: right;
-}
-.EvenTableRows {
- background-color: #f5e6c9;
-}
-.OddTableRows {
- background-color: #f2fac0;
-}
-th {
- font-weight: normal;
- font-size: 10px;
- background-color: #777C59;
- color: white;
- text-align: center;
-}
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-
-div.info {
- background-color:#c7ccf6;
- color: navy;
- border: 0px solid navy;
-}
-
-input {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
-}
-
-input.number{
- text-align: right;
-}
-
-input.image {
- border-width:0px;
- background-color: transparent;
-}
-
-input:hover{
-}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 10px;
-}
-
-p.good {
- font-weight: bold;
- color: green;
-}
-
-p.bad {
- font-weight: bold;
- color:red;
-}
-
#topMenu {
width: 100%;
color: black;
@@ -479,25 +308,19 @@
border: none;
}
-textarea{
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-textarea:hover{
-}
/* Table type is used for UI tables type 1 */
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 0px 0px 2px 2px solid #222;
margin: 0 auto;
}
/* Table type is used for UI tables type 2 */
.table2 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 0px 0px 2px 2px solid #222 ;
margin: 0 auto;
}
input.address3 {
@@ -536,225 +359,338 @@
/*top bar*/
+/*********************************************************/
-#quick_menu{
+span.main_menu_nolink {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #777777;
+ text-decoration: none;
+ white-space: nowrap;
}
+input.big {
+ width: 100px;
+}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: #ffffff;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+input.small {
+ width: 50px;
}
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+input.inputerror {
+ background-color: #fddbdb;
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+textarea.texterror {
+ background-color: #fddbdb;
}
-.main_area {
- border: 2px inset #ffffff;
- width: 100%;
- background-color: #ffffff;
+select.selecterror {
+ background-color: #fddbdb;
}
-
-/*********************************************************/
-
-
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+.tableheader {
+ font-weight: normal;
+ background-color: #777C59;
+ color: white;
}
-
-.menu_group_img {
- background-color: lightgray;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
}
-.menu_group_img img{
- position: relative;
- top: 10px;
+.label {
+ font-weight:bold;
+ font-style:normal;
+ font-size:12px;
+ color:black;
+ background-color:#cccccc;
}
-.menu_group_area {
- border: 0px inset #ffffff;
+
+.OsRow {
+ background-color: #234567;
+ color: white;
}
-.blank_area table {
- border: 0px;
- width: 100%;
+.table_index {
+ background-color: #F1FFDD;
}
-p.page_title_text {
- color:black;
- font-weight:bold;
- margin:5px auto;
- text-align:center;
- }
+/*li {
+ list-style-image: url(bullet.gif);
+}*/
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
-}
+/*** CANVAS ***/
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#CanvasDiv{
+ background:url(images/wood.jpg) #feb;
+ border:medium outset #feb;
+ border-radius:15px 15px 15px 15px;
+ padding:3px;
+ box-shadow: 5px 5px 6px #000; /* modern browser only! */
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
+/*** HEADER ***/
+
+#HeaderDiv{
+ color:black;
+ overflow:hidden;
+}
+#HeaderDiv a:link, a:visited{
+ color: black;
font-weight: normal;
- color: #777777;
text-decoration: none;
+ border:2px outset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ box-shadow:2px 2px 3px black;
+ margin-right:2px;
}
-
-.menu_group_item a {
+#HeaderDiv a:hover{
+ color: black;
font-weight: normal;
+ text-decoration: none;
+ border:2px outset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ color:red;
+ box-shadow:2px 2px 3px black;
}
+#HeaderDiv a:active{
+ color: red;
+ text-decoration: none;
+ border:2px inset #feb;
+ border-radius:10px;
+ padding:3px 5px;
+ box-shadow:2px 2px 3px black inset;
+}
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+#HeaderWrapDiv{
}
+/*** HEADER - APP INFO ***/
-.legal {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#AppInfoDiv{
+ float:left;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#AppInfoDiv{
+ float:left;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#AppInfoCompanyDiv{
+ float:left;
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 10px;
- color: white;
- background-color: #336699;
+#AppInfoUserDiv{
+ float:left;
}
+#AppInfoModuleDiv{
+ font-weight:bold;
+ font-size:12px;
+}
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+/*** HEADER - QUICK MENU ***/
+
+#QuickMenuDiv{
+ float:right; /* to the right side */
}
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
+}
+#QuickMenuDiv li{
+ display:inline; /* items are inline */
+}
+/*** BODY ***/
-input.big {
- width: 100px;
+#BodyDiv {
+ clear:both;
+ overflow:hidden;
}
+#BodyWrapDiv{
+ color:black;
+}
-input.small {
- width: 50px;
+/*** BODY - MAIN MENU ***/
+
+#MainMenuDiv{
+ float:left;
+ white-space:nowrap;
+ text-align:center;
+ width:11%;
+/* margin-left:0; */
}
+#MainMenuDiv ul{
+ margin:0 3px 0 0;
+ padding:0;
+}
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
+}
-input.inputerror {
- background-color: #fddbdb;
+/* links as buttons */
+
+#MainMenuDiv li a{
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:black;
+ border:2px outset #feb;
+ box-shadow:2px 2px 3px black;
+ margin-top:2px;
+ margin-bottom:2px;
}
+#MainMenuDiv li a:hover{
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px outset #feb;
+}
+#MainMenuDiv li a:active{ /* pressed */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:black;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
+#MainMenuDiv .main_menu_selected a:hover{ /* the selected button, pressed */
+ border-radius:10px;
+ display:block; /* REQUIRED */
+ padding:3px;
+ text-decoration:none;
+ color:red;
+ border:2px inset #feb;
+ box-shadow:2px 2px 3px black inset;
+ margin-top:2px;
+}
-textarea.texterror {
- background-color: #fddbdb;
+/*** BODY - SUB MENU ***/
+
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:87%; /* main menu is 10% */
+ border:3px inset #feb;
+ border-radius:15px 15px 15px 15px;
+ margin-left:auto;
+ margin-right:auto;
+ padding:5px;
+ background:url(images/desk.jpg);
+ box-shadow: 5px 5px 6px #000 inset; /* modern browser only! */
}
+#SubMenuDiv ul{
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:5px;
+ background:/*url(images/wood.jpg) */#feb;
+ border:3px outset #feb;
+ border-radius:10px;
+ box-shadow: 5px 5px 6px #000; /* shadow: modern browser only! */
+}
+#SubMenuDiv li{
+ list-style:none; /* REQUIRED: hide bullets */
+}
-select.selecterror {
- background-color: #fddbdb;
+.menu_group_headers {
+ background:/*url(images/desk.jpg) */#631;
+ border:3px outset #631;
+ border-radius:10px 10px 0 0;
+ padding:2px;
+ text-align:center;
+ color:white;
+ font-weight:bold;
+ margin-top:-3px;
+ margin-left:-3px;
+ margin-right:-3px;
}
-.tableheader {
- font-weight: normal;
- background-color: #777C59;
- color: white;
+.menu_group_item {
+ padding:2px;
+ border:thin inset transparent;
+ color:black;
+ border-radius:7px;
}
+.menu_group_item:hover{
+ border:thin inset #ec9;
+ background:#ec9;
+ border-radius:7px;
+}
+.menu_group_item a{
+ color:black;
+ text-decoration:none;
+}
+.menu_group_item a:hover{
+ color:red;
+ text-decoration:none;
+}
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+.menu_group_item p {
+ color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px;
}
-.label {
+#TransactionsDiv{
+ display:table-cell;
+}
+#InquiriesDiv{
+ display:table-cell;
+}
+#InquiriesDiv div{ /* header for custom reports/forms */
+ background:#e9a77a;
font-weight:bold;
- font-style:normal;
- font-size:12px;
color:black;
- background-color:#cccccc;
+ padding:2px;
}
+#MaintenanceDiv{
+ display:table-cell;
+}
+/*** FOOTER ***/
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterDiv{
+ clear:both;
+ color:black;
+ overflow:hidden;
}
-
-.table_index {
- background-color: #F1FFDD;
+#FooterWrapDiv{
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterLogoDiv{
+ background:white;
+ border:2px outset #feb;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:3px;
+ margin-left:0px;
+ margin-top:3px;
+}
+#FooterVersionDiv{
+ float:left;
+ margin-left:10px;
+ margin-top:17px;
}
+#FooterTimeDiv{
+ float:right;
+ margin-top:17px;
+}
+
+/*** END ***/
\ No newline at end of file
Modified: trunk/css/wood/images/desk.jpg
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/wood.jpg
===================================================================
(Binary files differ)
Modified: trunk/css/wood/login.css
===================================================================
--- trunk/css/wood/login.css 2012-07-31 20:08:18 UTC (rev 5582)
+++ trunk/css/wood/login.css 2012-08-02 10:50:19 UTC (rev 5583)
@@ -1,71 +1,81 @@
-/* $Id: login.css 4911 2012-02-15 16:52:21Z tim_schofield $*/
+/***
+
+"Wood" Login theme for WebERP
+
+by Hindra Joshua
+
+***/
+
+
+/* $Id: login.css 4559 2011-05-01 09:45:18Z daintree $*/
body {
- padding: 0px;
- margin: 0px;
- text-align: center;
- font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
- background: #fff;
- color: #777;
+ background:url("images/desk.jpg") #663311;
+ color:black;
+ font:14px "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+ text-align:center;
}
+img{
+ vertical-align:middle;
+}
+
#container {
- text-align: left;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- position: relative;
- z-index: 1000;
- width: 300px;
- background: #F1FFDD;
+ background:url("images/wood.jpg") repeat scroll 0 0 #FFEEBB;
+ border:medium outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ box-shadow:5px 5px 6px;
+ margin-left:auto;
+ margin-right:auto;
+ margin-top:50px;
+ width:300px;
+ z-index:1000;
}
#login_logo {
- width: 200px;
- height: 75px;
- margin-left: 50px;
- margin-top: 70px;
- padding-top: 10px;
- margin-bottom: 20px;
- background: #fff url(../webERP.gif) repeat-x left bottom;
+background:url("../webERP.gif") no-repeat scroll center center #FFFFFF;
+ border:medium outset gray;
+ border-radius:19px 19px 19px 19px;
+ height:44px;
+ margin:10% auto;
+ padding:12px;
+ width:190px;
}
-input{
- width: 200px;
- border: solid #e3e3e3 1px;
- height:25px;
-/* background:url(images/input_bg.png) repeat-x left top; */
- padding:4px 0;
- vertical-align:middle;
- margin-left:50px;
- margin-bottom:10px;
+/*input{
+ background:none repeat scroll 0 0 transparent;
+ border:thick outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
}
input:hover {
- border: solid #aad4e3 1px;
- background-position:left bottom;
-}
+ background:none repeat scroll 0 0 transparent;
+ border:thick inset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+}*/
input.button {
- font-weight: bold;
- color: #000;
- background:#777C59;
- border: solid #e3e3e3 1px;
- padding: 0px;
- margin-top: 10px;
- margin-bottom: 30px;
+ background:none repeat scroll 0 0 transparent;
+ border:thick outset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+ font-weight:bold;
+ box-shadow:3px 3px 4px;
}
input.button:hover {
- background: #feeC59;
+ background:none repeat scroll 0 0 transparent;
+ border:thick inset #FFEEBB;
+ border-radius:15px 15px 15px 15px;
+ padding:10px;
+ vertical-align:middle;
+ width:50%;
+ box-shadow:3px 3px 4px inset;
}
-
-label{
- width:200px;
- padding-top:7px;
- padding-left:50px;
-}
-
-#demo_text{
- margin-left:50px;
- width:200px;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-04 10:15:55
|
Revision: 5584
http://web-erp.svn.sourceforge.net/web-erp/?rev=5584&view=rev
Author: daintree
Date: 2012-08-04 10:15:47 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
POS xml-rpc fixes for allocations
Modified Paths:
--------------
trunk/api/api_debtortransactions.php
trunk/api/api_webERPsettings.php
trunk/api/api_xml-rpc.php
trunk/sql/mysql/weberp-demo.sql
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_debtortransactions.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -314,7 +314,7 @@
$CustCurrRow = DB_fetch_array($CurrResult);
- /*Get the currency and rate of the bank account transferring to*/
+ /*Get the currency and rate of the bank account receiving into*/
$SQL = "SELECT currcode,
rate
FROM bankaccounts INNER JOIN currencies
@@ -1333,7 +1333,8 @@
$Result = api_DB_query($SQL,$db);
$LeftToAllocRow = DB_fetch_array($Result);
if (DB_num_rows($Result)==0){
- $Errors[] = NoTransactionToAllocate;
+ $Errors[0] = NoTransactionToAllocate;
+ return $Errors;
}
if ($LeftToAllocRow['lefttoalloc'] < 0){ /* negative if it is a positive receipt to allocate against invoices */
@@ -1345,13 +1346,19 @@
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=10
AND reference='" . $AllocDetails['customerref'] . "'
- AND ovamount+ovgst+ovdiscount-alloc <0";
+ AND ovamount+ovgst+ovdiscount-alloc >0";
$Result = api_DB_query($SQL,$db);
+ if (DB_num_rows($Result)==0){
+ $Errors[0] = NoTransactionToAllocate;
+ return $Errors;
+ }
+ /* The receipts will always be smaller than the invoice as there can be several receipts to make up payment for a single invocie - but not vice-versa - that's why there is no point iterating over the possibilities - in the words of McCloud "There can be only one"*/
+
$OSInvRow = DB_fetch_array($Result);
- if ($OSInvRow['rate']==$LeftToAllocRow['rate']
- AND $OSInvRow['outstanding']>0){
+ if ($OSInvRow['rate']==$LeftToAllocRow['rate'] AND $OSInvRow['outstanding']>0){
+
if ($OSInvRow['outstanding']+$LeftToAllocRow['lefttoalloc']>=0){
/*We can allocate the whole amount of the credit/receipt */
$AllocateAmount = -$LeftToAllocRow['lefttoalloc'];
@@ -1380,8 +1387,9 @@
$Result = api_DB_query($SQL,$db,'','',true);
} /*end if the exchange rates are the same so no diff on exchange */
/*end if it is a normal allocation of receipt to invoice*/
- } elseif ($LeftToAllocRow['lefttoalloc']>0) { /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to */
- /*Now look for credit notes type 11 with the same customerref to allocate to */
+ } elseif ($LeftToAllocRow['lefttoalloc']>0) {
+ /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to
+ Now look for credit notes type 11 with the same customerref to allocate to */
$SQL = "SELECT id,
rate,
ovamount+ovgst+ovdiscount-alloc AS outstanding
@@ -1389,9 +1397,10 @@
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=11
AND reference='" . $AllocDetails['customerref'] . "'
- AND ovamount+ovgst+ovdiscount-alloc < 0";
+ AND ovamount+ovgst+ovdiscount-alloc < -0.005";
$Result = api_DB_query($SQL,$db);
- if (DB_num_rows($Result)) { // then we need to cast the net further afield
+ if (DB_num_rows($Result)==0) {
+ // then we need to cast the net further afield and look for normal receipts to allocate to
$SQL = "SELECT id,
rate,
ovamount+ovgst+ovdiscount-alloc AS outstanding
@@ -1402,24 +1411,26 @@
AND ovamount+ovgst+ovdiscount-alloc < 0";
$Result = api_DB_query($SQL,$db);
}
+ if (DB_num_rows($Result)==0) { //then no trans to allocate this to
+ $Errors[0] = 'no transactions to allocate this to';
+ return $Errors;
+ }
$LeftToAllocate = $LeftToAllocRow['lefttoalloc'];
-
+
DB_Txn_Begin($db);
-
+ /* there could be several receipts to allocate against ... loop through until $LefToAllocate is exhausted */
while ($OSCreditRow = DB_fetch_array($Result)){
- if ($OSCreditRow['rate']==$LeftToAllocRow['rate']
- AND $OSCreditRow['outstanding']<0
- AND $LeftToAllocate > 0){
+ if ($OSCreditRow['rate']==$LeftToAllocRow['rate'] AND $LeftToAllocate > 0){
if ($OSCreditRow['outstanding']+$LeftToAllocate<=0){
/*We can allocate the whole amount of the receipt */
- $AllocateAmount = $LeftToAlloc;
+ $AllocateAmount = $LeftToAllocate;
$LeftToAllocate =0;
} else {
/*We can only allocate the rest of the invoice outstanding */
- $AllocateAmount = -$OSCreditRow['outstanding'];
- $LeftToAllocate -= $OSCreditRow['outstanding'];
+ $AllocateAmount = $OSCreditRow['outstanding'];
+ $LeftToAllocate += $OSCreditRow['outstanding'];
}
/*Now insert the allocation records */
@@ -1429,14 +1440,14 @@
transid_allocto)
VALUE('" . $AllocateAmount . "',
'" . Date('Y-m-d') . "',
- '" . $LeftToAllocRow['id'] . "',
- '" . $OSCreditRow['id'] . "')";
+ '" . $OSCreditRow['id'] . "',
+ '" . $LeftToAllocRow['id'] . "')";
$Result = api_DB_query($SQL,$db,'','',true);
/*Now update the allocated amounts in the debtortrans for both transactions */
- $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
+ $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
WHERE id = '" . $LeftToAllocRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
- $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
+ $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
WHERE id = '" . $OSCreditRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
Modified: trunk/api/api_webERPsettings.php
===================================================================
--- trunk/api/api_webERPsettings.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_webERPsettings.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -47,7 +47,7 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "select confvalue from config where confname='DefaultDateFormat'";
+ $sql = "SELECT confvalue FROM config WHERE confname='DefaultDateFormat'";
$result = DB_query($sql, $db);
$answer=DB_fetch_array($result);
$ReturnValue[0]=0;
@@ -55,9 +55,25 @@
return $ReturnValue;
}
-/* This function returns the default date format in webERP.
- */
+/* This function returns the reports directory of the webERP installation for the company in api/api_php.php */
+ function GetReportsDirectory($user, $password) {
+ $Errors = array();
+ $db = db($user, $password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT confvalue FROM config WHERE confname='reports_dir'";
+ $result = DB_query($sql, $db);
+ $answer=DB_fetch_array($result);
+ $ReturnValue[0]=0;
+ $ReturnValue[1]=$answer;
+ return $ReturnValue;
+ }
+
+/* This function returns the default location of the weberp user being used */
+
function GetDefaultLocation($user, $password) {
$Errors = array();
$db = db($user, $password);
@@ -108,7 +124,7 @@
}
return $ReturnValue;
}
-
+
function DeletePOSData($User, $Password) {
$Errors = array();
$db = db($User, $Password);
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_xml-rpc.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -2945,17 +2945,36 @@
function xmlrpc_GetDefaultLocation($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation( '', '')));
-/*x*/ }
+ if ($xmlrpcmsg->getNumParams() == 2){
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+ } else {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation( '', '')));
+ }
ob_end_flush();
return $rtn;
}
+ $Description = _('Returns the webERP reports_dir for the company selected');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reporte_dir') . ' ' . _('Otherwise an array of error codes is returned. ');
+
+ $GetReportsDirectory_sig = array(array($xmlrpcStruct),
+ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetReportsDirectory_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetReportsDirectory($xmlrpcmsg){
+ ob_start('ob_file_callback');
+ if ($xmlrpcmsg->getNumParams() == 2) {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetReportsDirectory($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+ } else {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetReportsDirectory( '', '')));
+ }
+ ob_end_flush();
+ return $rtn;
+ }
unset($Description);
unset($Parameter);
unset($ReturnValue);
@@ -3439,6 +3458,10 @@
"function" => "xmlrpc_GetDefaultLocation",
"signature" => $GetDefaultLocation_sig,
"docstring" => $GetDefaultLocation_doc),
+ "weberp.xmlrpc_GetReportsDirectory" => array(
+ "function" => "xmlrpc_GetReportsDirectory",
+ "signature" => $GetReportsDirectory_sig,
+ "docstring" => $GetReportsDirectory_doc),
"weberp.xmlrpc_CreatePOSDataFull" => array(
"function" => "xmlrpc_CreatePOSDataFull",
"signature" => $CreatePOSDataFull_sig,
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/sql/mysql/weberp-demo.sql 2012-08-04 10:15:47 UTC (rev 5584)
@@ -17,8 +17,8 @@
-- Table structure for table `accountgroups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `accountgroups` (
`groupname` char(30) NOT NULL DEFAULT '',
`sectioninaccounts` int(11) NOT NULL DEFAULT '0',
@@ -31,40 +31,40 @@
KEY `parentgroupname` (`parentgroupname`),
CONSTRAINT `accountgroups_ibfk_1` FOREIGN KEY (`sectioninaccounts`) REFERENCES `accountsection` (`sectionid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `accountsection`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `accountsection` (
`sectionid` int(11) NOT NULL DEFAULT '0',
`sectionname` text NOT NULL,
PRIMARY KEY (`sectionid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `areas`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `areas` (
`areacode` char(3) NOT NULL,
`areadescription` varchar(25) NOT NULL DEFAULT '',
PRIMARY KEY (`areacode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `assetmanager`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `assetmanager` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`stockid` varchar(20) NOT NULL DEFAULT '',
@@ -76,14 +76,14 @@
`disposalvalue` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `audittrail`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `audittrail` (
`transactiondate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`userid` varchar(20) NOT NULL DEFAULT '',
@@ -91,14 +91,14 @@
KEY `UserID` (`userid`),
CONSTRAINT `audittrail_ibfk_1` FOREIGN KEY (`userid`) REFERENCES `www_users` (`userid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `bankaccounts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `bankaccounts` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`currcode` char(3) NOT NULL,
@@ -113,14 +113,14 @@
KEY `BankAccountNumber` (`bankaccountnumber`),
CONSTRAINT `bankaccounts_ibfk_1` FOREIGN KEY (`accountcode`) REFERENCES `chartmaster` (`accountcode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `banktrans`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `banktrans` (
`banktransid` bigint(20) NOT NULL AUTO_INCREMENT,
`type` smallint(6) NOT NULL DEFAULT '0',
@@ -153,14 +153,14 @@
CONSTRAINT `banktrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `banktrans_ibfk_2` FOREIGN KEY (`bankact`) REFERENCES `bankaccounts` (`accountcode`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `bom`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `bom` (
`parent` char(20) NOT NULL DEFAULT '',
`component` char(20) NOT NULL DEFAULT '',
@@ -183,14 +183,14 @@
CONSTRAINT `bom_ibfk_3` FOREIGN KEY (`workcentreadded`) REFERENCES `workcentres` (`code`),
CONSTRAINT `bom_ibfk_4` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `chartdetails`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `chartdetails` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`period` smallint(6) NOT NULL DEFAULT '0',
@@ -203,14 +203,14 @@
CONSTRAINT `chartdetails_ibfk_1` FOREIGN KEY (`accountcode`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `chartdetails_ibfk_2` FOREIGN KEY (`period`) REFERENCES `periods` (`periodno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `chartmaster`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `chartmaster` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`accountname` char(50) NOT NULL DEFAULT '',
@@ -220,14 +220,14 @@
KEY `Group_` (`group_`),
CONSTRAINT `chartmaster_ibfk_1` FOREIGN KEY (`group_`) REFERENCES `accountgroups` (`groupname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `cogsglpostings`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `cogsglpostings` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`area` char(3) NOT NULL DEFAULT '',
@@ -241,14 +241,14 @@
KEY `GLCode` (`glcode`),
KEY `SalesType` (`salestype`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `companies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `companies` (
`coycode` int(11) NOT NULL DEFAULT '1',
`coyname` varchar(50) NOT NULL DEFAULT '',
@@ -278,27 +278,27 @@
`freightact` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`coycode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `config`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `config` (
`confname` varchar(35) NOT NULL DEFAULT '',
`confvalue` text NOT NULL,
PRIMARY KEY (`confname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractbom`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractbom` (
`contractref` varchar(20) NOT NULL DEFAULT '0',
`stockid` varchar(20) NOT NULL DEFAULT '',
@@ -311,14 +311,14 @@
CONSTRAINT `contractbom_ibfk_1` FOREIGN KEY (`workcentreadded`) REFERENCES `workcentres` (`code`),
CONSTRAINT `contractbom_ibfk_3` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractcharges`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractcharges` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`contractref` varchar(20) NOT NULL,
@@ -333,14 +333,14 @@
CONSTRAINT `contractcharges_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`),
CONSTRAINT `contractcharges_ibfk_2` FOREIGN KEY (`transtype`) REFERENCES `systypes` (`typeid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractreqts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractreqts` (
`contractreqid` int(11) NOT NULL AUTO_INCREMENT,
`contractref` varchar(20) NOT NULL DEFAULT '0',
@@ -351,14 +351,14 @@
KEY `ContractRef` (`contractref`),
CONSTRAINT `contractreqts_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contracts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contracts` (
`contractref` varchar(20) NOT NULL DEFAULT '',
`contractdescription` text NOT NULL,
@@ -385,14 +385,14 @@
CONSTRAINT `contracts_ibfk_2` FOREIGN KEY (`categoryid`) REFERENCES `stockcategory` (`categoryid`),
CONSTRAINT `contracts_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `currencies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `currencies` (
`currency` char(20) NOT NULL DEFAULT '',
`currabrev` char(3) NOT NULL DEFAULT '',
@@ -403,14 +403,14 @@
PRIMARY KEY (`currabrev`),
KEY `Country` (`country`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custallocns`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custallocns` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`amt` decimal(20,4) NOT NULL DEFAULT '0.0000',
@@ -424,14 +424,14 @@
CONSTRAINT `custallocns_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `debtortrans` (`id`),
CONSTRAINT `custallocns_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `debtortrans` (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custbranch`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custbranch` (
`branchcode` varchar(10) NOT NULL DEFAULT '',
`debtorno` varchar(10) NOT NULL DEFAULT '',
@@ -480,14 +480,14 @@
CONSTRAINT `custbranch_ibfk_6` FOREIGN KEY (`defaultshipvia`) REFERENCES `shippers` (`shipper_id`),
CONSTRAINT `custbranch_ibfk_7` FOREIGN KEY (`taxgroupid`) REFERENCES `taxgroups` (`taxgroupid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custcontacts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custcontacts` (
`contid` int(11) NOT NULL AUTO_INCREMENT,
`debtorno` varchar(10) NOT NULL,
@@ -498,14 +498,14 @@
`email` varchar(55) NOT NULL,
PRIMARY KEY (`contid`)
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custnotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custnotes` (
`noteid` tinyint(4) NOT NULL AUTO_INCREMENT,
`debtorno` varchar(10) NOT NULL DEFAULT '0',
@@ -515,14 +515,14 @@
`priority` varchar(20) NOT NULL,
PRIMARY KEY (`noteid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtorsmaster`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtorsmaster` (
`debtorno` varchar(10) NOT NULL DEFAULT '',
`name` varchar(40) NOT NULL DEFAULT '',
@@ -569,14 +569,14 @@
CONSTRAINT `debtorsmaster_ibfk_4` FOREIGN KEY (`salestype`) REFERENCES `salestypes` (`typeabbrev`),
CONSTRAINT `debtorsmaster_ibfk_5` FOREIGN KEY (`typeid`) REFERENCES `debtortype` (`typeid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortrans`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortrans` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`transno` int(11) NOT NULL DEFAULT '0',
@@ -615,14 +615,14 @@
CONSTRAINT `debtortrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `debtortrans_ibfk_3` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortranstaxes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortranstaxes` (
`debtortransid` int(11) NOT NULL DEFAULT '0',
`taxauthid` tinyint(4) NOT NULL DEFAULT '0',
@@ -632,27 +632,27 @@
CONSTRAINT `debtortranstaxes_ibfk_1` FOREIGN KEY (`taxauthid`) REFERENCES `taxauthorities` (`taxid`),
CONSTRAINT `debtortranstaxes_ibfk_2` FOREIGN KEY (`debtortransid`) REFERENCES `debtortrans` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortype`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortypenotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortypenotes` (
`noteid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typeid` tinyint(4) NOT NULL DEFAULT '0',
@@ -662,14 +662,14 @@
`priority` varchar(20) NOT NULL,
PRIMARY KEY (`noteid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `deliverynotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `deliverynotes` (
`deliverynotenumber` int(11) NOT NULL,
`deliverynotelineno` tinyint(4) NOT NULL,
@@ -684,28 +684,28 @@
CONSTRAINT `deliverynotes_ibfk_1` FOREIGN KEY (`salesorderno`) REFERENCES `salesorders` (`orderno`),
CONSTRAINT `deliverynotes_ibfk_2` FOREIGN KEY (`salesorderno`, `salesorderlineno`) REFERENCES `salesorderdetails` (`orderno`, `orderlineno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `departments`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `departments` (
`departmentid` int(11) NOT NULL AUTO_INCREMENT,
`description` varchar(100) NOT NULL DEFAULT '',
`authoriser` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`departmentid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `discountmatrix`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `discountmatrix` (
`salestype` char(2) NOT NULL DEFAULT '',
`discountcategory` char(2) NOT NULL DEFAULT '',
@@ -717,28 +717,28 @@
KEY `SalesType` (`salestype`),
CONSTRAINT `discountmatrix_ibfk_1` FOREIGN KEY (`salestype`) REFERENCES `salestypes` (`typeabbrev`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edi_orders_seg_groups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edi_orders_seg_groups` (
`seggroupno` tinyint(4) NOT NULL DEFAULT '0',
`maxoccur` int(4) NOT NULL DEFAULT '0',
`parentseggroup` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`seggroupno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edi_orders_segs`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edi_orders_segs` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`segtag` char(3) NOT NULL DEFAULT '',
@@ -748,14 +748,14 @@
KEY `SegTag` (`segtag`),
KEY `SegNo` (`seggroup`)
) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `ediitemmapping`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `ediitemmapping` (
`supporcust` varchar(4) NOT NULL DEFAULT '',
`partnercode` varchar(10) NOT NULL DEFAULT '',
@@ -767,14 +767,14 @@
KEY `PartnerStockID` (`partnerstockid`),
KEY `SuppOrCust` (`supporcust`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edimessageformat`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edimessageformat` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`partnercode` varchar(10) NOT NULL DEFAULT '',
@@ -786,14 +786,14 @@
UNIQUE KEY `PartnerCode` (`partnercode`,`messagetype`,`sequenceno`),
KEY `Section` (`section`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `emailsettings`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `emailsettings` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`host` varchar(30) NOT NULL,
@@ -806,14 +806,14 @@
`auth` tinyint(1) DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `factorcompanies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `factorcompanies` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`coyname` varchar(50) NOT NULL DEFAULT '',
@@ -830,14 +830,14 @@
PRIMARY KEY (`id`),
UNIQUE KEY `factor_name` (`coyname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `fixedassetcategories`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `fixedassetcategories` (
`categoryid` char(6) NOT NULL DEFAULT '',
`categorydescription` char(20) NOT NULL DEFAULT '',
@@ -849,28 +849,28 @@
`defaultdepntype` int(11) NOT NULL DEFAULT '1',
PRIMARY KEY (`categoryid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-04 10:15:55
|
Revision: 5584
http://web-erp.svn.sourceforge.net/web-erp/?rev=5584&view=rev
Author: daintree
Date: 2012-08-04 10:15:47 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
POS xml-rpc fixes for allocations
Modified Paths:
--------------
trunk/api/api_debtortransactions.php
trunk/api/api_webERPsettings.php
trunk/api/api_xml-rpc.php
trunk/sql/mysql/weberp-demo.sql
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_debtortransactions.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -314,7 +314,7 @@
$CustCurrRow = DB_fetch_array($CurrResult);
- /*Get the currency and rate of the bank account transferring to*/
+ /*Get the currency and rate of the bank account receiving into*/
$SQL = "SELECT currcode,
rate
FROM bankaccounts INNER JOIN currencies
@@ -1333,7 +1333,8 @@
$Result = api_DB_query($SQL,$db);
$LeftToAllocRow = DB_fetch_array($Result);
if (DB_num_rows($Result)==0){
- $Errors[] = NoTransactionToAllocate;
+ $Errors[0] = NoTransactionToAllocate;
+ return $Errors;
}
if ($LeftToAllocRow['lefttoalloc'] < 0){ /* negative if it is a positive receipt to allocate against invoices */
@@ -1345,13 +1346,19 @@
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=10
AND reference='" . $AllocDetails['customerref'] . "'
- AND ovamount+ovgst+ovdiscount-alloc <0";
+ AND ovamount+ovgst+ovdiscount-alloc >0";
$Result = api_DB_query($SQL,$db);
+ if (DB_num_rows($Result)==0){
+ $Errors[0] = NoTransactionToAllocate;
+ return $Errors;
+ }
+ /* The receipts will always be smaller than the invoice as there can be several receipts to make up payment for a single invocie - but not vice-versa - that's why there is no point iterating over the possibilities - in the words of McCloud "There can be only one"*/
+
$OSInvRow = DB_fetch_array($Result);
- if ($OSInvRow['rate']==$LeftToAllocRow['rate']
- AND $OSInvRow['outstanding']>0){
+ if ($OSInvRow['rate']==$LeftToAllocRow['rate'] AND $OSInvRow['outstanding']>0){
+
if ($OSInvRow['outstanding']+$LeftToAllocRow['lefttoalloc']>=0){
/*We can allocate the whole amount of the credit/receipt */
$AllocateAmount = -$LeftToAllocRow['lefttoalloc'];
@@ -1380,8 +1387,9 @@
$Result = api_DB_query($SQL,$db,'','',true);
} /*end if the exchange rates are the same so no diff on exchange */
/*end if it is a normal allocation of receipt to invoice*/
- } elseif ($LeftToAllocRow['lefttoalloc']>0) { /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to */
- /*Now look for credit notes type 11 with the same customerref to allocate to */
+ } elseif ($LeftToAllocRow['lefttoalloc']>0) {
+ /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to
+ Now look for credit notes type 11 with the same customerref to allocate to */
$SQL = "SELECT id,
rate,
ovamount+ovgst+ovdiscount-alloc AS outstanding
@@ -1389,9 +1397,10 @@
WHERE debtorno='" . $AllocDetails['debtorno'] . "'
AND type=11
AND reference='" . $AllocDetails['customerref'] . "'
- AND ovamount+ovgst+ovdiscount-alloc < 0";
+ AND ovamount+ovgst+ovdiscount-alloc < -0.005";
$Result = api_DB_query($SQL,$db);
- if (DB_num_rows($Result)) { // then we need to cast the net further afield
+ if (DB_num_rows($Result)==0) {
+ // then we need to cast the net further afield and look for normal receipts to allocate to
$SQL = "SELECT id,
rate,
ovamount+ovgst+ovdiscount-alloc AS outstanding
@@ -1402,24 +1411,26 @@
AND ovamount+ovgst+ovdiscount-alloc < 0";
$Result = api_DB_query($SQL,$db);
}
+ if (DB_num_rows($Result)==0) { //then no trans to allocate this to
+ $Errors[0] = 'no transactions to allocate this to';
+ return $Errors;
+ }
$LeftToAllocate = $LeftToAllocRow['lefttoalloc'];
-
+
DB_Txn_Begin($db);
-
+ /* there could be several receipts to allocate against ... loop through until $LefToAllocate is exhausted */
while ($OSCreditRow = DB_fetch_array($Result)){
- if ($OSCreditRow['rate']==$LeftToAllocRow['rate']
- AND $OSCreditRow['outstanding']<0
- AND $LeftToAllocate > 0){
+ if ($OSCreditRow['rate']==$LeftToAllocRow['rate'] AND $LeftToAllocate > 0){
if ($OSCreditRow['outstanding']+$LeftToAllocate<=0){
/*We can allocate the whole amount of the receipt */
- $AllocateAmount = $LeftToAlloc;
+ $AllocateAmount = $LeftToAllocate;
$LeftToAllocate =0;
} else {
/*We can only allocate the rest of the invoice outstanding */
- $AllocateAmount = -$OSCreditRow['outstanding'];
- $LeftToAllocate -= $OSCreditRow['outstanding'];
+ $AllocateAmount = $OSCreditRow['outstanding'];
+ $LeftToAllocate += $OSCreditRow['outstanding'];
}
/*Now insert the allocation records */
@@ -1429,14 +1440,14 @@
transid_allocto)
VALUE('" . $AllocateAmount . "',
'" . Date('Y-m-d') . "',
- '" . $LeftToAllocRow['id'] . "',
- '" . $OSCreditRow['id'] . "')";
+ '" . $OSCreditRow['id'] . "',
+ '" . $LeftToAllocRow['id'] . "')";
$Result = api_DB_query($SQL,$db,'','',true);
/*Now update the allocated amounts in the debtortrans for both transactions */
- $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
+ $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
WHERE id = '" . $LeftToAllocRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
- $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . "
+ $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . "
WHERE id = '" . $OSCreditRow['id'] . "'";
$Result = api_DB_query($SQL,$db,'','',true);
Modified: trunk/api/api_webERPsettings.php
===================================================================
--- trunk/api/api_webERPsettings.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_webERPsettings.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -47,7 +47,7 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "select confvalue from config where confname='DefaultDateFormat'";
+ $sql = "SELECT confvalue FROM config WHERE confname='DefaultDateFormat'";
$result = DB_query($sql, $db);
$answer=DB_fetch_array($result);
$ReturnValue[0]=0;
@@ -55,9 +55,25 @@
return $ReturnValue;
}
-/* This function returns the default date format in webERP.
- */
+/* This function returns the reports directory of the webERP installation for the company in api/api_php.php */
+ function GetReportsDirectory($user, $password) {
+ $Errors = array();
+ $db = db($user, $password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT confvalue FROM config WHERE confname='reports_dir'";
+ $result = DB_query($sql, $db);
+ $answer=DB_fetch_array($result);
+ $ReturnValue[0]=0;
+ $ReturnValue[1]=$answer;
+ return $ReturnValue;
+ }
+
+/* This function returns the default location of the weberp user being used */
+
function GetDefaultLocation($user, $password) {
$Errors = array();
$db = db($user, $password);
@@ -108,7 +124,7 @@
}
return $ReturnValue;
}
-
+
function DeletePOSData($User, $Password) {
$Errors = array();
$db = db($User, $Password);
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/api/api_xml-rpc.php 2012-08-04 10:15:47 UTC (rev 5584)
@@ -2945,17 +2945,36 @@
function xmlrpc_GetDefaultLocation($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation( '', '')));
-/*x*/ }
+ if ($xmlrpcmsg->getNumParams() == 2){
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+ } else {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetDefaultLocation( '', '')));
+ }
ob_end_flush();
return $rtn;
}
+ $Description = _('Returns the webERP reports_dir for the company selected');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reporte_dir') . ' ' . _('Otherwise an array of error codes is returned. ');
+
+ $GetReportsDirectory_sig = array(array($xmlrpcStruct),
+ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetReportsDirectory_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetReportsDirectory($xmlrpcmsg){
+ ob_start('ob_file_callback');
+ if ($xmlrpcmsg->getNumParams() == 2) {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetReportsDirectory($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+ } else {
+ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetReportsDirectory( '', '')));
+ }
+ ob_end_flush();
+ return $rtn;
+ }
unset($Description);
unset($Parameter);
unset($ReturnValue);
@@ -3439,6 +3458,10 @@
"function" => "xmlrpc_GetDefaultLocation",
"signature" => $GetDefaultLocation_sig,
"docstring" => $GetDefaultLocation_doc),
+ "weberp.xmlrpc_GetReportsDirectory" => array(
+ "function" => "xmlrpc_GetReportsDirectory",
+ "signature" => $GetReportsDirectory_sig,
+ "docstring" => $GetReportsDirectory_doc),
"weberp.xmlrpc_CreatePOSDataFull" => array(
"function" => "xmlrpc_CreatePOSDataFull",
"signature" => $CreatePOSDataFull_sig,
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2012-08-02 10:50:19 UTC (rev 5583)
+++ trunk/sql/mysql/weberp-demo.sql 2012-08-04 10:15:47 UTC (rev 5584)
@@ -17,8 +17,8 @@
-- Table structure for table `accountgroups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `accountgroups` (
`groupname` char(30) NOT NULL DEFAULT '',
`sectioninaccounts` int(11) NOT NULL DEFAULT '0',
@@ -31,40 +31,40 @@
KEY `parentgroupname` (`parentgroupname`),
CONSTRAINT `accountgroups_ibfk_1` FOREIGN KEY (`sectioninaccounts`) REFERENCES `accountsection` (`sectionid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `accountsection`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `accountsection` (
`sectionid` int(11) NOT NULL DEFAULT '0',
`sectionname` text NOT NULL,
PRIMARY KEY (`sectionid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `areas`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `areas` (
`areacode` char(3) NOT NULL,
`areadescription` varchar(25) NOT NULL DEFAULT '',
PRIMARY KEY (`areacode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `assetmanager`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `assetmanager` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`stockid` varchar(20) NOT NULL DEFAULT '',
@@ -76,14 +76,14 @@
`disposalvalue` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `audittrail`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `audittrail` (
`transactiondate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`userid` varchar(20) NOT NULL DEFAULT '',
@@ -91,14 +91,14 @@
KEY `UserID` (`userid`),
CONSTRAINT `audittrail_ibfk_1` FOREIGN KEY (`userid`) REFERENCES `www_users` (`userid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `bankaccounts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `bankaccounts` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`currcode` char(3) NOT NULL,
@@ -113,14 +113,14 @@
KEY `BankAccountNumber` (`bankaccountnumber`),
CONSTRAINT `bankaccounts_ibfk_1` FOREIGN KEY (`accountcode`) REFERENCES `chartmaster` (`accountcode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `banktrans`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `banktrans` (
`banktransid` bigint(20) NOT NULL AUTO_INCREMENT,
`type` smallint(6) NOT NULL DEFAULT '0',
@@ -153,14 +153,14 @@
CONSTRAINT `banktrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `banktrans_ibfk_2` FOREIGN KEY (`bankact`) REFERENCES `bankaccounts` (`accountcode`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `bom`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `bom` (
`parent` char(20) NOT NULL DEFAULT '',
`component` char(20) NOT NULL DEFAULT '',
@@ -183,14 +183,14 @@
CONSTRAINT `bom_ibfk_3` FOREIGN KEY (`workcentreadded`) REFERENCES `workcentres` (`code`),
CONSTRAINT `bom_ibfk_4` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `chartdetails`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `chartdetails` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`period` smallint(6) NOT NULL DEFAULT '0',
@@ -203,14 +203,14 @@
CONSTRAINT `chartdetails_ibfk_1` FOREIGN KEY (`accountcode`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `chartdetails_ibfk_2` FOREIGN KEY (`period`) REFERENCES `periods` (`periodno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `chartmaster`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `chartmaster` (
`accountcode` varchar(20) NOT NULL DEFAULT '0',
`accountname` char(50) NOT NULL DEFAULT '',
@@ -220,14 +220,14 @@
KEY `Group_` (`group_`),
CONSTRAINT `chartmaster_ibfk_1` FOREIGN KEY (`group_`) REFERENCES `accountgroups` (`groupname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `cogsglpostings`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `cogsglpostings` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`area` char(3) NOT NULL DEFAULT '',
@@ -241,14 +241,14 @@
KEY `GLCode` (`glcode`),
KEY `SalesType` (`salestype`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `companies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `companies` (
`coycode` int(11) NOT NULL DEFAULT '1',
`coyname` varchar(50) NOT NULL DEFAULT '',
@@ -278,27 +278,27 @@
`freightact` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`coycode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `config`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `config` (
`confname` varchar(35) NOT NULL DEFAULT '',
`confvalue` text NOT NULL,
PRIMARY KEY (`confname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractbom`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractbom` (
`contractref` varchar(20) NOT NULL DEFAULT '0',
`stockid` varchar(20) NOT NULL DEFAULT '',
@@ -311,14 +311,14 @@
CONSTRAINT `contractbom_ibfk_1` FOREIGN KEY (`workcentreadded`) REFERENCES `workcentres` (`code`),
CONSTRAINT `contractbom_ibfk_3` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractcharges`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractcharges` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`contractref` varchar(20) NOT NULL,
@@ -333,14 +333,14 @@
CONSTRAINT `contractcharges_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`),
CONSTRAINT `contractcharges_ibfk_2` FOREIGN KEY (`transtype`) REFERENCES `systypes` (`typeid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contractreqts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contractreqts` (
`contractreqid` int(11) NOT NULL AUTO_INCREMENT,
`contractref` varchar(20) NOT NULL DEFAULT '0',
@@ -351,14 +351,14 @@
KEY `ContractRef` (`contractref`),
CONSTRAINT `contractreqts_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `contracts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `contracts` (
`contractref` varchar(20) NOT NULL DEFAULT '',
`contractdescription` text NOT NULL,
@@ -385,14 +385,14 @@
CONSTRAINT `contracts_ibfk_2` FOREIGN KEY (`categoryid`) REFERENCES `stockcategory` (`categoryid`),
CONSTRAINT `contracts_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `currencies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `currencies` (
`currency` char(20) NOT NULL DEFAULT '',
`currabrev` char(3) NOT NULL DEFAULT '',
@@ -403,14 +403,14 @@
PRIMARY KEY (`currabrev`),
KEY `Country` (`country`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custallocns`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custallocns` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`amt` decimal(20,4) NOT NULL DEFAULT '0.0000',
@@ -424,14 +424,14 @@
CONSTRAINT `custallocns_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `debtortrans` (`id`),
CONSTRAINT `custallocns_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `debtortrans` (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custbranch`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custbranch` (
`branchcode` varchar(10) NOT NULL DEFAULT '',
`debtorno` varchar(10) NOT NULL DEFAULT '',
@@ -480,14 +480,14 @@
CONSTRAINT `custbranch_ibfk_6` FOREIGN KEY (`defaultshipvia`) REFERENCES `shippers` (`shipper_id`),
CONSTRAINT `custbranch_ibfk_7` FOREIGN KEY (`taxgroupid`) REFERENCES `taxgroups` (`taxgroupid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custcontacts`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custcontacts` (
`contid` int(11) NOT NULL AUTO_INCREMENT,
`debtorno` varchar(10) NOT NULL,
@@ -498,14 +498,14 @@
`email` varchar(55) NOT NULL,
PRIMARY KEY (`contid`)
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `custnotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `custnotes` (
`noteid` tinyint(4) NOT NULL AUTO_INCREMENT,
`debtorno` varchar(10) NOT NULL DEFAULT '0',
@@ -515,14 +515,14 @@
`priority` varchar(20) NOT NULL,
PRIMARY KEY (`noteid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtorsmaster`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtorsmaster` (
`debtorno` varchar(10) NOT NULL DEFAULT '',
`name` varchar(40) NOT NULL DEFAULT '',
@@ -569,14 +569,14 @@
CONSTRAINT `debtorsmaster_ibfk_4` FOREIGN KEY (`salestype`) REFERENCES `salestypes` (`typeabbrev`),
CONSTRAINT `debtorsmaster_ibfk_5` FOREIGN KEY (`typeid`) REFERENCES `debtortype` (`typeid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortrans`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortrans` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`transno` int(11) NOT NULL DEFAULT '0',
@@ -615,14 +615,14 @@
CONSTRAINT `debtortrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `debtortrans_ibfk_3` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortranstaxes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortranstaxes` (
`debtortransid` int(11) NOT NULL DEFAULT '0',
`taxauthid` tinyint(4) NOT NULL DEFAULT '0',
@@ -632,27 +632,27 @@
CONSTRAINT `debtortranstaxes_ibfk_1` FOREIGN KEY (`taxauthid`) REFERENCES `taxauthorities` (`taxid`),
CONSTRAINT `debtortranstaxes_ibfk_2` FOREIGN KEY (`debtortransid`) REFERENCES `debtortrans` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortype`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `debtortypenotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `debtortypenotes` (
`noteid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typeid` tinyint(4) NOT NULL DEFAULT '0',
@@ -662,14 +662,14 @@
`priority` varchar(20) NOT NULL,
PRIMARY KEY (`noteid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `deliverynotes`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `deliverynotes` (
`deliverynotenumber` int(11) NOT NULL,
`deliverynotelineno` tinyint(4) NOT NULL,
@@ -684,28 +684,28 @@
CONSTRAINT `deliverynotes_ibfk_1` FOREIGN KEY (`salesorderno`) REFERENCES `salesorders` (`orderno`),
CONSTRAINT `deliverynotes_ibfk_2` FOREIGN KEY (`salesorderno`, `salesorderlineno`) REFERENCES `salesorderdetails` (`orderno`, `orderlineno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `departments`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `departments` (
`departmentid` int(11) NOT NULL AUTO_INCREMENT,
`description` varchar(100) NOT NULL DEFAULT '',
`authoriser` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`departmentid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `discountmatrix`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `discountmatrix` (
`salestype` char(2) NOT NULL DEFAULT '',
`discountcategory` char(2) NOT NULL DEFAULT '',
@@ -717,28 +717,28 @@
KEY `SalesType` (`salestype`),
CONSTRAINT `discountmatrix_ibfk_1` FOREIGN KEY (`salestype`) REFERENCES `salestypes` (`typeabbrev`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edi_orders_seg_groups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edi_orders_seg_groups` (
`seggroupno` tinyint(4) NOT NULL DEFAULT '0',
`maxoccur` int(4) NOT NULL DEFAULT '0',
`parentseggroup` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`seggroupno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edi_orders_segs`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edi_orders_segs` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`segtag` char(3) NOT NULL DEFAULT '',
@@ -748,14 +748,14 @@
KEY `SegTag` (`segtag`),
KEY `SegNo` (`seggroup`)
) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `ediitemmapping`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `ediitemmapping` (
`supporcust` varchar(4) NOT NULL DEFAULT '',
`partnercode` varchar(10) NOT NULL DEFAULT '',
@@ -767,14 +767,14 @@
KEY `PartnerStockID` (`partnerstockid`),
KEY `SuppOrCust` (`supporcust`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `edimessageformat`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `edimessageformat` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`partnercode` varchar(10) NOT NULL DEFAULT '',
@@ -786,14 +786,14 @@
UNIQUE KEY `PartnerCode` (`partnercode`,`messagetype`,`sequenceno`),
KEY `Section` (`section`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `emailsettings`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `emailsettings` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`host` varchar(30) NOT NULL,
@@ -806,14 +806,14 @@
`auth` tinyint(1) DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `factorcompanies`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `factorcompanies` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`coyname` varchar(50) NOT NULL DEFAULT '',
@@ -830,14 +830,14 @@
PRIMARY KEY (`id`),
UNIQUE KEY `factor_name` (`coyname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `fixedassetcategories`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+
+
CREATE TABLE `fixedassetcategories` (
`categoryid` char(6) NOT NULL DEFAULT '',
`categorydescription` char(20) NOT NULL DEFAULT '',
@@ -849,28 +849,28 @@
`defaultdepntype` int(11) NOT NULL DEFAULT '1',
PRIMARY KEY (`categoryid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-06 10:44:25
|
Revision: 5587
http://web-erp.svn.sourceforge.net/web-erp/?rev=5587&view=rev
Author: daintree
Date: 2012-08-06 10:44:17 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
Hindra: fixes to aguapop
Modified Paths:
--------------
trunk/css/aguapop/default.css
trunk/css/aguapop/login.css
trunk/includes/session.inc
Removed Paths:
-------------
trunk/css/aguapop/README.txt
trunk/css/aguapop/default.css_large
trunk/css/aguapop/footer.inc.NEW
Deleted: trunk/css/aguapop/README.txt
===================================================================
--- trunk/css/aguapop/README.txt 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/README.txt 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,87 +0,0 @@
-I hope you enjoy this theme.
-It had taken me WAY too long to do this, maybe it was worth it.
-Have fun!
-Fred Schuettler
-
-
-The 'footer.inc.NEW' file must be used with this theme to make the 'aguapop' theme look right.
-Just copy it to: ~/webERP/includes/ and then rename the existing footer.inc as a backup before renaming
-this 'footer.inc.NEW' to 'footer.inc'.
-
-It will not adversely affect any of the existing themes, but it most definately will be required.
-
-jjjjjtjjjjjjjjttttttttttttttjGGGDDDDEEDWGGGGGKDDEEEEEWGGGGGGGEDDEEEEEED#GGGGGGGEDDEDDWGGGGDtiitiiiii
-jjjjjjjjjjjjjjtttttttttttttttDGGGEEDEDDWGGGGGKDDEDDEEWGGGGGGGEDEEEEEEEDWGGGGGGEDEDEDDWGGGGGjtittiiii
-jjjjjjjjjjjjjjjtttttttttttttiKGGGKDDDDEKGGGGGEDDEEDEDKGGGGGGGKDDDEEEEEDKGGGGGGKDDDDEDEGGGGDttttttiti
-jjjjjjtjjjjjjjttttttttttttttiKGGLKDDDEEKGGGGGDDDEEEDEKGGGGGGGKDDEEEEEEDEGGGGGGWDDDDDDDGGGGEittttitti
-jjjjjjjjjjjjjjttttttttttttttifGGGGEDDDEEGGGGGGEEEEEEEEGGGGGGGEDDEEEEEEEDGGGGGGWEDDDEEGGGGGEittttttKK
-jjjjjjjjjjjjjjtttttttttttttttiGGLLKDDDEDGGGGGGKDEEEEEEDGGGGGGEDDEEEDDEKGGGGGGGWDDDDDWGGGGGKittitKKEK
-jjjjjjjjtjjjjttttttttttttttttiKLGGEDDDDDGGGGGGKDEEDEDDDGGGGGGDDDDDDEDEWGGGGGGGKDDDDDWGGGGGGttiDWDDDK
-jjjjjjjjjjjjjjtttttttttttttttitDGGLEEDDDEGGGGGKDDDDEDDEGGGGGGDDEEEDEDDWGGGGGGGEDDDDDEGGGGGjtfWEEDDKD
-jjjjjjjjjjjjjjtjttttttttttttttiELGGKDEDDKGGGGGDDEDDDDDKGGGGGGGDDDEEDEEKGGGGGGEDEDDDEGGGGGGiKKDEEEDED
-jjjjjjjjjjjjtttjjttttttttttttitiKLGLWDDDKGGGGGGKEEDDDDWGGGGGGGEDEDDDEDGGGGGGGWDDDEDKLGGGGDEEEEEEDEED
-jjjjjjjjjjjjjjjjttttttttttttttitiEGGDDDDDDGGGGGKDDDDDDWGGGGGGGEDDDDDEDGGGGGGGKEDDDDKGGGGGKEEEEEDWDDD
-tjjtjjjjjjjtjjjjtttttttttttttttiifGGGKDDDKGGGGGDDDDDDDELDLGGGLKDDDDDDEGGGGGGEDEEDDDKGGGGGKEEEEEWDEDE
-jjjjjjjjjjjtjjjjjjtttttttttttttiiiGLGGDDDELGGGGLEDDDDDEGEGGELGKDDDDDDKGGGGGGWEDEDDEDGGGGGEDEEEWEDDED
-tjjjjjtjjjjjttjjjjjjttttttttttttitiELGKDDDKKDGGLKDDDDDDK.:..ELKEDDDDDWGGGGDGKEDDDEKGGGGGEDEEEKDEDDED
-jjjjjjjjjjttttjjjtjtttttttttttiiiii;KGGDDW..:EGGEDDDDDW..tL:.tWDDDDDDWGGGGGKDDEDDDWGGGGGKDEEEEEEDDDD
-jjtjjjjjjjtjtjjjjjjjtttttttttttiiiii;KGKK:.:::LGLDDDDDf.Ei;f::,EDDEDDKGGGGGWDEDDEDKGGGGGEDEEKEEEDDDD
-jjjjjjjjjjtttjjjjjtjttjttttttitiiiiiiiELf,ttLi:LfKDDDK.E;i;iG;:;EEDDDDGGGGDEEDEEDEGGGGGDDEDWDDEDDDDD
-jjjjjjjjjjttjjjjjjttjttttttttttiiiiiii;D:,tiiij.EDDDGW:;;;;;ij;:tDDDELGGGGEDDEDDEKLGGGGKDEWEDEDDDDDD
-tjjjjjjjjjtttjjjjjjjtttttttttttiiiiiitiD.Gi;;;;t.EDDDLj,;i;;i;G::DW#WWWWWW#WWW######WWWWEEEDEDEEDDDD
-jjjjjjjjjjtjjjjtjjttttttttttittiiiiiiitiL,ii;i;,t.KKW:j,i;;i;iij:.KWWWWW#W##WWWWW#WWWW#DWEDDDDDDDDDD
-jjjjjjjjjjjjtjjtttttttitiiiiiiiiiiiiiiD.Dii;;;;;E:WK#:j;i;i;ii;if::KDEEEEWKKWWWWWKWWWWWKEEEEDDDDDDDD
-jjjjjjjjjjjttjtKEEEEEEEEKKEEEKKKKKKKKEELffLGLjt;..DGK ,,;;;;fGG:::.WGGGGGWDDDEDDWGGGGLWEEDDEDDDDDDDD
-tjjjjjjjjjtttjtDGGGGGGGGGGGDGGGGGGGGGGGGGGGGGDDEEEEEKKKKWKWG,.::.:GKGGGGLKEDDDDDKGGGGKDEDDEDDEDDDDDD
-jjjjjjjjjjtjtjtEGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGLGGDEEEEEDWGLWW#WW##W#WKKEEKEDDEEEDDDDDDDDD
-jjjjjjjjjttttjtDLGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGEEf;i;WWW#W##WW##W##EEDDEDDEEDDDDDDE
-jjjjjjjjjtjtttjtKGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGDWL:.iiiiiWWW##W#KWW###EEDEEEEDDDDDEEDDD
-jjjjjjjjjtttttttiEDGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGDWWK.::.iiiifWWW##D;i;#W#EEEDEEDEEEEEDDDDDD
-jjjjjjjjjttttttjtttEEGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGLDEEjfWWf::::;;iiiGWW#WKiitti#EDDDEEDDEDEEDDDDDDD
-jjjjjjjjjjjtjttttttttiiLEKEDGGGGGGGGGGGGGGGGGDKDWf;GiifWE::,LK,.jiitiWWWW#jit;ifDEDDEEEDEEDDEEDEDDED
-jjjjjjjjjtttttttitttttttiiitfGEKKKEEEEKKKKKEDDD:.jKLjKE,... KWWLitiiiWWW#WjiDiGEDDDDEEEDEEEEEEEEDDDE
-jjjjjjjjjttttjGKEKGtttttitiittttiiiKDDDDDDDDDDDK:.KWWtt:.:::WWGifiit;WWWWWf;jfDEDDDEEEEDDDEEEEDDEDED
-jjjjjjjjjtjtEEGGGGDGttttittttttttitiWGDDDDDDDDDDj.KWGiiGi:.:fjiGtitiiWWWWWjLiiEDEEDEEEEDEEEEEEEDEEDD
-jjjjjjjjjtjKGGDGGGDDitttitttttttttttiEDDDDDDKKGjjti;ittfitLLjLLiiiiifWWW##fLiiKDEEEDEEDEEEEEEEEDEDWK
-jjjjjjjjjtEGDDGDDGGGKtttKEKjttfLititiiGDDGKf;iiii;;iiiitji;t;;itiiiiDWWWWWfjitfDKEEEEEEEEEEEEEEDKWDE
-jjjjjjjjjfGGDDDDGDGGGEDKGGGDELGGKttttiifDEiiiiiiiiiiiiiiiDiiGDGjiiiiWWWWWWftit;K#DDEEEEEEEEEEEEWKDEE
-tjjjjjjjjEDDDGDKEGGDWDEGGGGDGDGGEtttttiiEiiiiiiiiiiitiititit;itjitiiWWWW##iiitiEKDDDEEEEEEEEEEKKDEEE
-jjjjjjjjtKDGGGKGDDGKGGKGGGGGKGGGLLtttiii;iiiiiiiiiiii;iiiL;ii;fiitttWWWDt;DjiiiKDDDEEEEEEEEEEKKEEEEE
-jjjjjjjjjEDGEKttitWGGGDGGGGDGGGGGWttttiDiiiiiiiiiiijtKWWj;iiiGGiiit;;;iiiiiifKGiDDEEEEEEEEEEWEEEEEEE
-jjjjjjjjjjKKjtttttKGGDGGGGKGGGGDGKttttjiiiiiiiiiiitifLLK#WDLiLfiiiiiiii;;tD#EtiiEEDEEEEEEEEEWEDEEEEE
-jjjjjjjjjjittttttjDGDEGGGDDGGGGKGDfttiEiiiiiiiiiiiiGijiiifD##WWWDEDDEEW#WDjiiiitWDDEEEEEEEEWEEEEEEEE
-jjjjjjjjjttttttttLGGEKGGGKGGGGDGGGGttiDtiiiiiiiiiiKii;DitiiG,i#jGLLLfji;;iiititiEDDDEEEEDEEWEEEEEEEE
-jjjjjjjjjtttttttjLGGGWGGGEGGGGKGGGDttiGtiiiiiiiiijEiiif;itE..WWiiiiiiiiiiiiiiiiitEEEEDEEEEEEEEEEEEEE
-jjjjjjjjjttttttjtGGGGWGDEGGGGGGGGGEtiiDtititiiitjKKiiiiDE;:iWWKiiiiiiiiiiiitiiti;WDDEEEEEEWEEEEEEEEE
-jjjjjjjttttttttjjfDGGKKGKGGGGKGGGGELK##iiiititiLfLEiiiiiiLGWWWGtiiiiiiiiijtiiittiGDDEEEEEEWEEEEEEEEE
-jjjjjjjjtjttjtjttjEGGKGWKGGGKGGGDKWWDjtjiiiitiEtttEiiiiiiDWWWWtiiiiiiiiitEEKWKGti;KDEEEEEEKEEEEEEEEE
-jfjjjjjjtttjtjjjjtWGGGKGDWWWEKWWEGKittiLiiiiLDitttWiiiitiWWWW#itiiiiiiiifDDEEDEEWE#EEEEEEEKEEEEEEEEE
-jfjjjjjjjtttttjjjtGEGEEDEKGDKDGGGGKttiiiEEEDtttttiEiijtiKKWWWGiiiiiiiiiiDDEEEEEEEDEEEEEEEEEEEEEEEEEE
-jfjjjjjjjtjjtjjjtjjttDDDGGGGGLEKGGKttttittttitttfEWiiG:f:. iGiiiiiiiiiiiWDEEEEEEEDDEEEEEEEEEEEEEEEEE
-jfjjjjjjjtjjtjjtjtttfGGGEGGGDGKGDGKtttttttttttitWDKEEEjf,,fDiiiiiiiiiiiiKDEEEEEEEEDEEEEEEEKEEEEEEEEE
-jfjjjjjjjjjjtjjjjtttGGGGEGGGGGGGGGKtttttttttttiWDDEDt;iittiiiiiiiiiiiiiiDEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjttjjjjjjttGGGGGKGGGGGGGGKtttttttttttGEDDGDiiiiiiiiiiiiiiiititEDEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjjtjjjjtjttjGGGGGKGGGGGGGEtttjtitLGDDWKKEtDtttiitiiiiiitiiititWDEEEEEEEEEEEEEEEEE#EEEEEEEEE
-jjjjjjjjjjjtjjjjjjtjtWGGGGDDDGGGDGEjtttjEftiiiiiiitDitiiitiiiiiiitttttWWEEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjjtjjjjjjjttjKGGGGKGGDGKGEjttiWttttttiiiiiDitttiiiiiiitiititjDWEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-jfjjjjjjjjjjjjjjjjjtttKEGGGLKDEKDGDfttjftttttttiiiiitiiiiiiititttiitiWEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjttKGGGGDGDGGGDGGttfttttttiiiiiitittttiiiiiittttiWEKEEEEEEEEEEEEEEEEEEEEKEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjjDGDGDGDGGGGGGLEtjjLttttttiitiititttttiitttttiKEEE#EEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-jjjjjjjjjjjjjjjjjjjtjKGGGGGGGGGGGGGKjjtWttttttttttittttttttittttiWEEEEWEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjfEDGGGGGGGGGGGGWjttftttttttttiitttttttttittiWEEEEEKEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-jjjjjjjjjjjjjjjjjjjjDGGGGGGGGGGGGGGWjjjtGttttttttttttttttttttifWDEEEEEDDEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-jfjjjjjjjjjjjjjjjjjjKDGGGGGGGGGGGGGWjjttGfttttttttttttttttttiKKEEEEEEKEEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-ffjjjjjffjjjjjjjjjjjKGGGGGGGGDGDGGDKjjtjtLDittttttttttttttifWEEEEEEEE#EEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-ffjfjjjfjjjjjjjjjjjjGDGGGGGGGGGGGDGEjjjttttKEjttttttttijLKWEWEEEEEEEEWEEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-ffjfjjjfjjjfjjjjjjjfGGDDDGDGGGGGGGDDLjjjjjjttfEWEDDEEWWEEEEEEWEEEEEEWEEEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-ffjfjjfjjjjjjjjjjjjEGDGDGGDGGGGGGGDGDjjjjttjjtjttittLKEEEEEEEEWEEEEE#EEE#KWEEEEEEEEEEEEEEEEKEEEEEEEE
-ffffjfffjjjjjjjjjjtWDDGDDDDGGGGGGGDGKjjjjtjjjjjtjjjjWEEEEEEEEEKKEEEEWEEWGDDKEEEEEEEEEEEEEEEKEEEEEEEE
-fffffffffjjjjjjjjjLEDDGDDDDDDDGDDDDDWjjjjjjjjjjjjjDKEEEEEEEEEEEWEEEEEWEEGDGWEEEEEEEEEEEEEEEKKEEEEEEE
-fffffffffjjfjjjjjjEGDDGDDDDDDDGDDDDDKjjjjjjjjjjjjtKEEEEEEEEEEKED#EEEEEEWEEWEEEEEEEEEEEEEEEEEKEEEEEEE
-ffffffjffffjjjjjjjWDDDDDDDDDDDDDDDDDEfjjjjjjjjjjt#EEEEEEEEEEEEEEKEEEEEWEEEEEEEEEEEEEEEEEEEEEKEEEEEEE
-ffffffffjfffjjjfjjWDDDDDDDDDDDDDDDGDDLjjjjjjjjjj#EEEEEEEEEEEEEEEE#EEEEWEEEEEEEEEEEEEEEEEEEEEWEEEEEEE
-fffffffffffffffffLDDDDDDDDDDDDDDDDDDDDjjjjjjjjjWEEEEEEEEEEEEEEEEEKEEEEE#EKEEEEEEEEEEEEEEEEEEWEEEEEEE
-fffffffffffffffffKDDDDDDDDDDDDDDDDDDDWjjjjjjjjKKKEEEEEEEEEEEEEEEEE#EEEEKKEEEEEEEEEEEEEEEEEEEWKEEEEEE
-fffffffffffffffjfWDDDDDDDDDDDDDDDDDDDWjjjjjjjWKKKEEEEEEEEEEEEEEEEEWEEEEE#EEEEEEEEEEEEEEEEEEEWEKEEEEE
-fffffffffffffffffKDDDDDDDDDDDDDDDDDDDDLjjjjjKKEKEEEEEEEEEEEEEEEEEEEWEEEEKKEEEEEEEEEEEEEEEEEEWEKEEEEE
-ffffffffffffffffGDDDDDDDDDDDDDDDDDDDDEEffjjWEKKEKEEEEEEEEEEEEEEEEEWWEEEEE#EEEEEEEEEEEEEEEEEEWEEEEEEE
\ No newline at end of file
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/default.css 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,822 +1,463 @@
-/***
+/*
-New AguaPop theme for WebERP by Hindra Joshua
+New "AguaPop" Theme for WebERP
-Using new theming support any without background images
+v2, 2012-08-03
-****/
+by Hindra Joshua
+*/
+
body {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 8pt;
-/* color:white;*/
- background: silver;
- margin:0;
- padding:0;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+background: silver;
+margin:0;
+padding:0;
}
-img {
- vertical-align:middle;
-}
-/*a {
- color: blue;
- text-decoration: none;
-}
-a:hover {
- color: lightblue;
- text-decoration: none;
-}*/
-table {
- background-color: none;
- margin: 0 auto;
- width:90%
-}
+/* default styles */
-
-/*** CANVAS ************************************************************/
-
-#CanvasDiv {
- background:steelblue;
- margin:10px;
- border:thick outset steelblue;
- border-radius:20px;
+a{
+color:blue;
+text-decoration:none;
}
-
-/*** HEADER ************************************************************/
-
-#HeaderDiv {
- padding:2px;
- color:white;
+a:hover{
+color:red;
+text-decoration:underline;
}
-#HeaderDiv a{
- color:white;
- text-decoration:none;
- border:2px inset transparent;
- border-radius:10px;
- padding:3px;
+a:active{
}
-#HeaderDiv a:hover{
- color:cyan;
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
-}
-#HeaderWrapDiv{
-}
-#AppInfoDiv{
- float:left;
-}
-#AppInfoCompanyDiv{
- float:left;
-}
-#AppInfoUserDiv{
- float:left;
-}
-#AppInfoModuleDiv{
- font-weight:bold;
- font-size:10pt;
-}
-/*** Quick Menu ***/
-
-#QuickMenuDiv{
- float:right;
+img{ /* icon on page title, etc */
+border:none;
+vertical-align:middle;
}
-#QuickMenuDiv ul{
- list-style:none;
- float:right;
-}
-#QuickMenuDiv ul li{
- display:inline;
- margin: 0px 3px;
- float: left;
-}
-/*** BODY **************************************************************/
-
-#BodyDiv {
- clear:both;
+p{ /* some text need to be centered */
+/*text-align:center;*/
}
-
-#BodyWrapDiv{
- background:lightsteelblue;
- margin:5px;
+p.page_title_text { /* page title */
+color:black;
+font-weight:bold;
+margin:0 auto;
+padding:5px;
+text-align:center;
}
-
-/*** MAIN MENU ***/
-
-#MainMenuDiv{
- float:left;
- width:10%;
- white-space:nowrap;
- text-align:center;
- padding:3px;
+p.good {
+font-weight: bold;
+color: green;
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
+p.bad {
+font-weight: bold;
+color:red;
}
-#MainMenuDiv li{
- list-style:none;
-}
-#MainMenuDiv li a:link, a:visited{
- color:white;
- text-decoration:none;
-}
-#MainMenuDiv li a:hover{
- color:cyan;
-}
-.main_menu_unselected {
- border:2px inset transparent;
- border-radius:10px;
- padding:3px;
-}
-.main_menu_unselected:hover{
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
-}
-.main_menu_unselected a{
-}
-.main_menu_unselected a:hover{
-}
-.main_menu_selected {
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
+table {
+width:auto;
+max-width:90%;
+margin:5px auto;
+padding-bottom:5px;
}
-.main_menu_selected:hover{
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
+table.selection {
+width:auto;
+max-width:90%;
+/*padding-bottom:5px;*/
}
-.main_menu_selected a{
+th {
+background-color:skyblue;
+color:black;
+font-weight:normal;
+padding:3px;
}
-.main_menu_selected a:hover{
+th.number {
+text-align: right;
+font-weight: normal;
+background-color: skyblue;
+color: white;
}
-/*********************************************/
-#SubMenuDiv{
- float:right;
- margin:0;
- padding:0;
- overflow: hidden;
- width: 87%;
+td {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+text-align: left;
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+td.select {
+background-color: whitesmoke;
+padding:3px;
}
-#SubMenuDiv li{
- list-style:none;
+td.number {
+text-align: right;
}
-#SubMenuDiv a{
- color:black;
- text-decoration:none;
-}
-#SubMenuDiv a:hover{
- color:blue;
- text-decoration:none;
-}
-#TransactionsDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-#InquiriesDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-#MaintenanceDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-.menu_group_headers {
- background:steelblue;
- border:thin outset steelblue;
- padding:3px;
- text-align:center;
- color:white;
-}
-.menu_group_headers table{
-}
-.menu_group_img {
- background-color: gainsboro;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
-.menu_group_img img{
- position: relative;
- top: 10px;
+div.centre {
+padding:5px;
+text-align:center;
}
-.menu_group_area {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- border-top: 0px;
- margin-top: 0px;
- padding-top: 0px; /*this creates the border*/
- color: seagreen;
+input { /*specifies the input field text characteristics*/
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 9px;
+font-style: italic;
}
-
-.blank_area table {
- border: 0px;
- width: 100%;
+input.number{
+text-align: right;
}
-
-
-
-.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: white;
+input.image {
+border-width: 0px;
+background-color: transparent;
}
-
-.menu_group_items {
- vertical-align: top;
- background-color: white;
- font-weight: bold;
- padding: 15px;
- border: 1px inset steelblue;
+input:hover{
+background:#9ffffb;
}
-.menu_group_item {
- padding:3px;
+select {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 11px;
}
-.menu_group_item:hover{
- background:lightblue;
+select:hover { /* drop down */
+background:#9ffffb;
}
-.menu_group_item p {
- color: steelblue; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px;
+textarea{
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 10px;
}
-/*** FOOTER ************************************************************/
-#FooterDiv{
- clear:both;
- color:black;
- height:52px;
+textarea:hover{
+background:#9ffffb;
}
-#FooterWrapDiv{
- padding:5px;
-}
-#FooterLogoDiv{
- background:white;
- border:2px outset sandybrown;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-
-/************************************************************************/
-
-
-.dpTbl {
- border: solid navy 1px;
-}
-
-div.centre {
- padding-bottom:5px;
- text-align:center;
-}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- text-align: left;
-}
-
-td.select {
- background-color: whitesmoke;
- padding:3px;
-}
-
-table.selection {
- background:whitesmoke;
- border:2px inset whitesmoke;
- padding:0;
- width:90%;
-}
-
-.dpTD {
- border: 0;
- width: 20px;
- background-color: whitesmoke;
- text-align: right;
- cursor: pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width: 20px;
- background-color: yellow;
- text-align: right;
- cursor: pointer;
-}
-
-.dpTDHover {
- border: 0;
- width: 20px;
- background-color: gainsboro;
- text-align: right;
- cursor: pointer;
-}
-
-td.number {
- text-align: right;
-}
-
.EvenTableRows {
- background-color: gainsboro;
+background-color: gainsboro;
}
-
.OddTableRows {
- background-color: whitesmoke;
+background-color: whitesmoke;
}
-th {
- background-color:skyblue;
- color:black;
- font-weight:normal;
- padding:3px;
+div{ /* some input/buttons need to be centered */
}
-
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: skyblue;
- color: white;
-}
-
div.error {
- background-color: mistyrose;
- width: 98%;
- margin: 5px auto;
- color: red;
- border: 1px solid red;
+background-color: mistyrose;
+width: 98%;
+margin: 5px auto;
+color: red;
+border: 1px solid red;
}
-
div.warn {
- background-color: pink;
- width: 98%;
- margin: 5px auto;
- color: maroon;
- border: 1px solid maroon;
+background-color: pink;
+width: 98%;
+margin: 5px auto;
+color: maroon;
+border: 1px solid maroon;
}
-
div.success {
- background-color: aquamarine;
- width: 98%;
- margin: 5px auto;
- color: green;
- border: 1px solid green;
+background-color: aquamarine;
+width: 98%;
+margin: 5px auto;
+color: green;
+border: 1px solid green;
}
-
div.info {
- background-color: lightskyblue;
- width: 98%;
- margin: 5px auto;
- color:navy;
- border: 1px solid navy;
+background-color: lightskyblue;
+width: 98%;
+margin: 5px auto;
+color:navy;
+border: 1px solid navy;
}
-
-input { /*specifies the input field text characteristics*/
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- font-style: italic;
+DIV.page_help_text {
+background: lightgrey url(images/help.png) top left no-repeat;
+border: maroon 1px solid;
+padding-top:2px;
+padding-bottom: 2px;
+z-index: 1;
+width: 80%;
+float: none;
+visibility: visible;
+margin: 0 auto;
+position: static;
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-weight: normal;
+font-size: 10px;
+color: black;
+text-align:center;
+padding-left: 24px;
+min-height:26px;
}
-input.number{
- text-align: right;
+/* date picker */
+.dpTbl {
+ border: solid navy 1px;
+ background:white;
}
-
-input.image {
- border-width: 0px;
- background-color: transparent;
+.dpTD {
+border: 0;
+width: 20px;
+background-color: whitesmoke;
+text-align: right;
+cursor: pointer;
}
-
-input:hover{
+.dpDayHighlight {
+border: 0;
+width: 20px;
+background-color: yellow;
+text-align: right;
+cursor: pointer;
}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 11px;
+.dpTDHover {
+border: 0;
+width: 20px;
+background-color: gainsboro;
+text-align: right;
+cursor: pointer;
}
-p.good {
- font-weight: bold;
- color: green;
+/* Table type is used for UI tables type 1 */
+.table1 {
+width:90%;
+background: whitesmoke;
+border: 1px solid darkslategray;
+margin: 0 auto;
}
-
-p.bad {
- font-weight: bold;
- color:red;
+.tableheader {
+font-weight: normal;
+background-color: skyblue;
+color: white;
}
-
-#topMenu {
- width: 100%;
- color: black;
- background-color: whitesmoke;
- border: none;
- border-bottom: 1px solid gray;
+.notavailable {
+font-weight: lighter;
+font-style: italic;
+color: gray;
}
-
-#trim {
- background: gainsboro;
+.label {
+font-weight: bold;
+font-style: normal;
+font-size: 11px;
+color: black;
+background-color: gainsboro;
}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: 0px;
+.table_index {
+background-color: aliceblue;
}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
+li {
+/*list-style-image: url(bullet.gif);*/
}
-#mainMenu {
- width: 100%;
- color: white;
- background-color: whitesmoke;
- border: none;
- margin: 0px;
- padding: 0px;
-}
+/* CANVAS */
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
+#CanvasDiv {
+background:steelblue;
+border-radius:20px;
+box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+margin:10px;
}
-.login {
- background-color: white;
- border: none;
-}
+/* HEADER */
-textarea {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
+#HeaderDiv {
+overflow:hidden;
+color:white;
+padding:5px 10px 0;
}
-
-textarea:hover {
+#HeaderDiv a{
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
}
-/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: whitesmoke;
- border: 1px solid darkslategray;
- margin: 0 auto;
+#HeaderDiv a:hover{
+color:cyan;
+border-radius:10px;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+padding:3px;
}
-
-input.address3 {
- text-transform: uppercase;
+#HeaderWrapDiv{
}
-div.csv {
- background: silver;
- color: black;
- border: 1px solid black;
- padding-left: 3px;
- z-index: 1;
- width: 50%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- text-align: center;
-}
+/* HEADER - APP INFO */
-.callout_main {
+#AppInfoDiv{
+float:left; /* REQUIRED: to the left */
}
-
-.main_page {
- background: lightsteelblue;
- border: none;
- width: 932px;
- margin: 0 auto;
- padding: 0px;
- font-size: 10px;
+#AppInfoCompanyDiv{
+display:table-cell; /* REQUIRED: as a cell */
}
-
-/* Main page heading with quick menu within */
-.quick_menu {
- width:930px;
+#AppInfoUserDiv{
+display:table-cell; /* REQUIRED: as a cell */
+padding-left:5px;
}
-
-#quick_menu{
+#AppInfoModuleDiv{
+font-weight:bold;
+font-size:12px;
+padding:3px;
}
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- color: white;
- white-space: nowrap;
-}
+/* HEADER - QUICK MENU */
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- white-space: nowrap;
- vertical-align: bottom;
+#QuickMenuDiv{
+float:right;
+margin-top:7px;
}
-
-.quick_menu_tab{/*borders will work here*/
- background: url(images/tab_bg.png) top left no-repeat steelblue;
- white-space: nowrap;
- padding: 6px;
- padding-top: 4px;
- padding-bottom: 0px;
+#QuickMenuDiv ul{
+list-style:none;
+float:right;
}
-
-.quick_menu_tab a{
- color: white;
- font-size: 12px;
- text-decoration: none;
+#QuickMenuDiv ul li{
+float: left;
+display:inline;
+margin: 0px 3px;
}
-.quick_menu_left a{
- color: white;
-}
+/* BODY */
-.quick_menu_tab a:hover{
- color: lightsteelblue;
- text-decoration: none;
- font-weight: bold;
+#BodyDiv {
+clear:both;
+overflow:hidden;
+text-align:center; /* needed to center some buttons on SelectSupplier.php */
}
-
-.quick_menu_left a:hover{
- color: lightsteelblue;
- text-decoration: none;
+#BodyWrapDiv{
+background:lightsteelblue;
+box-shadow:2px 2px 3px inset;
+margin:0 5px;
}
-.quick_menu_tab:hover{
- color: red;
-}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin:0 6px 0 6px;
- padding: 0px;
- text-align: center;
-}
+/* BODY - MAIN MENU */
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+#MainMenuDiv{
+float:left;
+background:steelblue;
+white-space:nowrap;
+text-align:center;
+padding-left:3px;
+padding-top:3px;
+width:11%;
}
-
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+#MainMenuDiv ul{
+margin:0;
+padding:0;
}
-
-.main_area {
- width: 100%;
- background-color: white;
+#MainMenuDiv li{
+list-style:none;
}
-
-.main_menu {
- background-color: white;
- margin: 2px 0 0 6px;
- font-weight: normal;
- width: 110px;
+#MainMenuDiv li a,
+#MainMenuDiv li a:hover,
+#MainMenuDiv .main_menu_selected a{
+display:block; /* REQUIRED */
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+margin-bottom:5px;
}
-
-.main_menu table {
- border-top: 0px;
- width: 100%;
- margin: 2px;
+#MainMenuDiv li a:hover{
+color:cyan;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: gray;
- text-decoration: none;
- white-space: nowrap;
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
-.main_menu a {
- color: white;
- font-weight: bold;
- font-size: 11px;
- text-decoration: none;
- white-space: nowrap;
-}
+/* BODY - SUB MENU */
-.main_menu a:hover {
- color: lightsteelblue;
+#SubMenuDiv{
+display:table; /* display as table, sub menu will auto adjust width */
+float:right;
+overflow: hidden;
+margin-left:auto;
+margin-right:auto;
+width:88%; /* main menu is 10% */
+text-align:left;
}
-
-
-
-.page_title_text {
- font-weight:bold;
- text-align:center;
- padding-top:5px;
+#SubMenuDiv ul{
+margin:0;
+padding:0;
}
-
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- border: maroon 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- padding-left: 10px;
- z-index: 1;
- width: 80%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- text-align:center;
+#SubMenuDiv li{
+list-style:none; /* REQUIRED: hide bullets */
}
-
-DIV.system_check {
- border: 1px solid maroon;
- padding-left: 3px;
- z-index: 1;
- width: 40%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- background: silver;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- text-align:left;
+#SubMenuDiv p{
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: gray;
- text-decoration: none;
+#SubMenuDiv a{
+color:black;
+text-decoration:none;
}
-
-.menu_group_item a {
- font-size: 11px;
- font-weight: normal;
+#SubMenuDiv a:hover{
+color:black;
+text-decoration:underline;
}
-.menu_group_items a:hover {
- color: navy;
- text-decoration: underline;
+.menu_group_headers {
+background:steelblue;
+border:2px outset white;
+color:white;
+font-weight:bold;
+text-align:center;
+padding:3px;
}
-#footer {
-
+.menu_group_item {
+padding:2px;
+text-align:left;
}
-
-a.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: black;
- font-weight: normal;
- font-size: 8px;
+.menu_group_item:hover{
+background:lightblue;
+text-align:left;
}
-.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: gainsboro;
- font-weight: normal;
- font-size: 9px;
- text-align: center;
+.menu_group_item p { /* bullet */
+color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+margin: 0 0 0 12px;
+text-align:left;
}
-
-.legal {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: dimgray;
+.menu_group_item a{
+color:black;
+text-decoration:none;
}
-
-.box1 {
- border-color: gainsboro dimgray dimgray gainsboro;
- border-width: medium;
- border-style: ridge;
+.menu_group_item a:hover{
+color:red;
+text-decoration:none;
}
-.promo {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: red;
+#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
+background:whitesmoke;
+border:2px solid steelblue;
+display:table-cell;
}
-
-.titlebar {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: white;
- background-color: silver;
+#InquiriesDiv div{ /* to center custom report/form header */
+background:lightsteelblue;
+font-weight:bold;
+color:black;
+padding:2px;
}
-.dingbat {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- background-color: darkseagreen;
- color: seagreen;
- font-weight: bolder;
- font-size: medium;
-}
+/*** FOOTER ***/
-input.big {
- width: 100px;
+#FooterDiv{
+clear:both;
+color:white;
+height:53px;
+padding:0;
}
-
-input.small {
- width: 50px;
+#FooterWrapDiv{
+padding:5px;
}
-
-input.inputerror {
- background-color: mistyrose;
+#FooterLogoDiv{
+background:white;
+border:2px outset steelblue;
+border-radius:8px 8px 8px 8px;
+float:left;
+padding:3px;
}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
-textarea.texterror {
- background-color: mistyrose;
}
-
-select.selecterror {
- background-color: mistyrose;
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
}
-.tableheader {
- font-weight: normal;
- background-color: skyblue;
- color: white;
-}
-
-.notavailable {
- font-weight: lighter;
- font-style: italic;
- color: gray;
-}
-
-.label {
- font-weight: bold;
- font-style: normal;
- font-size: 11px;
- color: black;
- background-color: gainsboro;
-}
-
-.OsRow {
- background-color: midnightblue;
- color: white;
-}
-
-.table_index {
- background-color: aliceblue;
-}
-
-li {
- list-style-image: url(bullet.gif);
-}
+/**** END ***/
\ No newline at end of file
Deleted: trunk/css/aguapop/default.css_large
===================================================================
--- trunk/css/aguapop/default.css_large 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/default.css_large 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,720 +0,0 @@
-/*--------------------------------------------------\
-| | | default.css |
-|---------------------------------------------------|
-| For use with: |
-| Web-ERP - http://web-erp.sourceforge.net |
-| by Log...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-06 10:44:25
|
Revision: 5587
http://web-erp.svn.sourceforge.net/web-erp/?rev=5587&view=rev
Author: daintree
Date: 2012-08-06 10:44:17 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
Hindra: fixes to aguapop
Modified Paths:
--------------
trunk/css/aguapop/default.css
trunk/css/aguapop/login.css
trunk/includes/session.inc
Removed Paths:
-------------
trunk/css/aguapop/README.txt
trunk/css/aguapop/default.css_large
trunk/css/aguapop/footer.inc.NEW
Deleted: trunk/css/aguapop/README.txt
===================================================================
--- trunk/css/aguapop/README.txt 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/README.txt 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,87 +0,0 @@
-I hope you enjoy this theme.
-It had taken me WAY too long to do this, maybe it was worth it.
-Have fun!
-Fred Schuettler
-
-
-The 'footer.inc.NEW' file must be used with this theme to make the 'aguapop' theme look right.
-Just copy it to: ~/webERP/includes/ and then rename the existing footer.inc as a backup before renaming
-this 'footer.inc.NEW' to 'footer.inc'.
-
-It will not adversely affect any of the existing themes, but it most definately will be required.
-
-jjjjjtjjjjjjjjttttttttttttttjGGGDDDDEEDWGGGGGKDDEEEEEWGGGGGGGEDDEEEEEED#GGGGGGGEDDEDDWGGGGDtiitiiiii
-jjjjjjjjjjjjjjtttttttttttttttDGGGEEDEDDWGGGGGKDDEDDEEWGGGGGGGEDEEEEEEEDWGGGGGGEDEDEDDWGGGGGjtittiiii
-jjjjjjjjjjjjjjjtttttttttttttiKGGGKDDDDEKGGGGGEDDEEDEDKGGGGGGGKDDDEEEEEDKGGGGGGKDDDDEDEGGGGDttttttiti
-jjjjjjtjjjjjjjttttttttttttttiKGGLKDDDEEKGGGGGDDDEEEDEKGGGGGGGKDDEEEEEEDEGGGGGGWDDDDDDDGGGGEittttitti
-jjjjjjjjjjjjjjttttttttttttttifGGGGEDDDEEGGGGGGEEEEEEEEGGGGGGGEDDEEEEEEEDGGGGGGWEDDDEEGGGGGEittttttKK
-jjjjjjjjjjjjjjtttttttttttttttiGGLLKDDDEDGGGGGGKDEEEEEEDGGGGGGEDDEEEDDEKGGGGGGGWDDDDDWGGGGGKittitKKEK
-jjjjjjjjtjjjjttttttttttttttttiKLGGEDDDDDGGGGGGKDEEDEDDDGGGGGGDDDDDDEDEWGGGGGGGKDDDDDWGGGGGGttiDWDDDK
-jjjjjjjjjjjjjjtttttttttttttttitDGGLEEDDDEGGGGGKDDDDEDDEGGGGGGDDEEEDEDDWGGGGGGGEDDDDDEGGGGGjtfWEEDDKD
-jjjjjjjjjjjjjjtjttttttttttttttiELGGKDEDDKGGGGGDDEDDDDDKGGGGGGGDDDEEDEEKGGGGGGEDEDDDEGGGGGGiKKDEEEDED
-jjjjjjjjjjjjtttjjttttttttttttitiKLGLWDDDKGGGGGGKEEDDDDWGGGGGGGEDEDDDEDGGGGGGGWDDDEDKLGGGGDEEEEEEDEED
-jjjjjjjjjjjjjjjjttttttttttttttitiEGGDDDDDDGGGGGKDDDDDDWGGGGGGGEDDDDDEDGGGGGGGKEDDDDKGGGGGKEEEEEDWDDD
-tjjtjjjjjjjtjjjjtttttttttttttttiifGGGKDDDKGGGGGDDDDDDDELDLGGGLKDDDDDDEGGGGGGEDEEDDDKGGGGGKEEEEEWDEDE
-jjjjjjjjjjjtjjjjjjtttttttttttttiiiGLGGDDDELGGGGLEDDDDDEGEGGELGKDDDDDDKGGGGGGWEDEDDEDGGGGGEDEEEWEDDED
-tjjjjjtjjjjjttjjjjjjttttttttttttitiELGKDDDKKDGGLKDDDDDDK.:..ELKEDDDDDWGGGGDGKEDDDEKGGGGGEDEEEKDEDDED
-jjjjjjjjjjttttjjjtjtttttttttttiiiii;KGGDDW..:EGGEDDDDDW..tL:.tWDDDDDDWGGGGGKDDEDDDWGGGGGKDEEEEEEDDDD
-jjtjjjjjjjtjtjjjjjjjtttttttttttiiiii;KGKK:.:::LGLDDDDDf.Ei;f::,EDDEDDKGGGGGWDEDDEDKGGGGGEDEEKEEEDDDD
-jjjjjjjjjjtttjjjjjtjttjttttttitiiiiiiiELf,ttLi:LfKDDDK.E;i;iG;:;EEDDDDGGGGDEEDEEDEGGGGGDDEDWDDEDDDDD
-jjjjjjjjjjttjjjjjjttjttttttttttiiiiiii;D:,tiiij.EDDDGW:;;;;;ij;:tDDDELGGGGEDDEDDEKLGGGGKDEWEDEDDDDDD
-tjjjjjjjjjtttjjjjjjjtttttttttttiiiiiitiD.Gi;;;;t.EDDDLj,;i;;i;G::DW#WWWWWW#WWW######WWWWEEEDEDEEDDDD
-jjjjjjjjjjtjjjjtjjttttttttttittiiiiiiitiL,ii;i;,t.KKW:j,i;;i;iij:.KWWWWW#W##WWWWW#WWWW#DWEDDDDDDDDDD
-jjjjjjjjjjjjtjjtttttttitiiiiiiiiiiiiiiD.Dii;;;;;E:WK#:j;i;i;ii;if::KDEEEEWKKWWWWWKWWWWWKEEEEDDDDDDDD
-jjjjjjjjjjjttjtKEEEEEEEEKKEEEKKKKKKKKEELffLGLjt;..DGK ,,;;;;fGG:::.WGGGGGWDDDEDDWGGGGLWEEDDEDDDDDDDD
-tjjjjjjjjjtttjtDGGGGGGGGGGGDGGGGGGGGGGGGGGGGGDDEEEEEKKKKWKWG,.::.:GKGGGGLKEDDDDDKGGGGKDEDDEDDEDDDDDD
-jjjjjjjjjjtjtjtEGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGLGGDEEEEEDWGLWW#WW##W#WKKEEKEDDEEEDDDDDDDDD
-jjjjjjjjjttttjtDLGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGEEf;i;WWW#W##WW##W##EEDDEDDEEDDDDDDE
-jjjjjjjjjtjtttjtKGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGDWL:.iiiiiWWW##W#KWW###EEDEEEEDDDDDEEDDD
-jjjjjjjjjtttttttiEDGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGDWWK.::.iiiifWWW##D;i;#W#EEEDEEDEEEEEDDDDDD
-jjjjjjjjjttttttjtttEEGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGLDEEjfWWf::::;;iiiGWW#WKiitti#EDDDEEDDEDEEDDDDDDD
-jjjjjjjjjjjtjttttttttiiLEKEDGGGGGGGGGGGGGGGGGDKDWf;GiifWE::,LK,.jiitiWWWW#jit;ifDEDDEEEDEEDDEEDEDDED
-jjjjjjjjjtttttttitttttttiiitfGEKKKEEEEKKKKKEDDD:.jKLjKE,... KWWLitiiiWWW#WjiDiGEDDDDEEEDEEEEEEEEDDDE
-jjjjjjjjjttttjGKEKGtttttitiittttiiiKDDDDDDDDDDDK:.KWWtt:.:::WWGifiit;WWWWWf;jfDEDDDEEEEDDDEEEEDDEDED
-jjjjjjjjjtjtEEGGGGDGttttittttttttitiWGDDDDDDDDDDj.KWGiiGi:.:fjiGtitiiWWWWWjLiiEDEEDEEEEDEEEEEEEDEEDD
-jjjjjjjjjtjKGGDGGGDDitttitttttttttttiEDDDDDDKKGjjti;ittfitLLjLLiiiiifWWW##fLiiKDEEEDEEDEEEEEEEEDEDWK
-jjjjjjjjjtEGDDGDDGGGKtttKEKjttfLititiiGDDGKf;iiii;;iiiitji;t;;itiiiiDWWWWWfjitfDKEEEEEEEEEEEEEEDKWDE
-jjjjjjjjjfGGDDDDGDGGGEDKGGGDELGGKttttiifDEiiiiiiiiiiiiiiiDiiGDGjiiiiWWWWWWftit;K#DDEEEEEEEEEEEEWKDEE
-tjjjjjjjjEDDDGDKEGGDWDEGGGGDGDGGEtttttiiEiiiiiiiiiiitiititit;itjitiiWWWW##iiitiEKDDDEEEEEEEEEEKKDEEE
-jjjjjjjjtKDGGGKGDDGKGGKGGGGGKGGGLLtttiii;iiiiiiiiiiii;iiiL;ii;fiitttWWWDt;DjiiiKDDDEEEEEEEEEEKKEEEEE
-jjjjjjjjjEDGEKttitWGGGDGGGGDGGGGGWttttiDiiiiiiiiiiijtKWWj;iiiGGiiit;;;iiiiiifKGiDDEEEEEEEEEEWEEEEEEE
-jjjjjjjjjjKKjtttttKGGDGGGGKGGGGDGKttttjiiiiiiiiiiitifLLK#WDLiLfiiiiiiii;;tD#EtiiEEDEEEEEEEEEWEDEEEEE
-jjjjjjjjjjittttttjDGDEGGGDDGGGGKGDfttiEiiiiiiiiiiiiGijiiifD##WWWDEDDEEW#WDjiiiitWDDEEEEEEEEWEEEEEEEE
-jjjjjjjjjttttttttLGGEKGGGKGGGGDGGGGttiDtiiiiiiiiiiKii;DitiiG,i#jGLLLfji;;iiititiEDDDEEEEDEEWEEEEEEEE
-jjjjjjjjjtttttttjLGGGWGGGEGGGGKGGGDttiGtiiiiiiiiijEiiif;itE..WWiiiiiiiiiiiiiiiiitEEEEDEEEEEEEEEEEEEE
-jjjjjjjjjttttttjtGGGGWGDEGGGGGGGGGEtiiDtititiiitjKKiiiiDE;:iWWKiiiiiiiiiiiitiiti;WDDEEEEEEWEEEEEEEEE
-jjjjjjjttttttttjjfDGGKKGKGGGGKGGGGELK##iiiititiLfLEiiiiiiLGWWWGtiiiiiiiiijtiiittiGDDEEEEEEWEEEEEEEEE
-jjjjjjjjtjttjtjttjEGGKGWKGGGKGGGDKWWDjtjiiiitiEtttEiiiiiiDWWWWtiiiiiiiiitEEKWKGti;KDEEEEEEKEEEEEEEEE
-jfjjjjjjtttjtjjjjtWGGGKGDWWWEKWWEGKittiLiiiiLDitttWiiiitiWWWW#itiiiiiiiifDDEEDEEWE#EEEEEEEKEEEEEEEEE
-jfjjjjjjjtttttjjjtGEGEEDEKGDKDGGGGKttiiiEEEDtttttiEiijtiKKWWWGiiiiiiiiiiDDEEEEEEEDEEEEEEEEEEEEEEEEEE
-jfjjjjjjjtjjtjjjtjjttDDDGGGGGLEKGGKttttittttitttfEWiiG:f:. iGiiiiiiiiiiiWDEEEEEEEDDEEEEEEEEEEEEEEEEE
-jfjjjjjjjtjjtjjtjtttfGGGEGGGDGKGDGKtttttttttttitWDKEEEjf,,fDiiiiiiiiiiiiKDEEEEEEEEDEEEEEEEKEEEEEEEEE
-jfjjjjjjjjjjtjjjjtttGGGGEGGGGGGGGGKtttttttttttiWDDEDt;iittiiiiiiiiiiiiiiDEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjttjjjjjjttGGGGGKGGGGGGGGKtttttttttttGEDDGDiiiiiiiiiiiiiiiititEDEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjjtjjjjtjttjGGGGGKGGGGGGGEtttjtitLGDDWKKEtDtttiitiiiiiitiiititWDEEEEEEEEEEEEEEEEE#EEEEEEEEE
-jjjjjjjjjjjtjjjjjjtjtWGGGGDDDGGGDGEjtttjEftiiiiiiitDitiiitiiiiiiitttttWWEEEEEEEEEEEEEEEEEEWEEEEEEEEE
-jjjjjjjjjjjtjjjjjjjttjKGGGGKGGDGKGEjttiWttttttiiiiiDitttiiiiiiitiititjDWEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-jfjjjjjjjjjjjjjjjjjtttKEGGGLKDEKDGDfttjftttttttiiiiitiiiiiiititttiitiWEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjttKGGGGDGDGGGDGGttfttttttiiiiiitittttiiiiiittttiWEKEEEEEEEEEEEEEEEEEEEEKEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjjDGDGDGDGGGGGGLEtjjLttttttiitiititttttiitttttiKEEE#EEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-jjjjjjjjjjjjjjjjjjjtjKGGGGGGGGGGGGGKjjtWttttttttttittttttttittttiWEEEEWEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-jjjjjjjjjjjjjjjjjjjjfEDGGGGGGGGGGGGWjttftttttttttiitttttttttittiWEEEEEKEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-jjjjjjjjjjjjjjjjjjjjDGGGGGGGGGGGGGGWjjjtGttttttttttttttttttttifWDEEEEEDDEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-jfjjjjjjjjjjjjjjjjjjKDGGGGGGGGGGGGGWjjttGfttttttttttttttttttiKKEEEEEEKEEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-ffjjjjjffjjjjjjjjjjjKGGGGGGGGDGDGGDKjjtjtLDittttttttttttttifWEEEEEEEE#EEEEEEEEEEEEEEEEEEEEE#EEEEEEEE
-ffjfjjjfjjjjjjjjjjjjGDGGGGGGGGGGGDGEjjjttttKEjttttttttijLKWEWEEEEEEEEWEEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-ffjfjjjfjjjfjjjjjjjfGGDDDGDGGGGGGGDDLjjjjjjttfEWEDDEEWWEEEEEEWEEEEEEWEEEEEEEEEEEEEEEEEEEEEEWEEEEEEEE
-ffjfjjfjjjjjjjjjjjjEGDGDGGDGGGGGGGDGDjjjjttjjtjttittLKEEEEEEEEWEEEEE#EEE#KWEEEEEEEEEEEEEEEEKEEEEEEEE
-ffffjfffjjjjjjjjjjtWDDGDDDDGGGGGGGDGKjjjjtjjjjjtjjjjWEEEEEEEEEKKEEEEWEEWGDDKEEEEEEEEEEEEEEEKEEEEEEEE
-fffffffffjjjjjjjjjLEDDGDDDDDDDGDDDDDWjjjjjjjjjjjjjDKEEEEEEEEEEEWEEEEEWEEGDGWEEEEEEEEEEEEEEEKKEEEEEEE
-fffffffffjjfjjjjjjEGDDGDDDDDDDGDDDDDKjjjjjjjjjjjjtKEEEEEEEEEEKED#EEEEEEWEEWEEEEEEEEEEEEEEEEEKEEEEEEE
-ffffffjffffjjjjjjjWDDDDDDDDDDDDDDDDDEfjjjjjjjjjjt#EEEEEEEEEEEEEEKEEEEEWEEEEEEEEEEEEEEEEEEEEEKEEEEEEE
-ffffffffjfffjjjfjjWDDDDDDDDDDDDDDDGDDLjjjjjjjjjj#EEEEEEEEEEEEEEEE#EEEEWEEEEEEEEEEEEEEEEEEEEEWEEEEEEE
-fffffffffffffffffLDDDDDDDDDDDDDDDDDDDDjjjjjjjjjWEEEEEEEEEEEEEEEEEKEEEEE#EKEEEEEEEEEEEEEEEEEEWEEEEEEE
-fffffffffffffffffKDDDDDDDDDDDDDDDDDDDWjjjjjjjjKKKEEEEEEEEEEEEEEEEE#EEEEKKEEEEEEEEEEEEEEEEEEEWKEEEEEE
-fffffffffffffffjfWDDDDDDDDDDDDDDDDDDDWjjjjjjjWKKKEEEEEEEEEEEEEEEEEWEEEEE#EEEEEEEEEEEEEEEEEEEWEKEEEEE
-fffffffffffffffffKDDDDDDDDDDDDDDDDDDDDLjjjjjKKEKEEEEEEEEEEEEEEEEEEEWEEEEKKEEEEEEEEEEEEEEEEEEWEKEEEEE
-ffffffffffffffffGDDDDDDDDDDDDDDDDDDDDEEffjjWEKKEKEEEEEEEEEEEEEEEEEWWEEEEE#EEEEEEEEEEEEEEEEEEWEEEEEEE
\ No newline at end of file
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/default.css 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,822 +1,463 @@
-/***
+/*
-New AguaPop theme for WebERP by Hindra Joshua
+New "AguaPop" Theme for WebERP
-Using new theming support any without background images
+v2, 2012-08-03
-****/
+by Hindra Joshua
+*/
+
body {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 8pt;
-/* color:white;*/
- background: silver;
- margin:0;
- padding:0;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+background: silver;
+margin:0;
+padding:0;
}
-img {
- vertical-align:middle;
-}
-/*a {
- color: blue;
- text-decoration: none;
-}
-a:hover {
- color: lightblue;
- text-decoration: none;
-}*/
-table {
- background-color: none;
- margin: 0 auto;
- width:90%
-}
+/* default styles */
-
-/*** CANVAS ************************************************************/
-
-#CanvasDiv {
- background:steelblue;
- margin:10px;
- border:thick outset steelblue;
- border-radius:20px;
+a{
+color:blue;
+text-decoration:none;
}
-
-/*** HEADER ************************************************************/
-
-#HeaderDiv {
- padding:2px;
- color:white;
+a:hover{
+color:red;
+text-decoration:underline;
}
-#HeaderDiv a{
- color:white;
- text-decoration:none;
- border:2px inset transparent;
- border-radius:10px;
- padding:3px;
+a:active{
}
-#HeaderDiv a:hover{
- color:cyan;
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
-}
-#HeaderWrapDiv{
-}
-#AppInfoDiv{
- float:left;
-}
-#AppInfoCompanyDiv{
- float:left;
-}
-#AppInfoUserDiv{
- float:left;
-}
-#AppInfoModuleDiv{
- font-weight:bold;
- font-size:10pt;
-}
-/*** Quick Menu ***/
-
-#QuickMenuDiv{
- float:right;
+img{ /* icon on page title, etc */
+border:none;
+vertical-align:middle;
}
-#QuickMenuDiv ul{
- list-style:none;
- float:right;
-}
-#QuickMenuDiv ul li{
- display:inline;
- margin: 0px 3px;
- float: left;
-}
-/*** BODY **************************************************************/
-
-#BodyDiv {
- clear:both;
+p{ /* some text need to be centered */
+/*text-align:center;*/
}
-
-#BodyWrapDiv{
- background:lightsteelblue;
- margin:5px;
+p.page_title_text { /* page title */
+color:black;
+font-weight:bold;
+margin:0 auto;
+padding:5px;
+text-align:center;
}
-
-/*** MAIN MENU ***/
-
-#MainMenuDiv{
- float:left;
- width:10%;
- white-space:nowrap;
- text-align:center;
- padding:3px;
+p.good {
+font-weight: bold;
+color: green;
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
+p.bad {
+font-weight: bold;
+color:red;
}
-#MainMenuDiv li{
- list-style:none;
-}
-#MainMenuDiv li a:link, a:visited{
- color:white;
- text-decoration:none;
-}
-#MainMenuDiv li a:hover{
- color:cyan;
-}
-.main_menu_unselected {
- border:2px inset transparent;
- border-radius:10px;
- padding:3px;
-}
-.main_menu_unselected:hover{
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
-}
-.main_menu_unselected a{
-}
-.main_menu_unselected a:hover{
-}
-.main_menu_selected {
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
+table {
+width:auto;
+max-width:90%;
+margin:5px auto;
+padding-bottom:5px;
}
-.main_menu_selected:hover{
- border:2px inset steelblue;
- border-radius:10px;
- padding:3px;
+table.selection {
+width:auto;
+max-width:90%;
+/*padding-bottom:5px;*/
}
-.main_menu_selected a{
+th {
+background-color:skyblue;
+color:black;
+font-weight:normal;
+padding:3px;
}
-.main_menu_selected a:hover{
+th.number {
+text-align: right;
+font-weight: normal;
+background-color: skyblue;
+color: white;
}
-/*********************************************/
-#SubMenuDiv{
- float:right;
- margin:0;
- padding:0;
- overflow: hidden;
- width: 87%;
+td {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+text-align: left;
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+td.select {
+background-color: whitesmoke;
+padding:3px;
}
-#SubMenuDiv li{
- list-style:none;
+td.number {
+text-align: right;
}
-#SubMenuDiv a{
- color:black;
- text-decoration:none;
-}
-#SubMenuDiv a:hover{
- color:blue;
- text-decoration:none;
-}
-#TransactionsDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-#InquiriesDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-#MaintenanceDiv{
- background:whitesmoke;
- border:thin inset whitesmoke;
- float:left;
- list-style:none;
- width:32%;
- padding:0px;
-}
-.menu_group_headers {
- background:steelblue;
- border:thin outset steelblue;
- padding:3px;
- text-align:center;
- color:white;
-}
-.menu_group_headers table{
-}
-.menu_group_img {
- background-color: gainsboro;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
-.menu_group_img img{
- position: relative;
- top: 10px;
+div.centre {
+padding:5px;
+text-align:center;
}
-.menu_group_area {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- border-top: 0px;
- margin-top: 0px;
- padding-top: 0px; /*this creates the border*/
- color: seagreen;
+input { /*specifies the input field text characteristics*/
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 9px;
+font-style: italic;
}
-
-.blank_area table {
- border: 0px;
- width: 100%;
+input.number{
+text-align: right;
}
-
-
-
-.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: white;
+input.image {
+border-width: 0px;
+background-color: transparent;
}
-
-.menu_group_items {
- vertical-align: top;
- background-color: white;
- font-weight: bold;
- padding: 15px;
- border: 1px inset steelblue;
+input:hover{
+background:#9ffffb;
}
-.menu_group_item {
- padding:3px;
+select {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 11px;
}
-.menu_group_item:hover{
- background:lightblue;
+select:hover { /* drop down */
+background:#9ffffb;
}
-.menu_group_item p {
- color: steelblue; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px;
+textarea{
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 10px;
}
-/*** FOOTER ************************************************************/
-#FooterDiv{
- clear:both;
- color:black;
- height:52px;
+textarea:hover{
+background:#9ffffb;
}
-#FooterWrapDiv{
- padding:5px;
-}
-#FooterLogoDiv{
- background:white;
- border:2px outset sandybrown;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-
-/************************************************************************/
-
-
-.dpTbl {
- border: solid navy 1px;
-}
-
-div.centre {
- padding-bottom:5px;
- text-align:center;
-}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- text-align: left;
-}
-
-td.select {
- background-color: whitesmoke;
- padding:3px;
-}
-
-table.selection {
- background:whitesmoke;
- border:2px inset whitesmoke;
- padding:0;
- width:90%;
-}
-
-.dpTD {
- border: 0;
- width: 20px;
- background-color: whitesmoke;
- text-align: right;
- cursor: pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width: 20px;
- background-color: yellow;
- text-align: right;
- cursor: pointer;
-}
-
-.dpTDHover {
- border: 0;
- width: 20px;
- background-color: gainsboro;
- text-align: right;
- cursor: pointer;
-}
-
-td.number {
- text-align: right;
-}
-
.EvenTableRows {
- background-color: gainsboro;
+background-color: gainsboro;
}
-
.OddTableRows {
- background-color: whitesmoke;
+background-color: whitesmoke;
}
-th {
- background-color:skyblue;
- color:black;
- font-weight:normal;
- padding:3px;
+div{ /* some input/buttons need to be centered */
}
-
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: skyblue;
- color: white;
-}
-
div.error {
- background-color: mistyrose;
- width: 98%;
- margin: 5px auto;
- color: red;
- border: 1px solid red;
+background-color: mistyrose;
+width: 98%;
+margin: 5px auto;
+color: red;
+border: 1px solid red;
}
-
div.warn {
- background-color: pink;
- width: 98%;
- margin: 5px auto;
- color: maroon;
- border: 1px solid maroon;
+background-color: pink;
+width: 98%;
+margin: 5px auto;
+color: maroon;
+border: 1px solid maroon;
}
-
div.success {
- background-color: aquamarine;
- width: 98%;
- margin: 5px auto;
- color: green;
- border: 1px solid green;
+background-color: aquamarine;
+width: 98%;
+margin: 5px auto;
+color: green;
+border: 1px solid green;
}
-
div.info {
- background-color: lightskyblue;
- width: 98%;
- margin: 5px auto;
- color:navy;
- border: 1px solid navy;
+background-color: lightskyblue;
+width: 98%;
+margin: 5px auto;
+color:navy;
+border: 1px solid navy;
}
-
-input { /*specifies the input field text characteristics*/
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- font-style: italic;
+DIV.page_help_text {
+background: lightgrey url(images/help.png) top left no-repeat;
+border: maroon 1px solid;
+padding-top:2px;
+padding-bottom: 2px;
+z-index: 1;
+width: 80%;
+float: none;
+visibility: visible;
+margin: 0 auto;
+position: static;
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-weight: normal;
+font-size: 10px;
+color: black;
+text-align:center;
+padding-left: 24px;
+min-height:26px;
}
-input.number{
- text-align: right;
+/* date picker */
+.dpTbl {
+ border: solid navy 1px;
+ background:white;
}
-
-input.image {
- border-width: 0px;
- background-color: transparent;
+.dpTD {
+border: 0;
+width: 20px;
+background-color: whitesmoke;
+text-align: right;
+cursor: pointer;
}
-
-input:hover{
+.dpDayHighlight {
+border: 0;
+width: 20px;
+background-color: yellow;
+text-align: right;
+cursor: pointer;
}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 11px;
+.dpTDHover {
+border: 0;
+width: 20px;
+background-color: gainsboro;
+text-align: right;
+cursor: pointer;
}
-p.good {
- font-weight: bold;
- color: green;
+/* Table type is used for UI tables type 1 */
+.table1 {
+width:90%;
+background: whitesmoke;
+border: 1px solid darkslategray;
+margin: 0 auto;
}
-
-p.bad {
- font-weight: bold;
- color:red;
+.tableheader {
+font-weight: normal;
+background-color: skyblue;
+color: white;
}
-
-#topMenu {
- width: 100%;
- color: black;
- background-color: whitesmoke;
- border: none;
- border-bottom: 1px solid gray;
+.notavailable {
+font-weight: lighter;
+font-style: italic;
+color: gray;
}
-
-#trim {
- background: gainsboro;
+.label {
+font-weight: bold;
+font-style: normal;
+font-size: 11px;
+color: black;
+background-color: gainsboro;
}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: 0px;
+.table_index {
+background-color: aliceblue;
}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
+li {
+/*list-style-image: url(bullet.gif);*/
}
-#mainMenu {
- width: 100%;
- color: white;
- background-color: whitesmoke;
- border: none;
- margin: 0px;
- padding: 0px;
-}
+/* CANVAS */
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
+#CanvasDiv {
+background:steelblue;
+border-radius:20px;
+box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+margin:10px;
}
-.login {
- background-color: white;
- border: none;
-}
+/* HEADER */
-textarea {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
+#HeaderDiv {
+overflow:hidden;
+color:white;
+padding:5px 10px 0;
}
-
-textarea:hover {
+#HeaderDiv a{
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
}
-/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: whitesmoke;
- border: 1px solid darkslategray;
- margin: 0 auto;
+#HeaderDiv a:hover{
+color:cyan;
+border-radius:10px;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+padding:3px;
}
-
-input.address3 {
- text-transform: uppercase;
+#HeaderWrapDiv{
}
-div.csv {
- background: silver;
- color: black;
- border: 1px solid black;
- padding-left: 3px;
- z-index: 1;
- width: 50%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- text-align: center;
-}
+/* HEADER - APP INFO */
-.callout_main {
+#AppInfoDiv{
+float:left; /* REQUIRED: to the left */
}
-
-.main_page {
- background: lightsteelblue;
- border: none;
- width: 932px;
- margin: 0 auto;
- padding: 0px;
- font-size: 10px;
+#AppInfoCompanyDiv{
+display:table-cell; /* REQUIRED: as a cell */
}
-
-/* Main page heading with quick menu within */
-.quick_menu {
- width:930px;
+#AppInfoUserDiv{
+display:table-cell; /* REQUIRED: as a cell */
+padding-left:5px;
}
-
-#quick_menu{
+#AppInfoModuleDiv{
+font-weight:bold;
+font-size:12px;
+padding:3px;
}
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- color: white;
- white-space: nowrap;
-}
+/* HEADER - QUICK MENU */
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- white-space: nowrap;
- vertical-align: bottom;
+#QuickMenuDiv{
+float:right;
+margin-top:7px;
}
-
-.quick_menu_tab{/*borders will work here*/
- background: url(images/tab_bg.png) top left no-repeat steelblue;
- white-space: nowrap;
- padding: 6px;
- padding-top: 4px;
- padding-bottom: 0px;
+#QuickMenuDiv ul{
+list-style:none;
+float:right;
}
-
-.quick_menu_tab a{
- color: white;
- font-size: 12px;
- text-decoration: none;
+#QuickMenuDiv ul li{
+float: left;
+display:inline;
+margin: 0px 3px;
}
-.quick_menu_left a{
- color: white;
-}
+/* BODY */
-.quick_menu_tab a:hover{
- color: lightsteelblue;
- text-decoration: none;
- font-weight: bold;
+#BodyDiv {
+clear:both;
+overflow:hidden;
+text-align:center; /* needed to center some buttons on SelectSupplier.php */
}
-
-.quick_menu_left a:hover{
- color: lightsteelblue;
- text-decoration: none;
+#BodyWrapDiv{
+background:lightsteelblue;
+box-shadow:2px 2px 3px inset;
+margin:0 5px;
}
-.quick_menu_tab:hover{
- color: red;
-}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin:0 6px 0 6px;
- padding: 0px;
- text-align: center;
-}
+/* BODY - MAIN MENU */
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+#MainMenuDiv{
+float:left;
+background:steelblue;
+white-space:nowrap;
+text-align:center;
+padding-left:3px;
+padding-top:3px;
+width:11%;
}
-
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
+#MainMenuDiv ul{
+margin:0;
+padding:0;
}
-
-.main_area {
- width: 100%;
- background-color: white;
+#MainMenuDiv li{
+list-style:none;
}
-
-.main_menu {
- background-color: white;
- margin: 2px 0 0 6px;
- font-weight: normal;
- width: 110px;
+#MainMenuDiv li a,
+#MainMenuDiv li a:hover,
+#MainMenuDiv .main_menu_selected a{
+display:block; /* REQUIRED */
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+margin-bottom:5px;
}
-
-.main_menu table {
- border-top: 0px;
- width: 100%;
- margin: 2px;
+#MainMenuDiv li a:hover{
+color:cyan;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: gray;
- text-decoration: none;
- white-space: nowrap;
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
-.main_menu a {
- color: white;
- font-weight: bold;
- font-size: 11px;
- text-decoration: none;
- white-space: nowrap;
-}
+/* BODY - SUB MENU */
-.main_menu a:hover {
- color: lightsteelblue;
+#SubMenuDiv{
+display:table; /* display as table, sub menu will auto adjust width */
+float:right;
+overflow: hidden;
+margin-left:auto;
+margin-right:auto;
+width:88%; /* main menu is 10% */
+text-align:left;
}
-
-
-
-.page_title_text {
- font-weight:bold;
- text-align:center;
- padding-top:5px;
+#SubMenuDiv ul{
+margin:0;
+padding:0;
}
-
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- border: maroon 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- padding-left: 10px;
- z-index: 1;
- width: 80%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- text-align:center;
+#SubMenuDiv li{
+list-style:none; /* REQUIRED: hide bullets */
}
-
-DIV.system_check {
- border: 1px solid maroon;
- padding-left: 3px;
- z-index: 1;
- width: 40%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- background: silver;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- text-align:left;
+#SubMenuDiv p{
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: gray;
- text-decoration: none;
+#SubMenuDiv a{
+color:black;
+text-decoration:none;
}
-
-.menu_group_item a {
- font-size: 11px;
- font-weight: normal;
+#SubMenuDiv a:hover{
+color:black;
+text-decoration:underline;
}
-.menu_group_items a:hover {
- color: navy;
- text-decoration: underline;
+.menu_group_headers {
+background:steelblue;
+border:2px outset white;
+color:white;
+font-weight:bold;
+text-align:center;
+padding:3px;
}
-#footer {
-
+.menu_group_item {
+padding:2px;
+text-align:left;
}
-
-a.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: black;
- font-weight: normal;
- font-size: 8px;
+.menu_group_item:hover{
+background:lightblue;
+text-align:left;
}
-.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: gainsboro;
- font-weight: normal;
- font-size: 9px;
- text-align: center;
+.menu_group_item p { /* bullet */
+color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+margin: 0 0 0 12px;
+text-align:left;
}
-
-.legal {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: dimgray;
+.menu_group_item a{
+color:black;
+text-decoration:none;
}
-
-.box1 {
- border-color: gainsboro dimgray dimgray gainsboro;
- border-width: medium;
- border-style: ridge;
+.menu_group_item a:hover{
+color:red;
+text-decoration:none;
}
-.promo {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: red;
+#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
+background:whitesmoke;
+border:2px solid steelblue;
+display:table-cell;
}
-
-.titlebar {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: white;
- background-color: silver;
+#InquiriesDiv div{ /* to center custom report/form header */
+background:lightsteelblue;
+font-weight:bold;
+color:black;
+padding:2px;
}
-.dingbat {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- background-color: darkseagreen;
- color: seagreen;
- font-weight: bolder;
- font-size: medium;
-}
+/*** FOOTER ***/
-input.big {
- width: 100px;
+#FooterDiv{
+clear:both;
+color:white;
+height:53px;
+padding:0;
}
-
-input.small {
- width: 50px;
+#FooterWrapDiv{
+padding:5px;
}
-
-input.inputerror {
- background-color: mistyrose;
+#FooterLogoDiv{
+background:white;
+border:2px outset steelblue;
+border-radius:8px 8px 8px 8px;
+float:left;
+padding:3px;
}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
-textarea.texterror {
- background-color: mistyrose;
}
-
-select.selecterror {
- background-color: mistyrose;
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
}
-.tableheader {
- font-weight: normal;
- background-color: skyblue;
- color: white;
-}
-
-.notavailable {
- font-weight: lighter;
- font-style: italic;
- color: gray;
-}
-
-.label {
- font-weight: bold;
- font-style: normal;
- font-size: 11px;
- color: black;
- background-color: gainsboro;
-}
-
-.OsRow {
- background-color: midnightblue;
- color: white;
-}
-
-.table_index {
- background-color: aliceblue;
-}
-
-li {
- list-style-image: url(bullet.gif);
-}
+/**** END ***/
\ No newline at end of file
Deleted: trunk/css/aguapop/default.css_large
===================================================================
--- trunk/css/aguapop/default.css_large 2012-08-06 03:04:20 UTC (rev 5586)
+++ trunk/css/aguapop/default.css_large 2012-08-06 10:44:17 UTC (rev 5587)
@@ -1,720 +0,0 @@
-/*--------------------------------------------------\
-| | | default.css |
-|---------------------------------------------------|
-| For use with: |
-| Web-ERP - http://web-erp.sourceforge.net |
-| by Log...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-08 09:09:55
|
Revision: 5590
http://web-erp.svn.sourceforge.net/web-erp/?rev=5590&view=rev
Author: daintree
Date: 2012-08-08 09:09:46 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/css/aguapop/login.css
trunk/css/default/default.css
trunk/css/default/login.css
trunk/css/fresh/default.css
trunk/css/fresh/login.css
trunk/css/gel/default.css
trunk/css/gel/login.css
trunk/css/professional/default.css
trunk/css/professional/login.css
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/default.css
trunk/css/silverwolf/login.css
trunk/css/wood/default.css
trunk/css/wood/login.css
trunk/includes/session.inc
Modified: trunk/css/aguapop/login.css
===================================================================
--- trunk/css/aguapop/login.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/aguapop/login.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -80,3 +80,7 @@
width:50%;
box-shadow:3px 3px 4px black inset;
}
+
+#demo_text{
+ padding:10px;
+}
\ No newline at end of file
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/default/default.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -4,866 +4,421 @@
***/
-body {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- background-color: #CCCCDD;
- margin:0;
- padding:0
+body{
+background-color:#ccd;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+margin:0;
+padding:0
}
-img {
- border:none;
- vertical-align:middle;
+a{
+color:blue;
+text-decoration:none;
}
-
-/*links before selection */
-a {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- text-decoration: none;
- color: black;
+a:hover{
+color:blue;
+text-decoration:underline;
}
-/*links on any screen when mouse is hovering over them */
-a:hover {
- background:#fff;
- color: #2D8628;
- text-decoration: underline;
+img{
+border:none;
+vertical-align:middle;
}
-table {
- background-color: #587BA6;
- margin: 0 auto;
- width:100%;
+.page_title_text{
+padding:5px;
+font-weight:bold;
+color:black;
+TEXT-ALIGN:center;
}
-
-
-/*** CANVAS ***/
-
-#CanvasDiv {
+p.good{
+font-weight:bold;
+color:green;
}
-
-/*** HEADER ***/
-
-#HeaderDiv {
- color:white;
- background:#588BB6;
- overflow:hidden;
+p.bad{
+font-weight:bold;
+color:red;
}
-#HeaderDiv a{
- color:white;
+table{
+margin:0 auto;
+width:auto;
+max-width:90%;
+padding-bottom:5px;
}
-#HeaderDiv a:hover{
- color:black;
- background:white;
- text-decoration:underline;
+table.selection{
+padding-bottom:5px;
}
-#HeaderWrapDiv{
+th{
+font-weight:normal;
+background-color:#B06161;
+color:white;
}
-
-/*** HEADER - APP INFO ***/
-
-#AppInfoDiv{
- display:table;
- float:left;
- padding:
+th.number{
+text-align:right;
+font-weight:normal;
+background-color:#B06161;
+color:white;
}
-#AppInfoDiv img{
- vertical-align:middle;
+td{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+text-align:left;
}
-#AppInfoCompanyDiv{
- display:table-cell;
+td.select{
+background-color:#eee;
}
-#AppInfoUserDiv{
- display:table-cell;
+td.number{
+text-align:right;
}
-#AppInfoModuleDiv{
- display:table-row-group;
+div.centre{
+margin:0 auto;
+text-align:center;
+padding:5px;
}
-
-/*** HEADER - QUICK MENU ***/
-
-#QuickMenuDiv{
- float:right;
+input{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-#QuickMenuDiv ul{
+input.number{
+text-align:right;
}
-#QuickMenuDiv ul li{
- display:inline;
- border-left:thin ridge #588BB6;
- padding:10px;
+input.image{
+border-width:0px;
+background-color:transparent;
}
-
-/*** BODY ***/
-
-#BodyDiv {
- clear:both;
-/* margin-left:5px;
- margin-right:5px;*/
- color:black;
- background:#588BB6;
- overflow:hidden;
+input:hover{
}
-#BodyDiv table {
- width:90%;
- text-align:center;
+select{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-
-#BodyWrapDiv{
- background:#CCCCCC;
+textarea{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-
-/*** BODY - MAIN MENU ***/
-
-#MainMenuDiv{
- float:left;
- width:11%;
- white-space:nowrap;
- text-align:center;
- border:thin solid gray;
+textarea:hover{
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
+.EvenTableRows{
+background-color:#CCCCCC;
}
-#MainMenuDiv li{
- list-style:none;
+.OddTableRows{
+background-color:#EEEEEE;
}
-#MainMenuDiv li a:link, a:visited{
-/* color:black;
- font-weight:bold;*/
+div.error{
+background-color:#fddbdb;
+color:red;
+border:1px solid red;
}
-#MainMenuDiv li a:hover{
- color:black;
- background:white;
- text-decoration:underline;
+div.warn{
+background-color:#f5dbfd;
+color:maroon;
+border:1px solid maroon;
}
-
-.main_menu_unselected{
- background:#40FC40;
- padding:2px;
+div.success{
+background-color:#b9ecb4;
+color:darkgreen;
+border:1px solid darkgreen;
}
-.main_menu_unselected:hover{
- background:white;
+div.info{
+background-color:#c7ccf6;
+color:navy;
+border:1px solid navy;
}
-.main_menu_unselected a{
+DIV.page_help_text{
+background:lightgrey url(images/help.png) top left no-repeat;
+BORDER:#a52a2a 1px solid;
+padding-top:2px;
+padding-bottom:2px;
+PADDING-LEFT:10px;
+Z-INDEX:1;
+width:80%;
+FLOAT:none;
+VISIBILITY:visible;
+MARGIN:0 auto;
+POSITION:static;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-weight:normal;
+font-size:10px;
+color:black;
+TEXT-ALIGN:center;
}
-.main_menu_unselected a:hover{
+DIV.system_check{
+BORDER:#a52a2a 1px solid;
+PADDING-LEFT:3px;
+Z-INDEX:1;
+width:40%;
+FLOAT:none;
+VISIBILITY:visible;
+MARGIN:0 auto;
+POSITION:static;
+background:lightgray;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+padding-top:1px;
+padding-bottom:1px;
+font-weight:normal;
+font-size:10px;
+color:black;
+TEXT-ALIGN:left;
}
-.main_menu_selected {
- background-color: white;
- border:thin solid gray;
- font-weight: normal;
- text-align: center;
- white-space: nowrap;
- padding:2px;
-}
-.main_menu_selected:hover{
-}
-.main_menu_selected a{
-}
-.main_menu_selected a:hover{
-}
-/*** BODY - SUB MENU ***/
-
-#SubMenuDiv{
- display:table;
- float:right;
- overflow: hidden;
- min-width: 88%;
+.dpTbl { /* date picker background */
+border:thin solid black;
+background:white;
+box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+.dpTD{
+border:0;
+width:20px;
+background-color:#EEEEEE;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv li{
- list-style:none;
+.dpDayHighlight{
+border:0;
+width:20px;
+background-color:yellow;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv a{
+.dpTDHover{
+border:0;
+width:20px;
+background-color:#CCCCCC;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv a:hover{
- color:green;
- text-decoration:underline;
-}
-#TransactionsDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-#InquiriesDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-#MaintenanceDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-.menu_group_headers {
- text-align:center;
- color:black;
- background:#EEEEEE;
- border: thin outset #EEEEEE;
-}
-/*.menu_group_headers table{
-}*/
-/*.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: white;
-}
-*/
-/*.menu_group_items {
- background-color: white;
- font-weight: normal;
- padding: 15px;
- border-top: 0px #AAAAAA solid;
- border-left: 0px #AAAAAA solid;
- border-right: 0px white solid;
- border-bottom: 0px white solid;
-}*/
-.menu_group_item {
- background-color: white;
- padding:2px;
-}
-.menu_group_item p {
- color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
-}
-/*** FOOTER ***/
-
-#FooterDiv{
- clear:both;
- color:#CCCCCC;
- background:#588BB6;
- overflow:hidden;
-}
-#FooterWrapDiv{
- overflow:hidden;
- padding:5px;
-}
-#FooterLogoDiv{
- background:white;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-
-/*** MISC ***/
-
-div.centre {
- margin: 0 auto;
- text-align:center;
-}
-
-
-
-/*
-.dpTbl {
- border: solid navy 1px;
-}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- text-align: left;
-}
-
-td.select {
- background-color:#eee;
-}
-
-table.selection {
- background-color:#eee;
- outline-style:solid;
- outline-width:1px;
-}
-
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
-td.number {
- text-align: right;
-}
-
-.EvenTableRows {
- background-color: #CCCCCC;
-}
-
-.OddTableRows {
- background-color: #EEEEEE;
-}
-
-th {
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-
-div.info {
- background-color:#c7ccf6;
- color:navy;
- border: 1px solid navy;
-}
-
-input {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-input.number{
- text-align: right;
-}
-
-input.image {
- border-width:0px;
- background-color: transparent;
-}
-
-input:hover{
-}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-p.good {
- font-weight: bold;
- color: green;
-}
-
-p.bad {
- font-weight: bold;
- color:red;
-}
-
-#topMenu {
- width: 100%;
- color: black;
- background-color: #E2E9EB;
- border: none;
- border-bottom: 1px solid #999999;
-}
-
-#trim {
- background: #CCCCCC;
-}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: none;
-}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
-}
-
-#mainMenu {
- width: 100%;
- color: black;
- background-color: #E3EBE2;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.login {
- background-color: white;
- border: none;
-}
-
-textarea{
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-textarea:hover{
-}
/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.table1{
+width:90%;
+background:#eee;
+border:0px 0px 2px 2px #222 solid;
+margin:0 auto;
}
/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+/*.table2{
+width:90%;
+background:#eee;
+border:0px 0px 2px 2px #222 solid;
+margin:0 auto;
+}*/
-input.address3 {
- text-transform: uppercase;
+.tableheader{
+font-weight:normal;
+background-color:#800000;
+color:white;
}
-
-div.csv {
- background:lightgray;
- color: black;
- border: 1px solid black;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 50%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- TEXT-ALIGN:center;
+.notavailable{
+font-weight:lighter;
+font-style:italic;
+color:#555555;
}
-
-.callout_main {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
+.label{
+font-weight:bold;
+font-style:normal;
+font-size:12px;
+color:black;
+background-color:#cccccc;
}
-
-.main_page {
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
- font-size: 10px;
+.table_index{
+background-color:#F1FFDD;
}
-/* Main page heading with quick menu within */
-.quick_menu {
- width: 100%;
- background-color: #588BB6;
- border: none;
- margin: 0px;
- padding: 0px;
- color: black;
- border-top: 0px #AAAAAA solid;
- border-left: 0px #AAAAAA solid;
- border-right: 0px white solid;
- border-bottom: 0px white solid;
- text-align: right;
- /* position: relative;
- top: 3px; */
+.header{
+background-image:url("");
+background-repeat:no-repeat;
+background-attachment:fixed;
+border:none;
+margin:0px;
+padding:0px;
}
-
-#quick_menu{
+input.inputerror{
+background-color:#fddbdb;
}
-
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- border: 0px;
- white-space: nowrap;
- margin: 2px;
- padding: 2px;
- color: white;
- text-align: left;
+textarea.texterror{
+background-color:#fddbdb;
}
-
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- background-color: #588BB6;
- white-space: nowrap;
- border: none;
- margin: 0px;
- padding: 0px;
- text-align: right;
+select.selecterror{
+background-color:#fddbdb;
}
-
-.quick_menu_tab{
- background: #588BB6;
- height:28pt;
- white-space: nowrap;
- border-left: solid 1px #aaa;
- border-right: solid 1px #aaa;
- padding-left: 10px;
- padding-right: 10px;
- text-align: right;
+.OsRow{
+background-color:#234567;
+color:white;
}
-.quick_menu_tab a{
- color:#fff;
- font-weight:bold;
-}
+/*** CANVAS ***/
-.quick_menu_left a{
- color:#fff;
+#CanvasDiv{
+ background:#588BB6;
}
-.quick_menu_tab a:hover{
- color:#ffc;
- text-decoration:none;
- font-weight:bold;
-}
+/*** HEADER ***/
-.quick_menu_left a:hover{
- color:#ffc;
- text-decoration:none;
+#HeaderDiv{
+color:white;
+/*background:#588BB6;*/
+/*overflow:hidden;*/
}
-
-.quick_menu_tab:hover{
- color:#ffd;
+#HeaderDiv a{
+color:white;
}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+#HeaderDiv a:hover{
+text-decoration:underline;
}
-
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+#HeaderWrapDiv{
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
-}
+/*** HEADER - APP INFO ***/
-.main_area {
- border: 2px inset white;
- width: 100%;
- background-color: white;
+#AppInfoDiv{
+float:left;
+padding:0;
}
-
-.main_menu {
- background-color: #40FC40;
- font-size: 10px;
- border-top: 0px #AAAAAA solid;
- border-bottom: 0px #AAAAAA solid;
- font-weight: normal;
- margin-top: 2px;
- width: 100%;
+#AppInfoCompanyDiv,#AppInfoUserDiv{
+display:table-cell;
}
-
-.main_menu table {
- border: 0px;
- width: 100%;
- margin-top: 2px;
- margin-bottom: 2px;
+#AppInfoModuleDiv{
}
+/*** HEADER - QUICK MENU ***/
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+#QuickMenuDiv{
+float:right;
+margin-top:2px;
}
-
-.main_menu a {
- color: black;
- font-weight: bold;
- text-decoration: none;
- white-space: nowrap;
+#QuickMenuDiv ul{
}
-
-.main_menu a:hover {
- color: black;
- text-decoration: underline;
+#QuickMenuDiv li{
+display:inline;
+border-left:thin ridge #588BB6;
+padding:14px 12px;
}
-.menu_group_img {
- background-color: #CCCCCC;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
+/*** BODY ***/
-.menu_group_img img{
- position: relative;
- top: 10px;
+#BodyDiv{
+clear:both;
}
-
-.menu_group_area {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- border: 2px inset white;
- color: #cc6600;
- background-color: #CCCCCC;
- font-weight: normal;
+#BodyWrapDiv{
+background:#CCCCCC;
+/*border:thin solid #ccc;*/
+clear:both;
}
-.blank_area table {
- border: 0px;
- width: 100%;
-}
+/*** BODY - MAIN MENU ***/
-
-
-.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv{
+float:left;
+width:11%;
+border:thin solid #000;
+text-align:center;
+white-space:nowrap;
}
-
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv ul{
+margin:0;
+padding:0;
}
-
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#MainMenuDiv li{
+list-style:none;
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: #777777;
- text-decoration: none;
+#MainMenuDiv li a{
+color:black;
}
-
-.menu_group_item a {
+#MainMenuDiv li a:hover{
+color:black;
+text-decoration:underline;
}
-
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+.main_menu_unselected{
+background:#8EDE8D;
+padding:2px;
}
-
-#footer {
- position: relative;
- bottom: -3px;
+.main_menu_unselected:hover{
+background:white;
}
-
-a.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: black;
- font-weight: normal;
- font-size: 8px;
+.main_menu_selected{
+background-color:white;
+padding:2px;
}
-.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: #CCCCCC;
- font-weight: normal;
- font-size: 9px;
- text-align: center;
-}
+/*** BODY - SUB MENU ***/
-.legal {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#SubMenuDiv{
+display:table;
+float:right;
+overflow:hidden;
+width:88.5%;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#SubMenuDiv ul{
+margin:0;
+padding:0;
+background:#fff;
+border:thin solid black;
+margin-left:3px;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#SubMenuDiv li{
+list-style:none;
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 9px;
- color: white;
- background-color: #336699;
+#SubMenuDiv a{
+color:blue;
}
-
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+#SubMenuDiv a:hover{
+color:blue;
+text-decoration:underline;
}
-
-input.big {
- width: 100px;
+#TransactionsDiv,
+#InquiriesDiv,
+#MaintenanceDiv{
+display:table-cell;
}
-
-input.small {
- width: 50px;
+.menu_group_headers{
+text-align:center;
+color:black;
+background:#eee;
+border-bottom:thin solid black;
}
-
-input.inputerror {
- background-color: #fddbdb;
+.menu_group_item{
+background-color:white;
+padding:2px;
}
-
-textarea.texterror {
- background-color: #fddbdb;
+.menu_group_item p{
+color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent:-12px; /* this makes the bullet to appear as the li tag previously used */
+margin:0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
}
-
-select.selecterror {
- background-color: #fddbdb;
+#InquiriesDiv div{ /* header for standard reports/forms, custom reports */
+border-top:thin solid black;
+border-bottom:thin solid black;
+background:#eee;
+color:black;
+padding:2px;
}
-.tableheader {
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
+/*** FOOTER ***/
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+#FooterDiv{
+clear:both;
+overflow:hidden;
+color:#CCCCCC;
+padding:3px 2px;
}
+#FooterWrapDiv{
-.label {
- font-weight:bold;
- font-style:normal;
- font-size:12px;
- color:black;
- background-color:#cccccc;
}
-
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterLogoDiv{
+background:white;
+border-radius:7px;
+float:left;
+padding:3px;
}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
-.table_index {
- background-color: #F1FFDD;
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
}
Modified: trunk/css/default/login.css
===================================================================
--- trunk/css/default/login.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/default/login.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -1,72 +1,65 @@
+/***
+
+"Default" Login theme for WebERP
+
+by Hindra Joshua
+
+***/
+
+
/* $Id$*/
body {
- padding: 0px;
- margin: 0px;
- text-align: center;
- font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
- background: #fff url(images/stripe.png) repeat;
- color: #777;
+background:#ccd;
+color:black;
+font:14px "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+text-align:center;
}
+img{
+vertical-align:middle;
+}
+
#container {
- text-align: left;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- position: relative;
- z-index: 1000;
- width: 300px;
- background: #fff;
+background:#588BB6;
+border:thin solid black;
+margin-left:auto;
+margin-right:auto;
+margin-top:50px;
+width:300px;
+z-index:1000;
}
#login_logo {
- width: 200px;
- height: 75px;
- margin-left: 50px;
- margin-top: 70px;
- padding-top: 10px;
- margin-bottom: 20px;
- background: #fff url(../webERP.gif) repeat-x left bottom;
+background:url("../webERP.gif") no-repeat scroll center center #FFFFFF;
+border:medium outset gray;
+border-radius:19px 19px 19px 19px;
+height:44px;
+margin:10% auto;
+padding:12px;
+width:190px;
}
-input{
- width: 200px;
- border: solid #e3e3e3 1px;
- height:25px;
- background:url(images/input_bg.png) repeat-x left top;
- padding:4px 0;
- vertical-align:middle;
- margin-left:50px;
- margin-bottom:10px;
-}
-
-input:hover {
- border: solid #aad4e3 1px;
- background-position:left bottom;
-}
-
input.button {
- font-weight: bold;
- color: #fff;
- background:url(images/menu_bg.png) 0px -8px repeat-x;
- border: solid #e3e3e3 1px;
- padding: 0px;
- margin-top: 10px;
- margin-bottom: 30px;
+background:none repeat scroll 0 0 transparent;
+border:thick outset #588BB6;
+border-radius:15px 15px 15px 15px;
+padding:10px;
+vertical-align:middle;
+width:50%;
+font-weight:bold;
+box-shadow:3px 3px 4px;
}
input.button:hover {
- background:url(images/menu_bg_dblue.png) 0px -8px repeat-x;
+background:none repeat scroll 0 0 transparent;
+border:thick inset #588BB6;
+border-radius:15px 15px 15px 15px;
+padding:10px;
+vertical-align:middle;
+width:50%;
+box-shadow:3px 3px 4px inset;
}
-span{
- width:200px;
- padding-top:7px;
- padding-left:50px;
-}
-
#demo_text{
- margin-left:50px;
- width:200px;
-}
-
+ padding:10px;
+}
\ No newline at end of file
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/fresh/default.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -25,11 +25,6 @@
}
/*** default styles ***/
-
-img {
- border:none;
- vertical-align:middle;
-}
a {
color:blue;
text-decoration:none;
@@ -38,58 +33,38 @@
color:blue;
text-decoration: underline;
}
-table {
- background-color: #ffffff;
- margin: 0 auto;
- width:100%
+
+img {
+ border:none;
+ vertical-align:middle;
}
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
+p.page_title_text {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ font-weight: bold;
font-size: 10px;
- text-align: left;
+ color: black;
+ background-color: #C9D392;
+ width: 30%;
+ TEXT-ALIGN:center;
+ margin: 10px auto;
}
-
-/*** calendar picker ***/
-
-#calendar{
-
+p.good { /***/
+ font-weight: bold;
+ color: green;
}
-.dpTbl {
- border: solid navy 1px;
+p.bad { /***/
+ font-weight: bold;
+ color:red;
}
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
-/*** /calendar picker ***/
-
-div.centre { /* centering buttons / links */
+table {
+ background-color: #ffffff;
margin: 0 auto;
- text-align:center;
+ width:100%
}
-
table.selection {
}
-
th {
font-weight: normal;
font-size: 10px;
@@ -103,42 +78,21 @@
background-color: #800000;
color: white;
}
-
+td {
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
+ text-align: left;
+}
td.select {
background-color:#eee;
}
td.number {
text-align: right;
}
-
-.EvenTableRows {
- background-color: #72824D;
+div.centre { /* centering buttons / links */
+ margin: 0 auto;
+ text-align:center;
}
-.OddTableRows {
- background-color: #CAF17C;
-}
-
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-div.info {
- background-color:#c7ccf6;
- color: navy;
- border: 0px solid navy;
-}
-
input {
font-family: Arial, Verdana, Helvetica, sans-serif;;
font-size: 10px;
@@ -152,94 +106,43 @@
}
input:hover{
}
-
select {
font-family: Arial, Verdana, Helvetica, sans-serif;;
font-size: 10px;
}
-
-p.good { /***/
- font-weight: bold;
- color: green;
-}
-p.bad { /***/
- font-weight: bold;
- color:red;
-}
-
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.login {
- background-color: #ffffff;
- border: none;
-}
-
textarea{
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
}
-
textarea:hover{
}
-
-/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.EvenTableRows {
+ background-color: #72824D;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.OddTableRows {
+ background-color: #CAF17C;
}
-input.address3 {
- text-transform: uppercase;
+div.error {
+ background-color:#fddbdb;
+ color: red;
+ border: 1px solid red;
}
-
-div.csv {
- background:lightgray;
- color: black;
- border: 1px solid black;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 50%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- TEXT-ALIGN:center;
+div.warn {
+ background-color:#f5dbfd;
+ color: maroon;
+ border: 1px solid maroon;
}
-
-p.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- background-color: #C9D392;
- width: 30%;
- TEXT-ALIGN:center;
- margin: 10px auto;
+div.success {
+ background-color:#b9ecb4;
+ color: darkgreen;
+ border: 1px solid darkgreen;
}
-
+div.info {
+ background-color:#c7ccf6;
+ color: navy;
+ border: 0px solid navy;
+}
DIV.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
BORDER: #a52a2a 1px solid;
@@ -259,44 +162,93 @@
TEXT-ALIGN:center;
}
-input.inputerror {
- background-color: #fddbdb;
+/*** calendar picker ***/
+#calendar{
+
}
-textarea.texterror {
- background-color: #fddbdb;
+.dpTbl {
+ border: solid navy 1px;
}
-select.selecterror {
- background-color: #fddbdb;
+.dpTD {
+ border: 0;
+ width:20px;
+ background-color: #EEEEEE;
+ text-align:right;
+ cursor:pointer;
}
+.dpDayHighlight {
+ border: 0;
+ width:20px;
+ background-color: yellow;
+ text-align:right;
+ cursor:pointer;
+}
+.dpTDHover {
+ border: 0;
+ width:20px;
+ background-color: #CCCCCC;
+ text-align:right;
+ cursor:pointer;
+}
+/*** /calendar picker ***/
+/* Table type is used for UI tables type 1 */
+.table1 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+/* Table type is used for UI tables type 2 */
+.table2 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-08 09:10:00
|
Revision: 5590
http://web-erp.svn.sourceforge.net/web-erp/?rev=5590&view=rev
Author: daintree
Date: 2012-08-08 09:09:46 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/css/aguapop/login.css
trunk/css/default/default.css
trunk/css/default/login.css
trunk/css/fresh/default.css
trunk/css/fresh/login.css
trunk/css/gel/default.css
trunk/css/gel/login.css
trunk/css/professional/default.css
trunk/css/professional/login.css
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/default.css
trunk/css/silverwolf/login.css
trunk/css/wood/default.css
trunk/css/wood/login.css
trunk/includes/session.inc
Modified: trunk/css/aguapop/login.css
===================================================================
--- trunk/css/aguapop/login.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/aguapop/login.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -80,3 +80,7 @@
width:50%;
box-shadow:3px 3px 4px black inset;
}
+
+#demo_text{
+ padding:10px;
+}
\ No newline at end of file
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/default/default.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -4,866 +4,421 @@
***/
-body {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- background-color: #CCCCDD;
- margin:0;
- padding:0
+body{
+background-color:#ccd;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+margin:0;
+padding:0
}
-img {
- border:none;
- vertical-align:middle;
+a{
+color:blue;
+text-decoration:none;
}
-
-/*links before selection */
-a {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- text-decoration: none;
- color: black;
+a:hover{
+color:blue;
+text-decoration:underline;
}
-/*links on any screen when mouse is hovering over them */
-a:hover {
- background:#fff;
- color: #2D8628;
- text-decoration: underline;
+img{
+border:none;
+vertical-align:middle;
}
-table {
- background-color: #587BA6;
- margin: 0 auto;
- width:100%;
+.page_title_text{
+padding:5px;
+font-weight:bold;
+color:black;
+TEXT-ALIGN:center;
}
-
-
-/*** CANVAS ***/
-
-#CanvasDiv {
+p.good{
+font-weight:bold;
+color:green;
}
-
-/*** HEADER ***/
-
-#HeaderDiv {
- color:white;
- background:#588BB6;
- overflow:hidden;
+p.bad{
+font-weight:bold;
+color:red;
}
-#HeaderDiv a{
- color:white;
+table{
+margin:0 auto;
+width:auto;
+max-width:90%;
+padding-bottom:5px;
}
-#HeaderDiv a:hover{
- color:black;
- background:white;
- text-decoration:underline;
+table.selection{
+padding-bottom:5px;
}
-#HeaderWrapDiv{
+th{
+font-weight:normal;
+background-color:#B06161;
+color:white;
}
-
-/*** HEADER - APP INFO ***/
-
-#AppInfoDiv{
- display:table;
- float:left;
- padding:
+th.number{
+text-align:right;
+font-weight:normal;
+background-color:#B06161;
+color:white;
}
-#AppInfoDiv img{
- vertical-align:middle;
+td{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+text-align:left;
}
-#AppInfoCompanyDiv{
- display:table-cell;
+td.select{
+background-color:#eee;
}
-#AppInfoUserDiv{
- display:table-cell;
+td.number{
+text-align:right;
}
-#AppInfoModuleDiv{
- display:table-row-group;
+div.centre{
+margin:0 auto;
+text-align:center;
+padding:5px;
}
-
-/*** HEADER - QUICK MENU ***/
-
-#QuickMenuDiv{
- float:right;
+input{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-#QuickMenuDiv ul{
+input.number{
+text-align:right;
}
-#QuickMenuDiv ul li{
- display:inline;
- border-left:thin ridge #588BB6;
- padding:10px;
+input.image{
+border-width:0px;
+background-color:transparent;
}
-
-/*** BODY ***/
-
-#BodyDiv {
- clear:both;
-/* margin-left:5px;
- margin-right:5px;*/
- color:black;
- background:#588BB6;
- overflow:hidden;
+input:hover{
}
-#BodyDiv table {
- width:90%;
- text-align:center;
+select{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-
-#BodyWrapDiv{
- background:#CCCCCC;
+textarea{
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
}
-
-/*** BODY - MAIN MENU ***/
-
-#MainMenuDiv{
- float:left;
- width:11%;
- white-space:nowrap;
- text-align:center;
- border:thin solid gray;
+textarea:hover{
}
-#MainMenuDiv ul{
- margin:0;
- padding:0;
+.EvenTableRows{
+background-color:#CCCCCC;
}
-#MainMenuDiv li{
- list-style:none;
+.OddTableRows{
+background-color:#EEEEEE;
}
-#MainMenuDiv li a:link, a:visited{
-/* color:black;
- font-weight:bold;*/
+div.error{
+background-color:#fddbdb;
+color:red;
+border:1px solid red;
}
-#MainMenuDiv li a:hover{
- color:black;
- background:white;
- text-decoration:underline;
+div.warn{
+background-color:#f5dbfd;
+color:maroon;
+border:1px solid maroon;
}
-
-.main_menu_unselected{
- background:#40FC40;
- padding:2px;
+div.success{
+background-color:#b9ecb4;
+color:darkgreen;
+border:1px solid darkgreen;
}
-.main_menu_unselected:hover{
- background:white;
+div.info{
+background-color:#c7ccf6;
+color:navy;
+border:1px solid navy;
}
-.main_menu_unselected a{
+DIV.page_help_text{
+background:lightgrey url(images/help.png) top left no-repeat;
+BORDER:#a52a2a 1px solid;
+padding-top:2px;
+padding-bottom:2px;
+PADDING-LEFT:10px;
+Z-INDEX:1;
+width:80%;
+FLOAT:none;
+VISIBILITY:visible;
+MARGIN:0 auto;
+POSITION:static;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-weight:normal;
+font-size:10px;
+color:black;
+TEXT-ALIGN:center;
}
-.main_menu_unselected a:hover{
+DIV.system_check{
+BORDER:#a52a2a 1px solid;
+PADDING-LEFT:3px;
+Z-INDEX:1;
+width:40%;
+FLOAT:none;
+VISIBILITY:visible;
+MARGIN:0 auto;
+POSITION:static;
+background:lightgray;
+font-family:Arial, Verdana, Helvetica, sans-serif;
+padding-top:1px;
+padding-bottom:1px;
+font-weight:normal;
+font-size:10px;
+color:black;
+TEXT-ALIGN:left;
}
-.main_menu_selected {
- background-color: white;
- border:thin solid gray;
- font-weight: normal;
- text-align: center;
- white-space: nowrap;
- padding:2px;
-}
-.main_menu_selected:hover{
-}
-.main_menu_selected a{
-}
-.main_menu_selected a:hover{
-}
-/*** BODY - SUB MENU ***/
-
-#SubMenuDiv{
- display:table;
- float:right;
- overflow: hidden;
- min-width: 88%;
+.dpTbl { /* date picker background */
+border:thin solid black;
+background:white;
+box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
}
-#SubMenuDiv ul{
- margin:0;
- padding:0;
+.dpTD{
+border:0;
+width:20px;
+background-color:#EEEEEE;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv li{
- list-style:none;
+.dpDayHighlight{
+border:0;
+width:20px;
+background-color:yellow;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv a{
+.dpTDHover{
+border:0;
+width:20px;
+background-color:#CCCCCC;
+text-align:right;
+cursor:pointer;
}
-#SubMenuDiv a:hover{
- color:green;
- text-decoration:underline;
-}
-#TransactionsDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-#InquiriesDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-#MaintenanceDiv{
- float:left;
- list-style:none;
- width:33%;
- border:thin solid black;
- background:#EEEEEE;
-/* display:table-cell; */
-}
-.menu_group_headers {
- text-align:center;
- color:black;
- background:#EEEEEE;
- border: thin outset #EEEEEE;
-}
-/*.menu_group_headers table{
-}*/
-/*.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: white;
-}
-*/
-/*.menu_group_items {
- background-color: white;
- font-weight: normal;
- padding: 15px;
- border-top: 0px #AAAAAA solid;
- border-left: 0px #AAAAAA solid;
- border-right: 0px white solid;
- border-bottom: 0px white solid;
-}*/
-.menu_group_item {
- background-color: white;
- padding:2px;
-}
-.menu_group_item p {
- color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
-}
-/*** FOOTER ***/
-
-#FooterDiv{
- clear:both;
- color:#CCCCCC;
- background:#588BB6;
- overflow:hidden;
-}
-#FooterWrapDiv{
- overflow:hidden;
- padding:5px;
-}
-#FooterLogoDiv{
- background:white;
- border-radius:8px 8px 8px 8px;
- float:left;
- padding:5px;
-}
-#FooterVersionDiv{
- float:left;
- margin-left:10px;
- margin-top:15px;
-
-}
-#FooterTimeDiv{
- float:right;
- margin-top:15px;
-}
-
-/*** MISC ***/
-
-div.centre {
- margin: 0 auto;
- text-align:center;
-}
-
-
-
-/*
-.dpTbl {
- border: solid navy 1px;
-}
-
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- text-align: left;
-}
-
-td.select {
- background-color:#eee;
-}
-
-table.selection {
- background-color:#eee;
- outline-style:solid;
- outline-width:1px;
-}
-
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
-td.number {
- text-align: right;
-}
-
-.EvenTableRows {
- background-color: #CCCCCC;
-}
-
-.OddTableRows {
- background-color: #EEEEEE;
-}
-
-th {
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-
-th.number {
- text-align: right;
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
-
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-
-div.info {
- background-color:#c7ccf6;
- color:navy;
- border: 1px solid navy;
-}
-
-input {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-input.number{
- text-align: right;
-}
-
-input.image {
- border-width:0px;
- background-color: transparent;
-}
-
-input:hover{
-}
-
-select {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-p.good {
- font-weight: bold;
- color: green;
-}
-
-p.bad {
- font-weight: bold;
- color:red;
-}
-
-#topMenu {
- width: 100%;
- color: black;
- background-color: #E2E9EB;
- border: none;
- border-bottom: 1px solid #999999;
-}
-
-#trim {
- background: #CCCCCC;
-}
-
-#page {
- width: 100%;
- color: black;
- font-size: 10px;
- white-space: nowrap;
- border: none;
-}
-
-#menuImg {
- vertical-align: top;
- text-align: center;
- margin: 0px;
- padding: 10px;
-}
-
-#mainMenu {
- width: 100%;
- color: black;
- background-color: #E3EBE2;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.login {
- background-color: white;
- border: none;
-}
-
-textarea{
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-textarea:hover{
-}
/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.table1{
+width:90%;
+background:#eee;
+border:0px 0px 2px 2px #222 solid;
+margin:0 auto;
}
/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+/*.table2{
+width:90%;
+background:#eee;
+border:0px 0px 2px 2px #222 solid;
+margin:0 auto;
+}*/
-input.address3 {
- text-transform: uppercase;
+.tableheader{
+font-weight:normal;
+background-color:#800000;
+color:white;
}
-
-div.csv {
- background:lightgray;
- color: black;
- border: 1px solid black;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 50%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- TEXT-ALIGN:center;
+.notavailable{
+font-weight:lighter;
+font-style:italic;
+color:#555555;
}
-
-.callout_main {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
+.label{
+font-weight:bold;
+font-style:normal;
+font-size:12px;
+color:black;
+background-color:#cccccc;
}
-
-.main_page {
- background-color: white;
- border: none;
- width: 100%;
- margin: 0px;
- padding: 0px;
- font-size: 10px;
+.table_index{
+background-color:#F1FFDD;
}
-/* Main page heading with quick menu within */
-.quick_menu {
- width: 100%;
- background-color: #588BB6;
- border: none;
- margin: 0px;
- padding: 0px;
- color: black;
- border-top: 0px #AAAAAA solid;
- border-left: 0px #AAAAAA solid;
- border-right: 0px white solid;
- border-bottom: 0px white solid;
- text-align: right;
- /* position: relative;
- top: 3px; */
+.header{
+background-image:url("");
+background-repeat:no-repeat;
+background-attachment:fixed;
+border:none;
+margin:0px;
+padding:0px;
}
-
-#quick_menu{
+input.inputerror{
+background-color:#fddbdb;
}
-
-/*The main page heading left part before quick menu */
-.quick_menu_left {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- border: 0px;
- white-space: nowrap;
- margin: 2px;
- padding: 2px;
- color: white;
- text-align: left;
+textarea.texterror{
+background-color:#fddbdb;
}
-
-/*the Select Customer / Item / Supplier Menu tabs */
-.quick_menu_tabs {
- background-color: #588BB6;
- white-space: nowrap;
- border: none;
- margin: 0px;
- padding: 0px;
- text-align: right;
+select.selecterror{
+background-color:#fddbdb;
}
-
-.quick_menu_tab{
- background: #588BB6;
- height:28pt;
- white-space: nowrap;
- border-left: solid 1px #aaa;
- border-right: solid 1px #aaa;
- padding-left: 10px;
- padding-right: 10px;
- text-align: right;
+.OsRow{
+background-color:#234567;
+color:white;
}
-.quick_menu_tab a{
- color:#fff;
- font-weight:bold;
-}
+/*** CANVAS ***/
-.quick_menu_left a{
- color:#fff;
+#CanvasDiv{
+ background:#588BB6;
}
-.quick_menu_tab a:hover{
- color:#ffc;
- text-decoration:none;
- font-weight:bold;
-}
+/*** HEADER ***/
-.quick_menu_left a:hover{
- color:#ffc;
- text-decoration:none;
+#HeaderDiv{
+color:white;
+/*background:#588BB6;*/
+/*overflow:hidden;*/
}
-
-.quick_menu_tab:hover{
- color:#ffd;
+#HeaderDiv a{
+color:white;
}
-/*the Select Customer / Item / Supplier Menu tabs */
-.system_menu_tabs {
- background-color: white;
- white-space: nowrap;
- border: none;
- margin-left: 6px;
- margin-right: 6px;
- margin-top: 0px;
- margin-bottom: 0px;
- padding: 0px;
- text-align: center;
+#HeaderDiv a:hover{
+text-decoration:underline;
}
-
-.system_menu_tabs a {
- font-size: 10px;
- color: black;
+#HeaderWrapDiv{
}
-.system_menu_tabs a:hover {
- font-size: 10px;
- color: black;
-}
+/*** HEADER - APP INFO ***/
-.main_area {
- border: 2px inset white;
- width: 100%;
- background-color: white;
+#AppInfoDiv{
+float:left;
+padding:0;
}
-
-.main_menu {
- background-color: #40FC40;
- font-size: 10px;
- border-top: 0px #AAAAAA solid;
- border-bottom: 0px #AAAAAA solid;
- font-weight: normal;
- margin-top: 2px;
- width: 100%;
+#AppInfoCompanyDiv,#AppInfoUserDiv{
+display:table-cell;
}
-
-.main_menu table {
- border: 0px;
- width: 100%;
- margin-top: 2px;
- margin-bottom: 2px;
+#AppInfoModuleDiv{
}
+/*** HEADER - QUICK MENU ***/
-
-span.main_menu_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #777777;
- text-decoration: none;
- white-space: nowrap;
+#QuickMenuDiv{
+float:right;
+margin-top:2px;
}
-
-.main_menu a {
- color: black;
- font-weight: bold;
- text-decoration: none;
- white-space: nowrap;
+#QuickMenuDiv ul{
}
-
-.main_menu a:hover {
- color: black;
- text-decoration: underline;
+#QuickMenuDiv li{
+display:inline;
+border-left:thin ridge #588BB6;
+padding:14px 12px;
}
-.menu_group_img {
- background-color: #CCCCCC;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
+/*** BODY ***/
-.menu_group_img img{
- position: relative;
- top: 10px;
+#BodyDiv{
+clear:both;
}
-
-.menu_group_area {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- border: 2px inset white;
- color: #cc6600;
- background-color: #CCCCCC;
- font-weight: normal;
+#BodyWrapDiv{
+background:#CCCCCC;
+/*border:thin solid #ccc;*/
+clear:both;
}
-.blank_area table {
- border: 0px;
- width: 100%;
-}
+/*** BODY - MAIN MENU ***/
-
-
-.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv{
+float:left;
+width:11%;
+border:thin solid #000;
+text-align:center;
+white-space:nowrap;
}
-
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+#MainMenuDiv ul{
+margin:0;
+padding:0;
}
-
-DIV.system_check {
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:left;
+#MainMenuDiv li{
+list-style:none;
}
-span.menu_group_nolink {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: #777777;
- text-decoration: none;
+#MainMenuDiv li a{
+color:black;
}
-
-.menu_group_item a {
+#MainMenuDiv li a:hover{
+color:black;
+text-decoration:underline;
}
-
-.menu_group_items a:hover {
- color: #0000aa;
- text-decoration: underline;
+.main_menu_unselected{
+background:#8EDE8D;
+padding:2px;
}
-
-#footer {
- position: relative;
- bottom: -3px;
+.main_menu_unselected:hover{
+background:white;
}
-
-a.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: black;
- font-weight: normal;
- font-size: 8px;
+.main_menu_selected{
+background-color:white;
+padding:2px;
}
-.footer {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- color: #CCCCCC;
- font-weight: normal;
- font-size: 9px;
- text-align: center;
-}
+/*** BODY - SUB MENU ***/
-.legal {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- color: #333333;
+#SubMenuDiv{
+display:table;
+float:right;
+overflow:hidden;
+width:88.5%;
}
-
-.box1 {
- border-color: #CCCCCC #333333 #333333 #CCCCCC;
- border-width: medium;
- border-style: ridge;
+#SubMenuDiv ul{
+margin:0;
+padding:0;
+background:#fff;
+border:thin solid black;
+margin-left:3px;
}
-
-.promo {
- font-family: "Times New Roman", Times, serif;
- color: #000033;
+#SubMenuDiv li{
+list-style:none;
}
-
-.titlebar {
- font-family: "Times New Roman", Times, serif;
- font-size: 9px;
- color: white;
- background-color: #336699;
+#SubMenuDiv a{
+color:blue;
}
-
-.dingbat {
- font-family: Arial, Helvetica, sans-serif;
- background-color: #99CC99;
- color: #006666;
- font-weight: bolder;
- font-size: medium;
+#SubMenuDiv a:hover{
+color:blue;
+text-decoration:underline;
}
-
-input.big {
- width: 100px;
+#TransactionsDiv,
+#InquiriesDiv,
+#MaintenanceDiv{
+display:table-cell;
}
-
-input.small {
- width: 50px;
+.menu_group_headers{
+text-align:center;
+color:black;
+background:#eee;
+border-bottom:thin solid black;
}
-
-input.inputerror {
- background-color: #fddbdb;
+.menu_group_item{
+background-color:white;
+padding:2px;
}
-
-textarea.texterror {
- background-color: #fddbdb;
+.menu_group_item p{
+color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent:-12px; /* this makes the bullet to appear as the li tag previously used */
+margin:0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
}
-
-select.selecterror {
- background-color: #fddbdb;
+#InquiriesDiv div{ /* header for standard reports/forms, custom reports */
+border-top:thin solid black;
+border-bottom:thin solid black;
+background:#eee;
+color:black;
+padding:2px;
}
-.tableheader {
- font-weight: normal;
- background-color: #800000;
- color: white;
-}
+/*** FOOTER ***/
-.notavailable {
- font-weight:lighter;
- font-style:italic;
- color:#555555;
+#FooterDiv{
+clear:both;
+overflow:hidden;
+color:#CCCCCC;
+padding:3px 2px;
}
+#FooterWrapDiv{
-.label {
- font-weight:bold;
- font-style:normal;
- font-size:12px;
- color:black;
- background-color:#cccccc;
}
-
-.OsRow {
- background-color: #234567;
- color: white;
+#FooterLogoDiv{
+background:white;
+border-radius:7px;
+float:left;
+padding:3px;
}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
-.table_index {
- background-color: #F1FFDD;
}
-
-li {
- list-style-image: url(bullet.gif);
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
}
Modified: trunk/css/default/login.css
===================================================================
--- trunk/css/default/login.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/default/login.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -1,72 +1,65 @@
+/***
+
+"Default" Login theme for WebERP
+
+by Hindra Joshua
+
+***/
+
+
/* $Id$*/
body {
- padding: 0px;
- margin: 0px;
- text-align: center;
- font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
- background: #fff url(images/stripe.png) repeat;
- color: #777;
+background:#ccd;
+color:black;
+font:14px "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+text-align:center;
}
+img{
+vertical-align:middle;
+}
+
#container {
- text-align: left;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- position: relative;
- z-index: 1000;
- width: 300px;
- background: #fff;
+background:#588BB6;
+border:thin solid black;
+margin-left:auto;
+margin-right:auto;
+margin-top:50px;
+width:300px;
+z-index:1000;
}
#login_logo {
- width: 200px;
- height: 75px;
- margin-left: 50px;
- margin-top: 70px;
- padding-top: 10px;
- margin-bottom: 20px;
- background: #fff url(../webERP.gif) repeat-x left bottom;
+background:url("../webERP.gif") no-repeat scroll center center #FFFFFF;
+border:medium outset gray;
+border-radius:19px 19px 19px 19px;
+height:44px;
+margin:10% auto;
+padding:12px;
+width:190px;
}
-input{
- width: 200px;
- border: solid #e3e3e3 1px;
- height:25px;
- background:url(images/input_bg.png) repeat-x left top;
- padding:4px 0;
- vertical-align:middle;
- margin-left:50px;
- margin-bottom:10px;
-}
-
-input:hover {
- border: solid #aad4e3 1px;
- background-position:left bottom;
-}
-
input.button {
- font-weight: bold;
- color: #fff;
- background:url(images/menu_bg.png) 0px -8px repeat-x;
- border: solid #e3e3e3 1px;
- padding: 0px;
- margin-top: 10px;
- margin-bottom: 30px;
+background:none repeat scroll 0 0 transparent;
+border:thick outset #588BB6;
+border-radius:15px 15px 15px 15px;
+padding:10px;
+vertical-align:middle;
+width:50%;
+font-weight:bold;
+box-shadow:3px 3px 4px;
}
input.button:hover {
- background:url(images/menu_bg_dblue.png) 0px -8px repeat-x;
+background:none repeat scroll 0 0 transparent;
+border:thick inset #588BB6;
+border-radius:15px 15px 15px 15px;
+padding:10px;
+vertical-align:middle;
+width:50%;
+box-shadow:3px 3px 4px inset;
}
-span{
- width:200px;
- padding-top:7px;
- padding-left:50px;
-}
-
#demo_text{
- margin-left:50px;
- width:200px;
-}
-
+ padding:10px;
+}
\ No newline at end of file
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-08-08 08:27:42 UTC (rev 5589)
+++ trunk/css/fresh/default.css 2012-08-08 09:09:46 UTC (rev 5590)
@@ -25,11 +25,6 @@
}
/*** default styles ***/
-
-img {
- border:none;
- vertical-align:middle;
-}
a {
color:blue;
text-decoration:none;
@@ -38,58 +33,38 @@
color:blue;
text-decoration: underline;
}
-table {
- background-color: #ffffff;
- margin: 0 auto;
- width:100%
+
+img {
+ border:none;
+ vertical-align:middle;
}
-/*table detail items default format */
-td {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
+p.page_title_text {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ font-weight: bold;
font-size: 10px;
- text-align: left;
+ color: black;
+ background-color: #C9D392;
+ width: 30%;
+ TEXT-ALIGN:center;
+ margin: 10px auto;
}
-
-/*** calendar picker ***/
-
-#calendar{
-
+p.good { /***/
+ font-weight: bold;
+ color: green;
}
-.dpTbl {
- border: solid navy 1px;
+p.bad { /***/
+ font-weight: bold;
+ color:red;
}
-.dpTD {
- border: 0;
- width:20px;
- background-color: #EEEEEE;
- text-align:right;
- cursor:pointer;
-}
-.dpDayHighlight {
- border: 0;
- width:20px;
- background-color: yellow;
- text-align:right;
- cursor:pointer;
-}
-.dpTDHover {
- border: 0;
- width:20px;
- background-color: #CCCCCC;
- text-align:right;
- cursor:pointer;
-}
-
-/*** /calendar picker ***/
-
-div.centre { /* centering buttons / links */
+table {
+ background-color: #ffffff;
margin: 0 auto;
- text-align:center;
+ width:100%
}
-
table.selection {
}
-
th {
font-weight: normal;
font-size: 10px;
@@ -103,42 +78,21 @@
background-color: #800000;
color: white;
}
-
+td {
+ font-family: Arial, Verdana, Helvetica, sans-serif;;
+ font-size: 10px;
+ text-align: left;
+}
td.select {
background-color:#eee;
}
td.number {
text-align: right;
}
-
-.EvenTableRows {
- background-color: #72824D;
+div.centre { /* centering buttons / links */
+ margin: 0 auto;
+ text-align:center;
}
-.OddTableRows {
- background-color: #CAF17C;
-}
-
-div.error {
- background-color:#fddbdb;
- color: red;
- border: 1px solid red;
-}
-div.warn {
- background-color:#f5dbfd;
- color: maroon;
- border: 1px solid maroon;
-}
-div.success {
- background-color:#b9ecb4;
- color: darkgreen;
- border: 1px solid darkgreen;
-}
-div.info {
- background-color:#c7ccf6;
- color: navy;
- border: 0px solid navy;
-}
-
input {
font-family: Arial, Verdana, Helvetica, sans-serif;;
font-size: 10px;
@@ -152,94 +106,43 @@
}
input:hover{
}
-
select {
font-family: Arial, Verdana, Helvetica, sans-serif;;
font-size: 10px;
}
-
-p.good { /***/
- font-weight: bold;
- color: green;
-}
-p.bad { /***/
- font-weight: bold;
- color:red;
-}
-
-.header {
- background-image: url("");
- background-repeat: no-repeat;
- background-attachment: fixed;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.login {
- background-color: #ffffff;
- border: none;
-}
-
textarea{
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
}
-
textarea:hover{
}
-
-/* Table type is used for UI tables type 1 */
-.table1 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.EvenTableRows {
+ background-color: #72824D;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
+.OddTableRows {
+ background-color: #CAF17C;
}
-input.address3 {
- text-transform: uppercase;
+div.error {
+ background-color:#fddbdb;
+ color: red;
+ border: 1px solid red;
}
-
-div.csv {
- background:lightgray;
- color: black;
- border: 1px solid black;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 50%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 10px;
- TEXT-ALIGN:center;
+div.warn {
+ background-color:#f5dbfd;
+ color: maroon;
+ border: 1px solid maroon;
}
-
-p.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- font-size: 10px;
- color: black;
- background-color: #C9D392;
- width: 30%;
- TEXT-ALIGN:center;
- margin: 10px auto;
+div.success {
+ background-color:#b9ecb4;
+ color: darkgreen;
+ border: 1px solid darkgreen;
}
-
+div.info {
+ background-color:#c7ccf6;
+ color: navy;
+ border: 0px solid navy;
+}
DIV.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
BORDER: #a52a2a 1px solid;
@@ -259,44 +162,93 @@
TEXT-ALIGN:center;
}
-input.inputerror {
- background-color: #fddbdb;
+/*** calendar picker ***/
+#calendar{
+
}
-textarea.texterror {
- background-color: #fddbdb;
+.dpTbl {
+ border: solid navy 1px;
}
-select.selecterror {
- background-color: #fddbdb;
+.dpTD {
+ border: 0;
+ width:20px;
+ background-color: #EEEEEE;
+ text-align:right;
+ cursor:pointer;
}
+.dpDayHighlight {
+ border: 0;
+ width:20px;
+ background-color: yellow;
+ text-align:right;
+ cursor:pointer;
+}
+.dpTDHover {
+ border: 0;
+ width:20px;
+ background-color: #CCCCCC;
+ text-align:right;
+ cursor:pointer;
+}
+/*** /calendar picker ***/
+/* Table type is used for UI tables type 1 */
+.table1 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+/* Table type is used for UI tables type 2 */
+.table2 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-12 08:09:24
|
Revision: 5594
http://web-erp.svn.sourceforge.net/web-erp/?rev=5594&view=rev
Author: daintree
Date: 2012-08-12 08:09:16 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
fix update salesorderdetails orderlineno may be different in credit note
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/SelectCustomer.php
trunk/SystemParameters.php
trunk/index.php
trunk/sql/mysql/upgrade4.08-4.09.sql
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/Credit_Invoice.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -251,7 +251,6 @@
}
}
-
/* Always display credit quantities
NB QtyDispatched in the LineItems array is used for the quantity to credit */
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $title.'</p>';
@@ -307,14 +306,6 @@
$_SESSION['CreditItems']->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
}
-
-
-
-
-
-
-
-
$LineTotal = $LnItm->QtyDispatched * $LnItm->Price * (1 - $LnItm->DiscountPercent);
if (!isset($_POST['ProcessCredit'])) {
$_SESSION['CreditItems']->total += $LineTotal;
@@ -672,14 +663,19 @@
if ($_POST['CreditType']=='Return'){
- /* some want this some do not */
+ /* some want this some do not
+ * We cannot use the orderlineno to update with as it could be different when added to the credit note than it was when the order was created
+ * Also there could potentially be the same item on the order multiple times with different delivery dates
+ * So all up the SQL below is a bit hit and miss !!
+ * Probably right 99% of time with the item on the order only once */
$SQL = "UPDATE salesorderdetails
SET qtyinvoiced = qtyinvoiced - " . $CreditLine->QtyDispatched . ",
completed=0
WHERE orderno = '" . $_SESSION['CreditItems']->OrderNo . "'
AND stkcode = '" . $CreditLine->StockID . "'
- AND orderlineno='" . $CreditLine->LineNumber."'";
+ AND quantity >=" . $CreditLine->QtyDispatched;
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales order detail record could not be updated for the reduced quantity invoiced because');
$DbgMsg = _('The following SQL to update the sales order detail record was used');
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/SelectCustomer.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -10,7 +10,7 @@
$_SESSION['CustomerID'] = $_GET['Select'];
}
if (!isset($_SESSION['CustomerID'])) { //initialise if not already done
- $_SESSION['CustomerID'] = "";
+ $_SESSION['CustomerID'] = '';
}
if (isset($_GET['Area'])) {
$_POST['Area']=$_GET['Area'];
@@ -44,15 +44,15 @@
$ErrMsg = _('An error occurred in retrieving the information');
$result2 = DB_query($sql, $db, $ErrMsg);
$myrow2 = DB_fetch_array($result2);
- $lat = $myrow2['lat'];
- $lng = $myrow2['lng'];
- $api_key = $myrow['geocode_key'];
+ $Lattitude = $myrow2['lat'];
+ $Longitude = $myrow2['lng'];
+ $API_Key = $myrow['geocode_key'];
$center_long = $myrow['center_long'];
$center_lat = $myrow['center_lat'];
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $API_Key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -60,8 +60,8 @@
var map = new GMap2(document.getElementById("map"));
map.addControl(new GSmallMapControl());
map.addControl(new GMapTypeControl());';
- echo 'map.setCenter(new GLatLng(' . $lat . ', ' . $lng . '), 11);';
- echo 'var marker = new GMarker(new GLatLng(' . $lat . ', ' . $lng . '));';
+ echo 'map.setCenter(new GLatLng(' . $Lattitude . ', ' . $Longitude . '), 11);';
+ echo 'var marker = new GMarker(new GLatLng(' . $Lattitude . ', ' . $Longitude . '));';
echo 'map.addOverlay(marker);
GEvent.addListener(marker, "click", function() {
marker.openInfoWindowHtml(WINDOW_HTML);
@@ -194,13 +194,22 @@
}
if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
- $SQL = "SELECT debtorsmaster.name,
+ if (!isset($_SESSION['BranchCode'])){
+
+ $SQL = "SELECT debtorsmaster.name,
custbranch.phoneno
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
+ WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'";
+
+ } else {
+ $SQL = "SELECT debtorsmaster.name,
+ custbranch.phoneno
+ FROM debtorsmaster INNER JOIN custbranch
+ ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'
AND custbranch.branchcode='" . $_SESSION['BranchCode'] . "'";
-
+ }
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $db, $ErrMsg);
if ($myrow = DB_fetch_array($result)) {
@@ -228,7 +237,9 @@
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
- echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ if (isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])){
+ echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ }
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
@@ -500,7 +511,7 @@
if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
echo '<br />';
- if ($lat == 0) {
+ if ($Lattitude == 0) {
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
} else {
echo '<tr>
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/SystemParameters.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -125,9 +125,11 @@
if ($_SESSION['QuickEntries'] != $_POST['X_QuickEntries'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_QuickEntries']."' WHERE confname = 'QuickEntries'";
}
+
if ($_SESSION['WorkingDaysWeek'] != $_POST['X_WorkingDaysWeek'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_WorkingDaysWeek']."' WHERE confname = 'WorkingDaysWeek'";
}
+
if ($_SESSION['DispatchCutOffTime'] != $_POST['X_DispatchCutOffTime'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DispatchCutOffTime']."' WHERE confname = 'DispatchCutOffTime'";
}
@@ -480,16 +482,18 @@
<td>' . _('Customer branches can be set by default not to print packing slips with the company logo and address. This is useful for companies that ship to customers customers and to show the source of the shipment would be inappropriate. There is an option on the setup of customer branches to ship blind, this setting is the default applied to all new customer branches') . '</td>
</tr>';
-// Working days on a week
-echo '<tr style="outline: 1px solid"><td>' . _('Working Days on a Week') . ':</td>
- <td><select name="X_WorkingDaysWeek">
- <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected="selected" ':'').'value="7">7 '._('working days').'</option>
- <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected="selected" ':'').'value="6">6 '._('working days').'</option>
- <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected="selected" ':'').'value="5">5 '._('working days').'</option>
- </select></td>
- <td>' . _('Number of working days on a week') . '</td>
- </tr>';
+ // Working days on a week
+ echo '<tr style="outline: 1px solid">
+ <td>' . _('Working Days on a Week') . ':</td>
+ <td><select name="X_WorkingDaysWeek">
+ <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected="selected" ':'').'value="7">7 '._('working days').'</option>
+ <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected="selected" ':'').'value="6">6 '._('working days').'</option>
+ <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected="selected" ':'').'value="5">5 '._('working days').'</option>
+ </select></td>
+ <td>' . _('Number of working days on a week') . '</td>
+ </tr>';
+
// DispatchCutOffTime
echo '<tr style="outline: 1px solid"><td>' . _('Dispatch Cut-Off Time') . ':</td>
<td><select name="X_DispatchCutOffTime">';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/index.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -59,7 +59,7 @@
//=== MainMenuDiv =======================================================================
echo '<div id="MainMenuDiv"><ul>'; //===HJ===
$i=0;
-while ($i < count($ModuleLink)){
+while ($i < count($ModuleLink)-1){
// This determines if the user has display access to the module see config.php and header.inc
// for the authorisation and security code
if ($_SESSION['ModulesEnabled'][$i]==1) {
Modified: trunk/sql/mysql/upgrade4.08-4.09.sql
===================================================================
--- trunk/sql/mysql/upgrade4.08-4.09.sql 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/sql/mysql/upgrade4.08-4.09.sql 2012-08-12 08:09:16 UTC (rev 5594)
@@ -18,5 +18,6 @@
INSERT INTO scripts VALUES ('PDFGLJournal.php','15','General Ledger Journal Print');
ALTER TABLE `www_users` ADD `department` INT( 11 ) NOT NULL DEFAULT '0';
+INSERT INTO config VALUES('WorkingDaysWeek','5');
UPDATE config SET confvalue='4.08.2' WHERE confname='VersionNumber';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-12 08:09:24
|
Revision: 5594
http://web-erp.svn.sourceforge.net/web-erp/?rev=5594&view=rev
Author: daintree
Date: 2012-08-12 08:09:16 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
fix update salesorderdetails orderlineno may be different in credit note
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/SelectCustomer.php
trunk/SystemParameters.php
trunk/index.php
trunk/sql/mysql/upgrade4.08-4.09.sql
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/Credit_Invoice.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -251,7 +251,6 @@
}
}
-
/* Always display credit quantities
NB QtyDispatched in the LineItems array is used for the quantity to credit */
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $title.'</p>';
@@ -307,14 +306,6 @@
$_SESSION['CreditItems']->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
}
-
-
-
-
-
-
-
-
$LineTotal = $LnItm->QtyDispatched * $LnItm->Price * (1 - $LnItm->DiscountPercent);
if (!isset($_POST['ProcessCredit'])) {
$_SESSION['CreditItems']->total += $LineTotal;
@@ -672,14 +663,19 @@
if ($_POST['CreditType']=='Return'){
- /* some want this some do not */
+ /* some want this some do not
+ * We cannot use the orderlineno to update with as it could be different when added to the credit note than it was when the order was created
+ * Also there could potentially be the same item on the order multiple times with different delivery dates
+ * So all up the SQL below is a bit hit and miss !!
+ * Probably right 99% of time with the item on the order only once */
$SQL = "UPDATE salesorderdetails
SET qtyinvoiced = qtyinvoiced - " . $CreditLine->QtyDispatched . ",
completed=0
WHERE orderno = '" . $_SESSION['CreditItems']->OrderNo . "'
AND stkcode = '" . $CreditLine->StockID . "'
- AND orderlineno='" . $CreditLine->LineNumber."'";
+ AND quantity >=" . $CreditLine->QtyDispatched;
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales order detail record could not be updated for the reduced quantity invoiced because');
$DbgMsg = _('The following SQL to update the sales order detail record was used');
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/SelectCustomer.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -10,7 +10,7 @@
$_SESSION['CustomerID'] = $_GET['Select'];
}
if (!isset($_SESSION['CustomerID'])) { //initialise if not already done
- $_SESSION['CustomerID'] = "";
+ $_SESSION['CustomerID'] = '';
}
if (isset($_GET['Area'])) {
$_POST['Area']=$_GET['Area'];
@@ -44,15 +44,15 @@
$ErrMsg = _('An error occurred in retrieving the information');
$result2 = DB_query($sql, $db, $ErrMsg);
$myrow2 = DB_fetch_array($result2);
- $lat = $myrow2['lat'];
- $lng = $myrow2['lng'];
- $api_key = $myrow['geocode_key'];
+ $Lattitude = $myrow2['lat'];
+ $Longitude = $myrow2['lng'];
+ $API_Key = $myrow['geocode_key'];
$center_long = $myrow['center_long'];
$center_lat = $myrow['center_lat'];
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $API_Key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -60,8 +60,8 @@
var map = new GMap2(document.getElementById("map"));
map.addControl(new GSmallMapControl());
map.addControl(new GMapTypeControl());';
- echo 'map.setCenter(new GLatLng(' . $lat . ', ' . $lng . '), 11);';
- echo 'var marker = new GMarker(new GLatLng(' . $lat . ', ' . $lng . '));';
+ echo 'map.setCenter(new GLatLng(' . $Lattitude . ', ' . $Longitude . '), 11);';
+ echo 'var marker = new GMarker(new GLatLng(' . $Lattitude . ', ' . $Longitude . '));';
echo 'map.addOverlay(marker);
GEvent.addListener(marker, "click", function() {
marker.openInfoWindowHtml(WINDOW_HTML);
@@ -194,13 +194,22 @@
}
if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
- $SQL = "SELECT debtorsmaster.name,
+ if (!isset($_SESSION['BranchCode'])){
+
+ $SQL = "SELECT debtorsmaster.name,
custbranch.phoneno
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
+ WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'";
+
+ } else {
+ $SQL = "SELECT debtorsmaster.name,
+ custbranch.phoneno
+ FROM debtorsmaster INNER JOIN custbranch
+ ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'
AND custbranch.branchcode='" . $_SESSION['BranchCode'] . "'";
-
+ }
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $db, $ErrMsg);
if ($myrow = DB_fetch_array($result)) {
@@ -228,7 +237,9 @@
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
- echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ if (isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])){
+ echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
+ }
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
@@ -500,7 +511,7 @@
if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
echo '<br />';
- if ($lat == 0) {
+ if ($Lattitude == 0) {
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
} else {
echo '<tr>
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/SystemParameters.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -125,9 +125,11 @@
if ($_SESSION['QuickEntries'] != $_POST['X_QuickEntries'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_QuickEntries']."' WHERE confname = 'QuickEntries'";
}
+
if ($_SESSION['WorkingDaysWeek'] != $_POST['X_WorkingDaysWeek'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_WorkingDaysWeek']."' WHERE confname = 'WorkingDaysWeek'";
}
+
if ($_SESSION['DispatchCutOffTime'] != $_POST['X_DispatchCutOffTime'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DispatchCutOffTime']."' WHERE confname = 'DispatchCutOffTime'";
}
@@ -480,16 +482,18 @@
<td>' . _('Customer branches can be set by default not to print packing slips with the company logo and address. This is useful for companies that ship to customers customers and to show the source of the shipment would be inappropriate. There is an option on the setup of customer branches to ship blind, this setting is the default applied to all new customer branches') . '</td>
</tr>';
-// Working days on a week
-echo '<tr style="outline: 1px solid"><td>' . _('Working Days on a Week') . ':</td>
- <td><select name="X_WorkingDaysWeek">
- <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected="selected" ':'').'value="7">7 '._('working days').'</option>
- <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected="selected" ':'').'value="6">6 '._('working days').'</option>
- <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected="selected" ':'').'value="5">5 '._('working days').'</option>
- </select></td>
- <td>' . _('Number of working days on a week') . '</td>
- </tr>';
+ // Working days on a week
+ echo '<tr style="outline: 1px solid">
+ <td>' . _('Working Days on a Week') . ':</td>
+ <td><select name="X_WorkingDaysWeek">
+ <option '.($_SESSION['WorkingDaysWeek']=='7'?'selected="selected" ':'').'value="7">7 '._('working days').'</option>
+ <option '.($_SESSION['WorkingDaysWeek']=='6'?'selected="selected" ':'').'value="6">6 '._('working days').'</option>
+ <option '.($_SESSION['WorkingDaysWeek']=='5'?'selected="selected" ':'').'value="5">5 '._('working days').'</option>
+ </select></td>
+ <td>' . _('Number of working days on a week') . '</td>
+ </tr>';
+
// DispatchCutOffTime
echo '<tr style="outline: 1px solid"><td>' . _('Dispatch Cut-Off Time') . ':</td>
<td><select name="X_DispatchCutOffTime">';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/index.php 2012-08-12 08:09:16 UTC (rev 5594)
@@ -59,7 +59,7 @@
//=== MainMenuDiv =======================================================================
echo '<div id="MainMenuDiv"><ul>'; //===HJ===
$i=0;
-while ($i < count($ModuleLink)){
+while ($i < count($ModuleLink)-1){
// This determines if the user has display access to the module see config.php and header.inc
// for the authorisation and security code
if ($_SESSION['ModulesEnabled'][$i]==1) {
Modified: trunk/sql/mysql/upgrade4.08-4.09.sql
===================================================================
--- trunk/sql/mysql/upgrade4.08-4.09.sql 2012-08-11 05:56:14 UTC (rev 5593)
+++ trunk/sql/mysql/upgrade4.08-4.09.sql 2012-08-12 08:09:16 UTC (rev 5594)
@@ -18,5 +18,6 @@
INSERT INTO scripts VALUES ('PDFGLJournal.php','15','General Ledger Journal Print');
ALTER TABLE `www_users` ADD `department` INT( 11 ) NOT NULL DEFAULT '0';
+INSERT INTO config VALUES('WorkingDaysWeek','5');
UPDATE config SET confvalue='4.08.2' WHERE confname='VersionNumber';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-19 07:04:07
|
Revision: 5602
http://web-erp.svn.sourceforge.net/web-erp/?rev=5602&view=rev
Author: daintree
Date: 2012-08-19 07:04:01 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Manual/ManualAccountsReceivable.html
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-08-15 06:56:02 UTC (rev 5601)
+++ trunk/SelectCustomer.php 2012-08-19 07:04:01 UTC (rev 5602)
@@ -652,7 +652,13 @@
}
}
// Customer Notes
- $sql = "SELECT * FROM custnotes
+ $sql = "SELECT noteid,
+ debtorno,
+ href,
+ note,
+ date,
+ priority
+ FROM custnotes
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY date DESC";
$result = DB_query($sql, $db);
@@ -677,17 +683,17 @@
echo '<tr class="EvenTableRows">';
$k = 1;
}
- echo '<td>' . $myrow[4] . '</td>
- <td>' . $myrow[3] . '</td>
- <td>' . $myrow[2] . '</td>
- <td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $myrow['note'] . '</td>
+ <td><a href="' . $myrow['href'] . '">' . $myrow['href'] . '</a></td>
+ <td>' . $myrow['priority'] . '</td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow['noteid'] . '&DebtorNo=' . $myrow['debtorno'] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow['noteid'] . '&DebtorNo=' . $myrow['debtorno'] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
} else {
- if ($_SESSION['CustomerID'] != "") {
+ if ($_SESSION['CustomerID'] != '') {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" /><a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note for this Customer') . '</a></div>';
}
}
Modified: trunk/doc/Manual/ManualAccountsReceivable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsReceivable.html 2012-08-15 06:56:02 UTC (rev 5601)
+++ trunk/doc/Manual/ManualAccountsReceivable.html 2012-08-19 07:04:01 UTC (rev 5602)
@@ -20,6 +20,8 @@
<li>Retrospective - de-allocation and re-allocation of receipts or credit notes against charges with re-calculation of differences on exchange and corresponding general ledger journals</li>
<li>Any number of branch - delivery addresses can be added serviced by different sales people with different tax authorities and different areas for sales analysis purposes.</li>
+
+ <li>Unlimited free form notes can be maintained for each customer and an unlimited number of contacts can be stored against each customer></li>
</ul><!-- Help Begin: Customers -->
<div class="floatright">
@@ -185,6 +187,10 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
+<h2><a id="CustomerNotes">Customer Notes</a></h2>
+
+<p>Customer notes containing any text - a web-link if required and a date can be entered from the Select Customer screen - for the selected customer. The notes are displayed in sequence of priority - so pressing issues appear at the top of the list. These notes might contain information about recent contact with the customer or disputes. There is no checking on the content of the notes and no limit to either the number of notes nor the number of characters that can be used.</p>
+
<h2>Shippers</h2>
<p>This table is only used as a reference to the method of transportation that the invoice delivery was effected by. The shippers name is what is used in the look ups and the code is a system maintained counter which is stored in the database to reference the freight company used. The consignment note reference can be stored against the transaction in the reference field. In this way a full proof of delivery trail can be maintained.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-19 07:04:07
|
Revision: 5602
http://web-erp.svn.sourceforge.net/web-erp/?rev=5602&view=rev
Author: daintree
Date: 2012-08-19 07:04:01 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Manual/ManualAccountsReceivable.html
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-08-15 06:56:02 UTC (rev 5601)
+++ trunk/SelectCustomer.php 2012-08-19 07:04:01 UTC (rev 5602)
@@ -652,7 +652,13 @@
}
}
// Customer Notes
- $sql = "SELECT * FROM custnotes
+ $sql = "SELECT noteid,
+ debtorno,
+ href,
+ note,
+ date,
+ priority
+ FROM custnotes
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY date DESC";
$result = DB_query($sql, $db);
@@ -677,17 +683,17 @@
echo '<tr class="EvenTableRows">';
$k = 1;
}
- echo '<td>' . $myrow[4] . '</td>
- <td>' . $myrow[3] . '</td>
- <td>' . $myrow[2] . '</td>
- <td>' . $myrow[5] . '</td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '">' . _('Edit') . '</a></td>
- <td><a href="AddCustomerNotes.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
+ echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
+ <td>' . $myrow['note'] . '</td>
+ <td><a href="' . $myrow['href'] . '">' . $myrow['href'] . '</a></td>
+ <td>' . $myrow['priority'] . '</td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow['noteid'] . '&DebtorNo=' . $myrow['debtorno'] . '">' . _('Edit') . '</a></td>
+ <td><a href="AddCustomerNotes.php?Id=' . $myrow['noteid'] . '&DebtorNo=' . $myrow['debtorno'] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
} else {
- if ($_SESSION['CustomerID'] != "") {
+ if ($_SESSION['CustomerID'] != '') {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" /><a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note for this Customer') . '</a></div>';
}
}
Modified: trunk/doc/Manual/ManualAccountsReceivable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsReceivable.html 2012-08-15 06:56:02 UTC (rev 5601)
+++ trunk/doc/Manual/ManualAccountsReceivable.html 2012-08-19 07:04:01 UTC (rev 5602)
@@ -20,6 +20,8 @@
<li>Retrospective - de-allocation and re-allocation of receipts or credit notes against charges with re-calculation of differences on exchange and corresponding general ledger journals</li>
<li>Any number of branch - delivery addresses can be added serviced by different sales people with different tax authorities and different areas for sales analysis purposes.</li>
+
+ <li>Unlimited free form notes can be maintained for each customer and an unlimited number of contacts can be stored against each customer></li>
</ul><!-- Help Begin: Customers -->
<div class="floatright">
@@ -185,6 +187,10 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
+<h2><a id="CustomerNotes">Customer Notes</a></h2>
+
+<p>Customer notes containing any text - a web-link if required and a date can be entered from the Select Customer screen - for the selected customer. The notes are displayed in sequence of priority - so pressing issues appear at the top of the list. These notes might contain information about recent contact with the customer or disputes. There is no checking on the content of the notes and no limit to either the number of notes nor the number of characters that can be used.</p>
+
<h2>Shippers</h2>
<p>This table is only used as a reference to the method of transportation that the invoice delivery was effected by. The shippers name is what is used in the look ups and the code is a system maintained counter which is stored in the database to reference the freight company used. The consignment note reference can be stored against the transaction in the reference field. In this way a full proof of delivery trail can be maintained.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-20 09:21:50
|
Revision: 5603
http://web-erp.svn.sourceforge.net/web-erp/?rev=5603&view=rev
Author: daintree
Date: 2012-08-20 09:21:43 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
added barcode entry of stock counts
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/StockCounts.php
trunk/doc/Change.log
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/CounterSales.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -244,7 +244,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
@@ -257,7 +257,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
@@ -278,7 +278,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
@@ -291,7 +291,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
@@ -308,7 +308,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
@@ -320,7 +320,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/SelectOrderItems.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -858,7 +858,6 @@
if (DB_num_rows($SearchResult)<$_SESSION['DisplayRecordsMax']){
$Offset=0;
}
-
} //end of if search
#Always do the stuff below if not looking for a customerid
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/StockCounts.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -29,9 +29,9 @@
echo '<table class="selection"><tr>';
if ($_GET['Action']=='View'){
- echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
+ echo '<td><a href="' . $rootpath . '/StockCounts.php?&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
} else {
- echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
+ echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?&Action=View">' . _('View Entered Counts') . '</a></td>';
}
echo '</tr></table><br />';
@@ -44,8 +44,22 @@
$InputError =False; //always assume the best to start with
$Quantity = 'Qty_' . $i;
+ $BarCode = 'BarCode_' . $i;
$StockID = 'StockID_' . $i;
$Reference = 'Ref_' . $i;
+
+ if (strlen($_POST[$BarCode])>0){
+ $sql = "SELECT stockmaster.stockid
+ FROM stockmaster
+ WHERE stockmaster.barcode='". $_POST[$BarCode] ."'";
+
+ $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
+ $DbgMsg = _('The sql that was used to determine if the part being ordered was a kitset or not was ');
+ $KitResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
+ $myrow=DB_fetch_array($KitResult);
+
+ $_POST[$StockID] = strtoupper($myrow['stockid']);
+ }
if (mb_strlen($_POST[$StockID])>0){
if (!is_numeric($_POST[$Quantity])){
@@ -94,21 +108,29 @@
}
}
echo '</select></th></tr>';
- echo "<tr>
- <th>" . _('Stock Code') . "</th>
- <th>" . _('Quantity') . "</th>
- <th>" . _('Reference') . '</th></tr>';
+ echo '<tr>
+ <th>' . _('Bar Code') . '</th>
+ <th>' . _('Stock Code') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Reference') . '</th>
+ </tr>';
for ($i=1;$i<=10;$i++){
echo '<tr>
- <td><input type="text" name="StockID_' . $i . '" maxlength="20" size="20" /></td>
- <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
- <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td></tr>';
+ <td><input type="text" name="BarCode_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="StockID_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
+ <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td>
+ </tr>';
}
- echo '</table><br /><div class="centre"><input type="submit" name="EnterCounts" value="' . _('Enter Above Counts') . '" /></div>';
+ echo '</table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="EnterCounts" value="' . _('Enter Above Counts') . '" />
+ </div>';
//END OF action=ENTER
} elseif ($_GET['Action']=='View'){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/doc/Change.log 2012-08-20 09:21:43 UTC (rev 5603)
@@ -1,4 +1,7 @@
webERP Change Log
+
+20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
+20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
30/7/2012 Exson: fixed that the shipper will change sometime when modify the PO by modify file PO_ReadInOrder.inc. Reported by Craig.
29/7/2012 Phil: install/save.php now uses date_default_timezone_set function to set the time-zone to avoid all the nasty warnings
29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-20 09:21:50
|
Revision: 5603
http://web-erp.svn.sourceforge.net/web-erp/?rev=5603&view=rev
Author: daintree
Date: 2012-08-20 09:21:43 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
added barcode entry of stock counts
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/StockCounts.php
trunk/doc/Change.log
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/CounterSales.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -244,7 +244,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
@@ -257,7 +257,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
@@ -278,7 +278,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
@@ -291,7 +291,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
@@ -308,7 +308,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
@@ -320,7 +320,7 @@
stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
+ WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
AND stockmaster.mbflag <>'G'
AND stockmaster.controlled <> 1
AND stockmaster.discontinued=0
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/SelectOrderItems.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -858,7 +858,6 @@
if (DB_num_rows($SearchResult)<$_SESSION['DisplayRecordsMax']){
$Offset=0;
}
-
} //end of if search
#Always do the stuff below if not looking for a customerid
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/StockCounts.php 2012-08-20 09:21:43 UTC (rev 5603)
@@ -29,9 +29,9 @@
echo '<table class="selection"><tr>';
if ($_GET['Action']=='View'){
- echo '<td><a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
+ echo '<td><a href="' . $rootpath . '/StockCounts.php?&Action=Enter">' . _('Resuming Entering Counts') . '</a> </td><td>' . _('Viewing Entered Counts') . '</td>';
} else {
- echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?' . SID . '&Action=View">' . _('View Entered Counts') . '</a></td>';
+ echo '<td>'._('Entering Counts') .'</td><td> <a href="' . $rootpath . '/StockCounts.php?&Action=View">' . _('View Entered Counts') . '</a></td>';
}
echo '</tr></table><br />';
@@ -44,8 +44,22 @@
$InputError =False; //always assume the best to start with
$Quantity = 'Qty_' . $i;
+ $BarCode = 'BarCode_' . $i;
$StockID = 'StockID_' . $i;
$Reference = 'Ref_' . $i;
+
+ if (strlen($_POST[$BarCode])>0){
+ $sql = "SELECT stockmaster.stockid
+ FROM stockmaster
+ WHERE stockmaster.barcode='". $_POST[$BarCode] ."'";
+
+ $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
+ $DbgMsg = _('The sql that was used to determine if the part being ordered was a kitset or not was ');
+ $KitResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
+ $myrow=DB_fetch_array($KitResult);
+
+ $_POST[$StockID] = strtoupper($myrow['stockid']);
+ }
if (mb_strlen($_POST[$StockID])>0){
if (!is_numeric($_POST[$Quantity])){
@@ -94,21 +108,29 @@
}
}
echo '</select></th></tr>';
- echo "<tr>
- <th>" . _('Stock Code') . "</th>
- <th>" . _('Quantity') . "</th>
- <th>" . _('Reference') . '</th></tr>';
+ echo '<tr>
+ <th>' . _('Bar Code') . '</th>
+ <th>' . _('Stock Code') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Reference') . '</th>
+ </tr>';
for ($i=1;$i<=10;$i++){
echo '<tr>
- <td><input type="text" name="StockID_' . $i . '" maxlength="20" size="20" /></td>
- <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
- <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td></tr>';
+ <td><input type="text" name="BarCode_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="StockID_' . $i . '" maxlength="20" size="20" /></td>
+ <td><input type="text" name="Qty_' . $i . '" maxlength="10" size="10" /></td>
+ <td><input type="text" name="Ref_' . $i . '" maxlength="20" size="20" /></td>
+ </tr>';
}
- echo '</table><br /><div class="centre"><input type="submit" name="EnterCounts" value="' . _('Enter Above Counts') . '" /></div>';
+ echo '</table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="EnterCounts" value="' . _('Enter Above Counts') . '" />
+ </div>';
//END OF action=ENTER
} elseif ($_GET['Action']=='View'){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-19 07:04:01 UTC (rev 5602)
+++ trunk/doc/Change.log 2012-08-20 09:21:43 UTC (rev 5603)
@@ -1,4 +1,7 @@
webERP Change Log
+
+20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
+20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
30/7/2012 Exson: fixed that the shipper will change sometime when modify the PO by modify file PO_ReadInOrder.inc. Reported by Craig.
29/7/2012 Phil: install/save.php now uses date_default_timezone_set function to set the time-zone to avoid all the nasty warnings
29/7/2012 Hindra Joshua: Updates to Professional and Professional-rtl themes - tidy up images not used
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-21 07:48:53
|
Revision: 5605
http://web-erp.svn.sourceforge.net/web-erp/?rev=5605&view=rev
Author: daintree
Date: 2012-08-21 07:48:47 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
allow change to assembly even though purchase orders exist
Modified Paths:
--------------
trunk/Stocks.php
trunk/doc/Change.log
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/Stocks.php 2012-08-21 07:48:47 UTC (rev 5605)
@@ -292,9 +292,13 @@
if ($_POST['MBFlag']=='K' OR $_POST['MBFlag']=='A' OR $_POST['MBFlag']=='D') {
$sql = "SELECT quantityord-quantityrecd
- FROM purchorderdetails
+ FROM purchorderdetails INNER JOIN purchorders
+ ON purchorders.orderno=purchorderdetails.orderno
WHERE itemcode = '".$StockID."'
- AND completed=0";
+ AND purchorderdetails.completed=0
+ AND purchorders.status<>'Cancelled'
+ AND purchorders.status<>'Completed'
+ AND purchorders.status<>'Rejected'";
$result = DB_query($sql,$db);
$ChkPurchOrds = DB_fetch_row($result);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/doc/Change.log 2012-08-21 07:48:47 UTC (rev 5605)
@@ -1,5 +1,6 @@
webERP Change Log
+21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
30/7/2012 Exson: fixed that the shipper will change sometime when modify the PO by modify file PO_ReadInOrder.inc. Reported by Craig.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-21 07:48:53
|
Revision: 5605
http://web-erp.svn.sourceforge.net/web-erp/?rev=5605&view=rev
Author: daintree
Date: 2012-08-21 07:48:47 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
allow change to assembly even though purchase orders exist
Modified Paths:
--------------
trunk/Stocks.php
trunk/doc/Change.log
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/Stocks.php 2012-08-21 07:48:47 UTC (rev 5605)
@@ -292,9 +292,13 @@
if ($_POST['MBFlag']=='K' OR $_POST['MBFlag']=='A' OR $_POST['MBFlag']=='D') {
$sql = "SELECT quantityord-quantityrecd
- FROM purchorderdetails
+ FROM purchorderdetails INNER JOIN purchorders
+ ON purchorders.orderno=purchorderdetails.orderno
WHERE itemcode = '".$StockID."'
- AND completed=0";
+ AND purchorderdetails.completed=0
+ AND purchorders.status<>'Cancelled'
+ AND purchorders.status<>'Completed'
+ AND purchorders.status<>'Rejected'";
$result = DB_query($sql,$db);
$ChkPurchOrds = DB_fetch_row($result);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-20 19:28:15 UTC (rev 5604)
+++ trunk/doc/Change.log 2012-08-21 07:48:47 UTC (rev 5605)
@@ -1,5 +1,6 @@
webERP Change Log
+21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
30/7/2012 Exson: fixed that the shipper will change sometime when modify the PO by modify file PO_ReadInOrder.inc. Reported by Craig.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-24 08:42:50
|
Revision: 5607
http://web-erp.svn.sourceforge.net/web-erp/?rev=5607&view=rev
Author: daintree
Date: 2012-08-24 08:42:38 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
French Canadian translation Serge Gelinas
Modified Paths:
--------------
trunk/Departments.php
trunk/UnitsOfMeasure.php
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/LanguagesArray.php
trunk/includes/Login.php
Added Paths:
-----------
trunk/locale/fr_CA.utf8/
trunk/locale/fr_CA.utf8/LC_MESSAGES/
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/Departments.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -7,7 +7,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' .
- _('Top Sales Order Search') . '" alt="" />' . ' ' . $title . '</p>';
+ _('Search') . '" alt="" />' . ' ' . $title . '</p>';
if ( isset($_GET['SelectedDepartmentID']) )
$SelectedDepartmentID = $_GET['SelectedDepartmentID'];
Modified: trunk/UnitsOfMeasure.php
===================================================================
--- trunk/UnitsOfMeasure.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/UnitsOfMeasure.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -7,7 +7,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' .
- _('Top Sales Order Search') . '" alt="" />' . ' ' . $title . '</p>';
+ _('Search') . '" alt="" />' . ' ' . $title . '</p>';
if ( isset($_GET['SelectedMeasureID']) )
$SelectedMeasureID = $_GET['SelectedMeasureID'];
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/build/make_release.sh 2012-08-24 08:42:38 UTC (rev 5607)
@@ -17,6 +17,7 @@
msgmerge -U --backup=off locale/es_ES.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/et_EE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/fa_IR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U --backup=off locale/fr_CA.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/fr_FR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/hi_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/hr_HR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -40,6 +41,7 @@
msgmerge -U --backup=off locale/zh_TW.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+
msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/cs_CZ.utf8/LC_MESSAGES/messages.mo locale/cs_CZ.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/de_DE.utf8/LC_MESSAGES/messages.mo locale/de_DE.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/doc/Change.log 2012-08-24 08:42:38 UTC (rev 5607)
@@ -1,5 +1,6 @@
webERP Change Log
+24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/doc/Manual/ManualContributors.html 2012-08-24 08:42:38 UTC (rev 5607)
@@ -167,6 +167,8 @@
<br />
Romel Den - Chinese Traditional - UTF-8<br />
<br />
+ Serge Gélinas - French Quebec<br />
+ <br />
Thiago Mansinho de Lima - Portuguese Brazilian<br />
<br />
Roberto del Pino - Spanish<br />
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/includes/LanguagesArray.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -51,6 +51,11 @@
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
+$LanguagesArray['fr_CA.utf8']['LanguageName'] = _('French-Quebec');
+$LanguagesArray['fr_CA.utf8']['WindowsLocale'] = 'french-quebec';
+$LanguagesArray['fr_CA.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['fr_CA.utf8']['ThousandsSeparator'] = ' ';
+
$LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
$LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/includes/Login.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -69,7 +69,7 @@
</form>
</div>
<br />
- <div style="text-align:center"><a href="http://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
+ <div style="text-align:center"><a href="https://sourceforge.net/projects/web-erp"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
<script type="text/javascript">
<!--
Added: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2012-08-24 08:42:38 UTC (rev 5607)
@@ -0,0 +1,41821 @@
+# French Quebec,Ca Translation of webERP
+# Copyright (C) 2005 Logic Works Ltd
+# This file is distributed under the same license as the webERP package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
+#
+# Serge Gélinas<srg...@gm...>, 2012.
+# msgfmt messages.po
+msgid ""
+msgstr ""
+"Project-Id-Version: weberp 3.12\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-24 09:40+1200\n"
+"PO-Revision-Date: 2012-08-22 13:39+0100\n"
+"Last-Translator: Serge Gélinas<srg...@gm...>\n"
+"Language-Team: french <none>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-22 06:25+0000\n"
+"X-Generator: Launchpad (build 12696)\n"
+"Language: \n"
+"Plural-Forms: s\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: QUEBEC\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:375
+msgid "Account Groups"
+msgstr "Groupes"
+
+#: AccountGroups.php:17
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"Une erreur s'est produite lors de la vérification des groupes dont fait "
+"partie le groupe du compte parent"
+
+#: AccountGroups.php:18
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+"Commande SQL d'affichage des groupes dont fait partie le groupe du compte "
+"parent"
+
+#: AccountGroups.php:58 AccountGroups.php:95 AccountGroups.php:176
+#: AccountGroups.php:186
+msgid "The SQL that was used to retrieve the information was"
+msgstr "Commande SQL d'affichage des informations"
+
+#: AccountGroups.php:59
+msgid "Could not check whether the group exists because"
+msgstr "Ne peut pas vérifier si le groupe existe car"
+
+#: AccountGroups.php:66
+msgid "The account group name already exists in the database"
+msgstr "Ce nom de groupe est déjà utilisé"
+
+#: AccountGroups.php:72
+msgid "The account group name cannot contain the character"
+msgstr "Le nom du groupe ne doit pas contenir le caractère"
+
+#: AccountGroups.php:72 Departments.php:30 TaxCategories.php:31
+msgid "or the character"
+msgstr "ou le caractère"
+
+#: AccountGroups.php:78
+msgid "The account group name must be at least one character long"
+msgstr "Le nom du groupe compte doit contenir au moins un caractère"
+
+#: AccountGroups.php:85
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+"Le choix de ce groupe mène à une impasse. Sélectionnez un autre groupe ou "
+"modifier ce groupe de manière à ce qu'il se trouve au plus niveau (groupe "
+"parent)"
+
+#: AccountGroups.php:96
+msgid "Could not check whether the group is recursive because"
+msgstr "Ne peut pas vérifier si le groupe est récursif car"
+
+#: AccountGroups.php:104
+msgid ""
+"Since this account group is a child group, the sequence in the trial "
+"balance, the section in the accounts and whether or not the account group "
+"appears in the balance sheet or profit and loss account are all properties "
+"inherited from the parent account group. Any changes made to these fields "
+"will have no effect."
+msgstr ""
+"Comme ce groupe est un groupe enfant, la séquence des transferts, la place "
+"dans les rubriques des comptes, si le groupe est nommé ou non dans la "
+"balance ou dans le compte 'pertes et profits' sont alors des propriétés "
+"héritées du groupe parent. Tout changement dans ces champs NE sera PAS pris "
+"en compte."
+
+#: AccountGroups.php:109
+msgid "The section in accounts must be an integer"
+msgstr "Cette rubrique doit contenir un entier"
+
+#: AccountGroups.php:115
+#, fuzzy
+msgid "The sequence in the trial balance must be an integer"
+msgstr "Cette rubrique doit contenir un entier"
+
+#: AccountGroups.php:121
+#, fuzzy
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "La quantité du lot doit être numérique"
+
+#: AccountGroups.php:137
+msgid "An error occurred in updating the account group"
+msgstr "Une erreur s'est produite dans la mise à jour du groupe"
+
+#: AccountGroups.php:138
+msgid "The SQL that was used to update the account group was"
+msgstr "Commande SQL de modification du groupe"
+
+#: AccountGroups.php:140 AccountSections.php:98 PaymentMethods.php:83
+msgid "Record Updated"
+msgstr "Fiche mise à jour"
+
+#: AccountGroups.php:156
+msgid "An error occurred in inserting the account group"
+msgstr "Une erreur s'est produite dans l'insertion du groupe"
+
+#: AccountGroups.php:157
+msgid "The SQL that was used to insert the account group was"
+msgstr "Commande SQL d'insertion du groupe"
+
+#: AccountGroups.php:158 AccountSections.php:108
+msgid "Record inserted"
+msgstr "Fiche créée"
+
+#: AccountGroups.php:175
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+"Une erreur s'est produite lors de la récupération des informations de groupe "
+"depuis chartmaster"
+
+#: AccountGroups.php:180
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr "Ce groupe ne peut pas être supprimé car les comptes du GL l'utilisent."
+
+#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:130
+#: Areas.php:114 Areas.php:123 BankAccounts.php:158 CreditStatus.php:125
+#: Currencies.php:166 Currencies.php:174 Currencies.php:182
+#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
+#: CustomerBranches.php:316 Customers.php:289 Customers.php:298
+#: Customers.php:306 Customers.php:314 CustomerTypes.php:147
+#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
+#: Locations.php:237 Locations.php:245 Locations.php:256 Locations.php:265
+#: Locations.php:274 Locations.php:283 Locations.php:292 Locations.php:301
+#: Locations.php:309 MRPDemandTypes.php:87 PaymentMethods.php:142
+#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:158
+#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
+#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
+#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:187
+#: Stocks.php:653 Stocks.php:662 Stocks.php:670 Stocks.php:678 Stocks.php:686
+#: Stocks.php:694 Suppliers.php:612 Suppliers.php:621 Suppliers.php:629
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
+#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+msgid "There are"
+msgstr "Il y a"
+
+#: AccountGroups.php:181
+msgid "general ledger accounts that refer to this account group"
+msgstr "Comptes du GL se référant à ce groupe"
+
+#: AccountGroups.php:185
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+"Une erreur s'est produite lors la récupération des informations du groupe "
+"parent"
+
+#: AccountGroups.php:190
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+"Impossible de supprimer ce groupe, car un/des sous-groupe(s) est/sont membre"
+"(s) de ce groupe"
+
+#: AccountGroups.php:191
+msgid "account groups that have this group as its/there parent account group"
+msgstr "Sous-groupes de ce groupe parent"
+
+#: AccountGroups.php:194
+msgid "An error occurred in deleting the account group"
+msgstr "Une erreur s'est produite lors de la suppression du groupe"
+
+#: AccountGroups.php:195
+msgid "The SQL that was used to delete the account group was"
+msgstr "Commande SQL de suppression du groupe"
+
+#: AccountGroups.php:197
+msgid "group has been deleted"
+msgstr "le groupe a été supprimé"
+
+#: AccountGroups.php:222
+msgid "The sql that was used to retrieve the account group information was "
+msgstr "Commande SQL d'affichage les informations du groupe"
+
+#: AccountGroups.php:223
+msgid "Could not get account groups because"
+msgstr "Impossible d'accèder aux groupes car"
+
+#: AccountGroups.php:225 AccountSections.php:169 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
+#: Areas.php:143 AuditTrail.php:11 BankReconciliation.php:14
+#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2037
+#: CounterSales.php:2163 Credit_Invoice.php:255 CreditStatus.php:21
+#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
+#: DiscountCategories.php:134 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249 FixedAssetTransfer.php:32 FormDesigner.php:129
+#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournal.php:247
+#: InternalStockRequest.php:281 InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:467 MRPReport.php:516 NoSalesItems.php:93
+#: OutstandingGRNs.php:163 PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:190 PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
+#: PurchData.php:152 PurchData.php:286 PurchData.php:312
+#: RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
+#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:35
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
+#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
+#: SelectCreditItems.php:287 SelectCustomer.php:263 SelectGLAccount.php:17
+#: SelectGLAccount.php:87 SelectOrderItems.php:586 SelectOrderItems.php:1498
+#: SelectOrderItems.php:1620 SelectProduct.php:505 SelectSalesOrder.php:534
+#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:28
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
+#: SupplierPriceList.php:214 SupplierPriceList.php:384
+#: SupplierPriceList.php:388 SupplierPriceList.php:439
+#: SupplierPriceList.php:489 Suppliers.php:302 SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: TaxProvinces.php:11 TopItems.php:114 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:162 WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42 WWW_Access.php:11 WWW_Users.php:33
+#: Z_BottomUpCosts.php:57
+msgid "Search"
+msgstr "Recherche"
+
+#: AccountGroups.php:229
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: AccountGroups.php:230 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+msgid "Section"
+msgstr "Rubrique"
+
+#: AccountGroups.php:231 AccountGroups.php:410
+msgid "Sequence In TB"
+msgstr "Indexe dans balance"
+
+#: AccountGroups.php:232 AccountGroups.php:393 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
+#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+msgid "Profit and Loss"
+msgstr "Pertes et profits"
+
+#: AccountGroups.php:233 AccountGroups.php:354
+msgid "Parent Group"
+msgstr "Groupe parent"
+
+#: AccountGroups.php:249 AccountGroups.php:252 AccountGroups.php:397
+#: AccountGroups.php:399 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: CompanyPreferences.php:477 CompanyPreferences.php:479
+#: CompanyPreferences.php:492 CompanyPreferences.php:494
+#: CompanyPreferences.php:507 CompanyPreferences.php:509
+#: ContractCosting.php:198 CustomerBranches.php:411 Customers.php:594
+#: Customers.php:947 Customers.php:956 Customers.php:959
+#: DeliveryDetails.php:1082 DeliveryDetails.php:1125 DeliveryDetails.php:1128
+#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
+#: MRPCalendar.php:224 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
+#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280
+#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:243
+#: PDFChequeListing.php:63 PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:792 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
+#: PurchData.php:212 PurchData.php:554 PurchData.php:557
+#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
+#: SalesPeople.php:358 SelectProduct.php:385 ShipmentCosting.php:667
+#: Stocks.php:1051 Stocks.php:1053 Stocks.php:1076 Stocks.php:1078
+#: SuppContractChgs.php:90 SystemParameters.php:401 SystemParameters.php:424
+#: SystemParameters.php:440 SystemParameters.php:503 SystemParameters.php:511
+#: SystemParameters.php:551 SystemParameters.php:631 SystemParameters.php:640
+#: SystemParameters.php:648 SystemParameters.php:666 SystemParameters.php:673
+#: SystemParameters.php:717 SystemParameters.php:813 SystemParameters.php:948
+#: SystemParameters.php:950 SystemParameters.php:960 SystemParameters.php:962
+#: SystemParameters.php:1016 SystemParameters.php:1028
+#: SystemParameters.php:1030 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:371 WWW_Users.php:484 WWW_Users.php:486 WWW_Users.php:657
+#: WWW_Users.php:659
+msgid "Yes"
+msgstr "Oui"
+
+#: AccountGroups.php:255 AccountGroups.php:402 AccountGroups.php:404
+#: BankAccounts.php:209 BankAccounts.php:378 BankAccounts.php:380
+#: BankAccounts.php:384 BankAccounts.php:392 BOMs.php:126 BOMs.php:771
+#: BOMs.php:775 CompanyPreferences.php:476 CompanyPreferences.php:480
+#: CompanyPreferences.php:491 CompanyPreferences.php:495
+#: CompanyPreferences.php:506 CompanyPreferences.php:510
+#: ContractCosting.php:196 CustomerBranches.php:411 Customers.php:593
+#: Customers.php:942 Customers.php:955 Customers.php:958
+#: DeliveryDetails.php:1083 DeliveryDetails.php:1126 DeliveryDetails.php:1129
+#: GLTransInquiry.php:86 Labels.php:490 Labels.php:494 Labels.php:519
+#: MRPCalendar.php:226 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
+#: NoSalesItems.php:153 PaymentMethods.php:204 PaymentMethods.php:205
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274
+#: PaymentMethods.php:281 PaymentMethods.php:288 PaymentMethods.php:295
+#: PcAuthorizeExpenses.php:241 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
+#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
+#: PO_Header.php:791 PO_PDFPurchOrder.php:393 PO_PDFPurchOrder.php:396
+#: PurchData.php:215 PurchData.php:555 PurchData.php:558
+#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
+#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423 SalesAnalRepts.php:416 SalesAnalRepts.php:419
+#: SalesAnalRepts.php:444 SalesAnalRepts.php:447 SalesAnalRepts.php:472
+#: SalesAnalRepts.php:475 SalesPeople.php:221 SalesPeople.php:361
+#: SalesPeople.php:363 SelectProduct.php:387 ShipmentCosting.php:668
+#: Stocks.php:1046 Stocks.php:1048 Stocks.php:1071 Stocks.php:1073
+#: SuppContractChgs.php:92 SystemParameters.php:402 SystemParameters.php:425
+#: SystemParameters.php:441 SystemParameters.php:504 SystemParameters.php:512
+#: SystemParameters.php:552 SystemParameters.php:632 SystemParameters.php:641
+#: SystemParameters.php:649 SystemParameters.php:667 SystemParameters.php:674
+#: SystemParameters.php:718 SystemParameters.php:814 SystemParameters.php:947
+#: SystemParameters.php:951 SystemParameters.php:959 SystemParameters.php:963
+#: SystemParameters.php:1017 SystemParameters.php:1027
+#: SystemParameters.php:1031 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:373 WWW_Users.php:483 WWW_Users.php:487 WWW_Users.php:656
+#: WWW_Users.php:660 includes/PDFLowGPPageHeader.inc:44
+#: includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "Non"
+
+#: AccountGroups.php:264 AccountSections.php:189 AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:163
+#: BankAccounts.php:222 BOMs.php:151 COGSGLPostings.php:108
+#: COGSGLPostings.php:206 CreditStatus.php:175 Currencies.php:272
+#: CustomerBranches.php:415 Customers.php:1033 Customers.php:1067
+#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
+#: Factors.php:334 FixedAssetCategories.php:187 FixedAssetLocations.php:107
+#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:93
+#: InternalStockRequest.php:263 Labels.php:223 Labels.php:248
+#: Locations.php:391 MRPDemands.php:309 MRPDemandTypes.php:120
+#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:273
+#: PcClaimExpensesFromTab.php:265 PcExpenses.php:223 PcTabs.php:233
+#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
+#: Prices.php:249 PurchData.php:227 SalesCategories.php:256
+#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
+#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:615
+#: SelectCustomer.php:633 SelectCustomer.php:656 SelectCustomer.php:673
+#: SelectCustomer.php:696 SelectCustomer.php:713 Shippers.php:144
+#: StockCategories.php:263 SupplierContacts.php:163
+#: SupplierTenderCreate.php:145 SupplierTypes.php:189
+#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
+#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
+#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:325
+#: includes/InputSerialItems.php:90 includes/OutputSerialItems.php:20
+#, php-format
+msgid "Edit"
+msgstr "Modifier"
+
+#: AccountGroups.php:265
+msgid "Are you sure you wish to delete this account group?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce groupe?"
+
+#: AccountGroups.php:265 AccountSections.php:193 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:164
+#: BankAccounts.php:223 BOMs.php:153 COGSGLPostings.php:109
+#: COGSGLPostings.php:207 ContractBOM.php:267 ContractOtherReqts.php:120
+#: CounterSales.php:830 Credit_Invoice.php:401 CreditStatus.php:176
+#: Currencies.php:275 CustomerReceipt.php:925 Customers.php:1068
+#: CustomerTypes.php:207 Departments.php:187 DiscountCategories.php:223
+#: DiscountMatrix.php:183 EDIMessageFormat.php:151
+#: FixedAssetCategories.php:188 FreightCosts.php:243 GeocodeSetup.php:174
+#: GLAccounts.php:313 GLJournal.php:426 GLTags.php:94
+#: InternalStockRequest.php:264 Labels.php:224 Labels.php:249 Labels.php:497
+#: Locations.php:392 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:209 Payments.php:1083 PaymentTerms.php:206
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:266 PcExpenses.php:224
+#: PcExpensesTypeTab.php:187 PcTabs.php:234 PcTypeTabs.php:175
+#: PO_AuthorisationLevels.php:153 PO_Items.php:712 Prices_Customer.php:279
+#: Prices.php:250 PurchData.php:229 SalesAnalReptCols.php:299
+#: SalesAnalRepts.php:304 SalesCategories.php:257 SalesGLPostings.php:133
+#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
+#: SecurityTokens.php:131 SelectCreditItems.php:767 SelectCustomer.php:616
+#: SelectCustomer.php:634 SelectCustomer.php:657 SelectCustomer.php:674
+#: SelectCustomer.php:697 SelectCustomer.php:714 SelectOrderItems.php:1417
+#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:264 StockCategories.php:586 StockLocTransfer.php:332
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTenderCreate.php:401
+#: SupplierTenderCreate.php:429 SupplierTypes.php:191 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
+#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
+#: WorkCentres.php:142 WOSerialNos.php:321 WWW_Access.php:124
+#: WWW_Users.php:326 includes/InputSerialItemsKeyed.php:58
+#: includes/OutputSerialItems.php:99
+#, php-format
+msgid "Delete"
+msgstr "Supprimer"
+
+#: AccountGroups.php:273
+msgid "Review Account Groups"
+msgstr "Lister les groupes"
+
+#: AccountGroups.php:293
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+"Une erreur s'est produite lors la récupération des informations du groupe"
+
+#: AccountGroups.php:294
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr "Commande SQL d'affichage du groupe"
+
+#: AccountGroups.php:297
+msgid "The account group name does not exist in the database"
+msgstr "Le nom du groupe n'existe pas dans la base de données"
+
+#: AccountGroups.php:311
+#, fuzzy
+msgid "Edit Account Group Details"
+msgstr "Détails sur le Groupe compte"
+
+#: AccountGroups.php:319 GLAccounts.php:244 GLAccounts.php:292
+#: Z_ImportGLAccountGroups.php:26
+msgid "Account Group"
+msgstr "Groupe"
+
+#: AccountGroups.php:343
+#, fuzzy
+msgid "New Account Group Details"
+msgstr "Détails sur le Groupe compte"
+
+#: AccountGroups.php:349
+msgid "Account Group Name"
+msgstr "Nom du groupe"
+
+#: AccountGroups.php:360 AccountGroups.php:362
+msgid "Top Level Group"
+msgstr "Groupe parent"
+
+#: AccountGroups.php:377
+msgid "Section In Accounts"
+msgstr "Rubrique des comptes"
+
+#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
+#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
+#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
+#: Departments.php:255 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:347 FixedAssetLocations.php:157
+#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:262 Labels.php:531
+#: Locations.php:607 MRPDemands.php:424 MRPDemandTypes.php:188
+#: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
+#: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
+#: SalesAnalReptCols.php:552 SalesAnalRepts.php:516 SalesGLPostings.php:417
+#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:613
+#: SupplierContacts.php:282 SuppLoginSetup.php:295 TaxAuthorities.php:329
+#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
+#: WorkCentres.php:280 WWW_Users.php:699
+msgid "Enter Information"
+msgstr "Valider"
+
+#: AccountSections.php...
[truncated message content] |
|
From: <dai...@us...> - 2012-08-24 08:42:51
|
Revision: 5607
http://web-erp.svn.sourceforge.net/web-erp/?rev=5607&view=rev
Author: daintree
Date: 2012-08-24 08:42:38 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
French Canadian translation Serge Gelinas
Modified Paths:
--------------
trunk/Departments.php
trunk/UnitsOfMeasure.php
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/LanguagesArray.php
trunk/includes/Login.php
Added Paths:
-----------
trunk/locale/fr_CA.utf8/
trunk/locale/fr_CA.utf8/LC_MESSAGES/
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/Departments.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -7,7 +7,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' .
- _('Top Sales Order Search') . '" alt="" />' . ' ' . $title . '</p>';
+ _('Search') . '" alt="" />' . ' ' . $title . '</p>';
if ( isset($_GET['SelectedDepartmentID']) )
$SelectedDepartmentID = $_GET['SelectedDepartmentID'];
Modified: trunk/UnitsOfMeasure.php
===================================================================
--- trunk/UnitsOfMeasure.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/UnitsOfMeasure.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -7,7 +7,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' .
- _('Top Sales Order Search') . '" alt="" />' . ' ' . $title . '</p>';
+ _('Search') . '" alt="" />' . ' ' . $title . '</p>';
if ( isset($_GET['SelectedMeasureID']) )
$SelectedMeasureID = $_GET['SelectedMeasureID'];
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/build/make_release.sh 2012-08-24 08:42:38 UTC (rev 5607)
@@ -17,6 +17,7 @@
msgmerge -U --backup=off locale/es_ES.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/et_EE.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/fa_IR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U --backup=off locale/fr_CA.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/fr_FR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/hi_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/hr_HR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -40,6 +41,7 @@
msgmerge -U --backup=off locale/zh_TW.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+
msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/cs_CZ.utf8/LC_MESSAGES/messages.mo locale/cs_CZ.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/de_DE.utf8/LC_MESSAGES/messages.mo locale/de_DE.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/doc/Change.log 2012-08-24 08:42:38 UTC (rev 5607)
@@ -1,5 +1,6 @@
webERP Change Log
+24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/doc/Manual/ManualContributors.html 2012-08-24 08:42:38 UTC (rev 5607)
@@ -167,6 +167,8 @@
<br />
Romel Den - Chinese Traditional - UTF-8<br />
<br />
+ Serge Gélinas - French Quebec<br />
+ <br />
Thiago Mansinho de Lima - Portuguese Brazilian<br />
<br />
Roberto del Pino - Spanish<br />
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/includes/LanguagesArray.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -51,6 +51,11 @@
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
+$LanguagesArray['fr_CA.utf8']['LanguageName'] = _('French-Quebec');
+$LanguagesArray['fr_CA.utf8']['WindowsLocale'] = 'french-quebec';
+$LanguagesArray['fr_CA.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['fr_CA.utf8']['ThousandsSeparator'] = ' ';
+
$LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
$LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2012-08-21 07:54:46 UTC (rev 5606)
+++ trunk/includes/Login.php 2012-08-24 08:42:38 UTC (rev 5607)
@@ -69,7 +69,7 @@
</form>
</div>
<br />
- <div style="text-align:center"><a href="http://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
+ <div style="text-align:center"><a href="https://sourceforge.net/projects/web-erp"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
<script type="text/javascript">
<!--
Added: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Property changes on: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2012-08-24 08:42:38 UTC (rev 5607)
@@ -0,0 +1,41821 @@
+# French Quebec,Ca Translation of webERP
+# Copyright (C) 2005 Logic Works Ltd
+# This file is distributed under the same license as the webERP package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
+#
+# Serge Gélinas<srg...@gm...>, 2012.
+# msgfmt messages.po
+msgid ""
+msgstr ""
+"Project-Id-Version: weberp 3.12\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-24 09:40+1200\n"
+"PO-Revision-Date: 2012-08-22 13:39+0100\n"
+"Last-Translator: Serge Gélinas<srg...@gm...>\n"
+"Language-Team: french <none>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-22 06:25+0000\n"
+"X-Generator: Launchpad (build 12696)\n"
+"Language: \n"
+"Plural-Forms: s\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: QUEBEC\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:375
+msgid "Account Groups"
+msgstr "Groupes"
+
+#: AccountGroups.php:17
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"Une erreur s'est produite lors de la vérification des groupes dont fait "
+"partie le groupe du compte parent"
+
+#: AccountGroups.php:18
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+"Commande SQL d'affichage des groupes dont fait partie le groupe du compte "
+"parent"
+
+#: AccountGroups.php:58 AccountGroups.php:95 AccountGroups.php:176
+#: AccountGroups.php:186
+msgid "The SQL that was used to retrieve the information was"
+msgstr "Commande SQL d'affichage des informations"
+
+#: AccountGroups.php:59
+msgid "Could not check whether the group exists because"
+msgstr "Ne peut pas vérifier si le groupe existe car"
+
+#: AccountGroups.php:66
+msgid "The account group name already exists in the database"
+msgstr "Ce nom de groupe est déjà utilisé"
+
+#: AccountGroups.php:72
+msgid "The account group name cannot contain the character"
+msgstr "Le nom du groupe ne doit pas contenir le caractère"
+
+#: AccountGroups.php:72 Departments.php:30 TaxCategories.php:31
+msgid "or the character"
+msgstr "ou le caractère"
+
+#: AccountGroups.php:78
+msgid "The account group name must be at least one character long"
+msgstr "Le nom du groupe compte doit contenir au moins un caractère"
+
+#: AccountGroups.php:85
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+"Le choix de ce groupe mène à une impasse. Sélectionnez un autre groupe ou "
+"modifier ce groupe de manière à ce qu'il se trouve au plus niveau (groupe "
+"parent)"
+
+#: AccountGroups.php:96
+msgid "Could not check whether the group is recursive because"
+msgstr "Ne peut pas vérifier si le groupe est récursif car"
+
+#: AccountGroups.php:104
+msgid ""
+"Since this account group is a child group, the sequence in the trial "
+"balance, the section in the accounts and whether or not the account group "
+"appears in the balance sheet or profit and loss account are all properties "
+"inherited from the parent account group. Any changes made to these fields "
+"will have no effect."
+msgstr ""
+"Comme ce groupe est un groupe enfant, la séquence des transferts, la place "
+"dans les rubriques des comptes, si le groupe est nommé ou non dans la "
+"balance ou dans le compte 'pertes et profits' sont alors des propriétés "
+"héritées du groupe parent. Tout changement dans ces champs NE sera PAS pris "
+"en compte."
+
+#: AccountGroups.php:109
+msgid "The section in accounts must be an integer"
+msgstr "Cette rubrique doit contenir un entier"
+
+#: AccountGroups.php:115
+#, fuzzy
+msgid "The sequence in the trial balance must be an integer"
+msgstr "Cette rubrique doit contenir un entier"
+
+#: AccountGroups.php:121
+#, fuzzy
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "La quantité du lot doit être numérique"
+
+#: AccountGroups.php:137
+msgid "An error occurred in updating the account group"
+msgstr "Une erreur s'est produite dans la mise à jour du groupe"
+
+#: AccountGroups.php:138
+msgid "The SQL that was used to update the account group was"
+msgstr "Commande SQL de modification du groupe"
+
+#: AccountGroups.php:140 AccountSections.php:98 PaymentMethods.php:83
+msgid "Record Updated"
+msgstr "Fiche mise à jour"
+
+#: AccountGroups.php:156
+msgid "An error occurred in inserting the account group"
+msgstr "Une erreur s'est produite dans l'insertion du groupe"
+
+#: AccountGroups.php:157
+msgid "The SQL that was used to insert the account group was"
+msgstr "Commande SQL d'insertion du groupe"
+
+#: AccountGroups.php:158 AccountSections.php:108
+msgid "Record inserted"
+msgstr "Fiche créée"
+
+#: AccountGroups.php:175
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+"Une erreur s'est produite lors de la récupération des informations de groupe "
+"depuis chartmaster"
+
+#: AccountGroups.php:180
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr "Ce groupe ne peut pas être supprimé car les comptes du GL l'utilisent."
+
+#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:130
+#: Areas.php:114 Areas.php:123 BankAccounts.php:158 CreditStatus.php:125
+#: Currencies.php:166 Currencies.php:174 Currencies.php:182
+#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
+#: CustomerBranches.php:316 Customers.php:289 Customers.php:298
+#: Customers.php:306 Customers.php:314 CustomerTypes.php:147
+#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
+#: Locations.php:237 Locations.php:245 Locations.php:256 Locations.php:265
+#: Locations.php:274 Locations.php:283 Locations.php:292 Locations.php:301
+#: Locations.php:309 MRPDemandTypes.php:87 PaymentMethods.php:142
+#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:158
+#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
+#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
+#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:187
+#: Stocks.php:653 Stocks.php:662 Stocks.php:670 Stocks.php:678 Stocks.php:686
+#: Stocks.php:694 Suppliers.php:612 Suppliers.php:621 Suppliers.php:629
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
+#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+msgid "There are"
+msgstr "Il y a"
+
+#: AccountGroups.php:181
+msgid "general ledger accounts that refer to this account group"
+msgstr "Comptes du GL se référant à ce groupe"
+
+#: AccountGroups.php:185
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+"Une erreur s'est produite lors la récupération des informations du groupe "
+"parent"
+
+#: AccountGroups.php:190
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+"Impossible de supprimer ce groupe, car un/des sous-groupe(s) est/sont membre"
+"(s) de ce groupe"
+
+#: AccountGroups.php:191
+msgid "account groups that have this group as its/there parent account group"
+msgstr "Sous-groupes de ce groupe parent"
+
+#: AccountGroups.php:194
+msgid "An error occurred in deleting the account group"
+msgstr "Une erreur s'est produite lors de la suppression du groupe"
+
+#: AccountGroups.php:195
+msgid "The SQL that was used to delete the account group was"
+msgstr "Commande SQL de suppression du groupe"
+
+#: AccountGroups.php:197
+msgid "group has been deleted"
+msgstr "le groupe a été supprimé"
+
+#: AccountGroups.php:222
+msgid "The sql that was used to retrieve the account group information was "
+msgstr "Commande SQL d'affichage les informations du groupe"
+
+#: AccountGroups.php:223
+msgid "Could not get account groups because"
+msgstr "Impossible d'accèder aux groupes car"
+
+#: AccountGroups.php:225 AccountSections.php:169 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
+#: Areas.php:143 AuditTrail.php:11 BankReconciliation.php:14
+#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2037
+#: CounterSales.php:2163 Credit_Invoice.php:255 CreditStatus.php:21
+#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
+#: DiscountCategories.php:134 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249 FixedAssetTransfer.php:32 FormDesigner.php:129
+#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournal.php:247
+#: InternalStockRequest.php:281 InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:467 MRPReport.php:516 NoSalesItems.php:93
+#: OutstandingGRNs.php:163 PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:190 PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
+#: PurchData.php:152 PurchData.php:286 PurchData.php:312
+#: RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
+#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:35
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
+#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
+#: SelectCreditItems.php:287 SelectCustomer.php:263 SelectGLAccount.php:17
+#: SelectGLAccount.php:87 SelectOrderItems.php:586 SelectOrderItems.php:1498
+#: SelectOrderItems.php:1620 SelectProduct.php:505 SelectSalesOrder.php:534
+#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:28
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
+#: SupplierPriceList.php:214 SupplierPriceList.php:384
+#: SupplierPriceList.php:388 SupplierPriceList.php:439
+#: SupplierPriceList.php:489 Suppliers.php:302 SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: TaxProvinces.php:11 TopItems.php:114 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:162 WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42 WWW_Access.php:11 WWW_Users.php:33
+#: Z_BottomUpCosts.php:57
+msgid "Search"
+msgstr "Recherche"
+
+#: AccountGroups.php:229
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: AccountGroups.php:230 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+msgid "Section"
+msgstr "Rubrique"
+
+#: AccountGroups.php:231 AccountGroups.php:410
+msgid "Sequence In TB"
+msgstr "Indexe dans balance"
+
+#: AccountGroups.php:232 AccountGroups.php:393 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
+#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+msgid "Profit and Loss"
+msgstr "Pertes et profits"
+
+#: AccountGroups.php:233 AccountGroups.php:354
+msgid "Parent Group"
+msgstr "Groupe parent"
+
+#: AccountGroups.php:249 AccountGroups.php:252 AccountGroups.php:397
+#: AccountGroups.php:399 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: CompanyPreferences.php:477 CompanyPreferences.php:479
+#: CompanyPreferences.php:492 CompanyPreferences.php:494
+#: CompanyPreferences.php:507 CompanyPreferences.php:509
+#: ContractCosting.php:198 CustomerBranches.php:411 Customers.php:594
+#: Customers.php:947 Customers.php:956 Customers.php:959
+#: DeliveryDetails.php:1082 DeliveryDetails.php:1125 DeliveryDetails.php:1128
+#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
+#: MRPCalendar.php:224 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
+#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280
+#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:243
+#: PDFChequeListing.php:63 PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:792 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
+#: PurchData.php:212 PurchData.php:554 PurchData.php:557
+#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
+#: SalesPeople.php:358 SelectProduct.php:385 ShipmentCosting.php:667
+#: Stocks.php:1051 Stocks.php:1053 Stocks.php:1076 Stocks.php:1078
+#: SuppContractChgs.php:90 SystemParameters.php:401 SystemParameters.php:424
+#: SystemParameters.php:440 SystemParameters.php:503 SystemParameters.php:511
+#: SystemParameters.php:551 SystemParameters.php:631 SystemParameters.php:640
+#: SystemParameters.php:648 SystemParameters.php:666 SystemParameters.php:673
+#: SystemParameters.php:717 SystemParameters.php:813 SystemParameters.php:948
+#: SystemParameters.php:950 SystemParameters.php:960 SystemParameters.php:962
+#: SystemParameters.php:1016 SystemParameters.php:1028
+#: SystemParameters.php:1030 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:371 WWW_Users.php:484 WWW_Users.php:486 WWW_Users.php:657
+#: WWW_Users.php:659
+msgid "Yes"
+msgstr "Oui"
+
+#: AccountGroups.php:255 AccountGroups.php:402 AccountGroups.php:404
+#: BankAccounts.php:209 BankAccounts.php:378 BankAccounts.php:380
+#: BankAccounts.php:384 BankAccounts.php:392 BOMs.php:126 BOMs.php:771
+#: BOMs.php:775 CompanyPreferences.php:476 CompanyPreferences.php:480
+#: CompanyPreferences.php:491 CompanyPreferences.php:495
+#: CompanyPreferences.php:506 CompanyPreferences.php:510
+#: ContractCosting.php:196 CustomerBranches.php:411 Customers.php:593
+#: Customers.php:942 Customers.php:955 Customers.php:958
+#: DeliveryDetails.php:1083 DeliveryDetails.php:1126 DeliveryDetails.php:1129
+#: GLTransInquiry.php:86 Labels.php:490 Labels.php:494 Labels.php:519
+#: MRPCalendar.php:226 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
+#: NoSalesItems.php:153 PaymentMethods.php:204 PaymentMethods.php:205
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274
+#: PaymentMethods.php:281 PaymentMethods.php:288 PaymentMethods.php:295
+#: PcAuthorizeExpenses.php:241 PDFChequeListing.php:62
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
+#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
+#: PO_Header.php:791 PO_PDFPurchOrder.php:393 PO_PDFPurchOrder.php:396
+#: PurchData.php:215 PurchData.php:555 PurchData.php:558
+#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
+#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423 SalesAnalRepts.php:416 SalesAnalRepts.php:419
+#: SalesAnalRepts.php:444 SalesAnalRepts.php:447 SalesAnalRepts.php:472
+#: SalesAnalRepts.php:475 SalesPeople.php:221 SalesPeople.php:361
+#: SalesPeople.php:363 SelectProduct.php:387 ShipmentCosting.php:668
+#: Stocks.php:1046 Stocks.php:1048 Stocks.php:1071 Stocks.php:1073
+#: SuppContractChgs.php:92 SystemParameters.php:402 SystemParameters.php:425
+#: SystemParameters.php:441 SystemParameters.php:504 SystemParameters.php:512
+#: SystemParameters.php:552 SystemParameters.php:632 SystemParameters.php:641
+#: SystemParameters.php:649 SystemParameters.php:667 SystemParameters.php:674
+#: SystemParameters.php:718 SystemParameters.php:814 SystemParameters.php:947
+#: SystemParameters.php:951 SystemParameters.php:959 SystemParameters.php:963
+#: SystemParameters.php:1017 SystemParameters.php:1027
+#: SystemParameters.php:1031 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:373 WWW_Users.php:483 WWW_Users.php:487 WWW_Users.php:656
+#: WWW_Users.php:660 includes/PDFLowGPPageHeader.inc:44
+#: includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "Non"
+
+#: AccountGroups.php:264 AccountSections.php:189 AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:163
+#: BankAccounts.php:222 BOMs.php:151 COGSGLPostings.php:108
+#: COGSGLPostings.php:206 CreditStatus.php:175 Currencies.php:272
+#: CustomerBranches.php:415 Customers.php:1033 Customers.php:1067
+#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
+#: Factors.php:334 FixedAssetCategories.php:187 FixedAssetLocations.php:107
+#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:93
+#: InternalStockRequest.php:263 Labels.php:223 Labels.php:248
+#: Locations.php:391 MRPDemands.php:309 MRPDemandTypes.php:120
+#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:273
+#: PcClaimExpensesFromTab.php:265 PcExpenses.php:223 PcTabs.php:233
+#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
+#: Prices.php:249 PurchData.php:227 SalesCategories.php:256
+#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
+#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:615
+#: SelectCustomer.php:633 SelectCustomer.php:656 SelectCustomer.php:673
+#: SelectCustomer.php:696 SelectCustomer.php:713 Shippers.php:144
+#: StockCategories.php:263 SupplierContacts.php:163
+#: SupplierTenderCreate.php:145 SupplierTypes.php:189
+#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
+#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
+#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:325
+#: includes/InputSerialItems.php:90 includes/OutputSerialItems.php:20
+#, php-format
+msgid "Edit"
+msgstr "Modifier"
+
+#: AccountGroups.php:265
+msgid "Are you sure you wish to delete this account group?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce groupe?"
+
+#: AccountGroups.php:265 AccountSections.php:193 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:164
+#: BankAccounts.php:223 BOMs.php:153 COGSGLPostings.php:109
+#: COGSGLPostings.php:207 ContractBOM.php:267 ContractOtherReqts.php:120
+#: CounterSales.php:830 Credit_Invoice.php:401 CreditStatus.php:176
+#: Currencies.php:275 CustomerReceipt.php:925 Customers.php:1068
+#: CustomerTypes.php:207 Departments.php:187 DiscountCategories.php:223
+#: DiscountMatrix.php:183 EDIMessageFormat.php:151
+#: FixedAssetCategories.php:188 FreightCosts.php:243 GeocodeSetup.php:174
+#: GLAccounts.php:313 GLJournal.php:426 GLTags.php:94
+#: InternalStockRequest.php:264 Labels.php:224 Labels.php:249 Labels.php:497
+#: Locations.php:392 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:209 Payments.php:1083 PaymentTerms.php:206
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:266 PcExpenses.php:224
+#: PcExpensesTypeTab.php:187 PcTabs.php:234 PcTypeTabs.php:175
+#: PO_AuthorisationLevels.php:153 PO_Items.php:712 Prices_Customer.php:279
+#: Prices.php:250 PurchData.php:229 SalesAnalReptCols.php:299
+#: SalesAnalRepts.php:304 SalesCategories.php:257 SalesGLPostings.php:133
+#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
+#: SecurityTokens.php:131 SelectCreditItems.php:767 SelectCustomer.php:616
+#: SelectCustomer.php:634 SelectCustomer.php:657 SelectCustomer.php:674
+#: SelectCustomer.php:697 SelectCustomer.php:714 SelectOrderItems.php:1417
+#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:264 StockCategories.php:586 StockLocTransfer.php:332
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTenderCreate.php:401
+#: SupplierTenderCreate.php:429 SupplierTypes.php:191 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
+#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
+#: WorkCentres.php:142 WOSerialNos.php:321 WWW_Access.php:124
+#: WWW_Users.php:326 includes/InputSerialItemsKeyed.php:58
+#: includes/OutputSerialItems.php:99
+#, php-format
+msgid "Delete"
+msgstr "Supprimer"
+
+#: AccountGroups.php:273
+msgid "Review Account Groups"
+msgstr "Lister les groupes"
+
+#: AccountGroups.php:293
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+"Une erreur s'est produite lors la récupération des informations du groupe"
+
+#: AccountGroups.php:294
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr "Commande SQL d'affichage du groupe"
+
+#: AccountGroups.php:297
+msgid "The account group name does not exist in the database"
+msgstr "Le nom du groupe n'existe pas dans la base de données"
+
+#: AccountGroups.php:311
+#, fuzzy
+msgid "Edit Account Group Details"
+msgstr "Détails sur le Groupe compte"
+
+#: AccountGroups.php:319 GLAccounts.php:244 GLAccounts.php:292
+#: Z_ImportGLAccountGroups.php:26
+msgid "Account Group"
+msgstr "Groupe"
+
+#: AccountGroups.php:343
+#, fuzzy
+msgid "New Account Group Details"
+msgstr "Détails sur le Groupe compte"
+
+#: AccountGroups.php:349
+msgid "Account Group Name"
+msgstr "Nom du groupe"
+
+#: AccountGroups.php:360 AccountGroups.php:362
+msgid "Top Level Group"
+msgstr "Groupe parent"
+
+#: AccountGroups.php:377
+msgid "Section In Accounts"
+msgstr "Rubrique des comptes"
+
+#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
+#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
+#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
+#: Departments.php:255 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:347 FixedAssetLocations.php:157
+#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:262 Labels.php:531
+#: Locations.php:607 MRPDemands.php:424 MRPDemandTypes.php:188
+#: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
+#: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
+#: SalesAnalReptCols.php:552 SalesAnalRepts.php:516 SalesGLPostings.php:417
+#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:613
+#: SupplierContacts.php:282 SuppLoginSetup.php:295 TaxAuthorities.php:329
+#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
+#: WorkCentres.php:280 WWW_Users.php:699
+msgid "Enter Information"
+msgstr "Valider"
+
+#: AccountSections.php...
[truncated message content] |
|
From: <tim...@us...> - 2012-08-30 18:26:52
|
Revision: 5615
http://web-erp.svn.sourceforge.net/web-erp/?rev=5615&view=rev
Author: tim_schofield
Date: 2012-08-30 18:26:44 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Thomas Timothy Lie: Fix more typos in gettext strings
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndentedReverse.php
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/FixedAssetLocations.php
trunk/GLProfit_Loss.php
trunk/Labels.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/PurchData.php
trunk/SMTPServer.php
trunk/SalesInquiry.php
trunk/WOSerialNos.php
trunk/api/api_xml-rpc.php
trunk/reportwriter/languages/en_US/reports.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMExtendedQty.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -27,7 +27,7 @@
part char(20),
extendedqpa double,
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMIndentedReverse.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -23,7 +23,7 @@
part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
@@ -48,7 +48,7 @@
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -75,7 +75,7 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -106,7 +106,7 @@
bom.quantity
FROM bom,passbom
WHERE bom.component = passbom.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -126,7 +126,7 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$result = DB_query("SELECT COUNT(*) FROM bom,passbom WHERE bom.component = passbom.part",$db);
@@ -172,8 +172,8 @@
ORDER BY sortpart";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result);
-
+ $ListCount = DB_num_rows($result);
+
While ($myrow = DB_fetch_array($result,$db)){
$YPos -=$line_height;
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/ConfirmDispatch_Invoice.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -830,7 +830,7 @@
} else {
$AssetNumber = intval(mb_substr($OrderLine->StockID,6,mb_strlen($OrderLine->StockID)-$HyphenOccursAt-1));
}
- prnMsg (_('The asset number beind disposed of is:') . ' ' . $AssetNumber, 'info');
+ prnMsg (_('The asset number being disposed of is:') . ' ' . $AssetNumber, 'info');
} else {
$IsAsset = false;
$AssetNumber = 0;
@@ -1440,7 +1440,7 @@
'" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('disposal') . "',
'" . -$DisposalRow['cost'] . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on dispoal GL posting could not be inserted because');
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on disposal GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/CounterSales.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -996,13 +996,13 @@
/* Now Get the area where the sale is to from the branches table */
- $SQL = "SELECT area,
+ $SQL = "SELECT area,
defaultshipvia
FROM custbranch
WHERE custbranch.debtorno ='". $_SESSION['Items'.$identifier]->DebtorNo . "'
AND custbranch.branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "'";
- $ErrMsg = _('We were unable to load the area where the sale is to from the custbranch table');
+ $ErrMsg = _('We were unable to load the area from the custbranch table where the sale is to ');
$Result = DB_query($SQL,$db, $ErrMsg);
$myrow = DB_fetch_row($Result);
$Area = $myrow[0];
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/FixedAssetLocations.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -28,7 +28,7 @@
}
}
if (isset($_GET['SelectedLocation'])) {
- $sql="SELECT * FROM fixedassetlocations
+ $sql="SELECT * FROM fixedassetlocations
WHERE locationid='".$_GET['SelectedLocation']."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -50,11 +50,11 @@
$InputError=1;
}
if ($InputError==0) {
- $sql="UPDATE fixedassetlocations
+ $sql="UPDATE fixedassetlocations
SET locationdescription='" . $_POST['LocationDescription'] . "',
parentlocationid='" . $_POST['ParentLocationID'] . "'
WHERE locationid ='" . $_POST['LocationID'] . "'";
-
+
$result=DB_query($sql,$db);
echo '<meta http-equiv="Refresh" content="0; url="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'">';
}
@@ -74,7 +74,7 @@
$result = DB_query($sql,$db);
$myrow=DB_fetch_row($result);
if ($myrow[0]>0) {
- prnMsg(_('You have assets in this location location so it cannot be removed'), 'warn');
+ prnMsg(_('You have assets in this location so it cannot be removed'), 'warn');
$InputError=1;
}
if ($InputError==0) {
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/GLProfit_Loss.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -12,8 +12,8 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
-if ((!isset($_POST['FromPeriod'])
- AND !isset($_POST['ToPeriod']))
+if ((!isset($_POST['FromPeriod'])
+ AND !isset($_POST['ToPeriod']))
OR isset($_POST['SelectADifferentPeriod'])){
include('includes/header.inc');
@@ -21,12 +21,12 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
</p>';
- echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
+ echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
'<br />'
. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
. _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
-
+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -46,9 +46,9 @@
<tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
- $sql = "SELECT periodno,
- lastdate_in_period
- FROM periods
+ $sql = "SELECT periodno,
+ lastdate_in_period
+ FROM periods
ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
@@ -594,7 +594,7 @@
accountgroups.sequenceintb,
accountgroups.groupname,
chartdetails.accountcode";
-
+
$AccountsResult = DB_query($SQL,$db,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';
@@ -814,7 +814,7 @@
locale_number_format($TotalIncome - $SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalBudgetIncome - $SectionPrdBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalLYIncome - $SectionPrdLY,$_SESSION['CompanyRecord']['decimalplaces']));
-
+
if ($TotalIncome !=0){
$PrdGPPercent = 100*($TotalIncome - $SectionPrdActual)/$TotalIncome;
} else {
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/Labels.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -42,7 +42,7 @@
WHERE labelfieldid='" . $_POST['LabelFieldID' . $i] . "'",
$db);
} else {
- prnMsg (_('Entries for Vertical Position, Horizonal Position, and Font Size must be integers.'),'error');
+ prnMsg (_('Entries for Vertical Position, Horizontal Position, and Font Size must be integers.'),'error');
}
}
}
@@ -433,7 +433,7 @@
FROM labelfields
WHERE labelid = '" . $SelectedLabelID . "'
ORDER BY vpos DESC";
- $ErrMsg = _('Could note get the label fields because');
+ $ErrMsg = _('Could not get the label fields because');
$result = DB_query($SQL,$db,$ErrMsg);
$i=0;
echo '<table class="selection">
@@ -443,7 +443,7 @@
<tr>
<th>' . _('Field') . '</th>
<th>' . _('Vertical') . '<br />' . _('Position') . '<br />(VPos)</th>
- <th>' . _('Horizonal') . '<br />' . _('Position') . '<br />(HPos)</th>
+ <th>' . _('Horizontal') . '<br />' . _('Position') . '<br />(HPos)</th>
<th>' . _('Font Size') . '</th>
<th>' . _('Bar-code') . '</th>
</tr>';
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRP.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -24,7 +24,7 @@
$sql = "CREATE TEMPORARY TABLE passbom (part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (parent char(20),
Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRPCalendar.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -83,15 +83,15 @@
manufacturingflag smallint(6) NOT NULL default '1',
INDEX (daynumber),
PRIMARY KEY (calendardate)) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$i = 0;
/* $DaysTextArray used so can get text of day based on the value get from DayOfWeekFromSQLDate of
- the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
+ the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
$DaysTextArray = array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-
+
$ExcludeDays = array($_POST['Sunday'],$_POST['Monday'],$_POST['Tuesday'],$_POST['Wednesday'],
$_POST['Thursday'],$_POST['Friday'],$_POST['Saturday']);
@@ -122,7 +122,7 @@
// manufacturing day that precedes it. That way can read the table by the non-manufacturing day,
// subtract the leadtime from the daynumber, and find the valid manufacturing day with that daynumber.
$DayNumber = 1;
- $sql = "SELECT * FROM mrpcalendar
+ $sql = "SELECT * FROM mrpcalendar
ORDER BY calendardate";
$result = DB_query($sql,$db,$ErrMsg);
while ($myrow = DB_fetch_array($result)) {
@@ -306,7 +306,7 @@
if (!isset($_POST['ChangeDate'])) {
$_POST['ChangeDate']=date($_SESSION['DefaultDateFormat']);
}
-
+
echo '<br />
<table class="selection">
<tr>
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/PurchData.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -8,15 +8,15 @@
include ('includes/header.inc');
if (isset($_GET['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
} elseif (isset($_POST['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
}
if (isset($_GET['StockID'])) {
- $StockID = trim(mb_strtoupper($_GET['StockID']));
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])) {
- $StockID = trim(mb_strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
}
if (isset($_POST['StockUOM'])) {
@@ -28,12 +28,13 @@
echo '<a href="' . $rootpath . '/SelectProduct.php">' . _('Back to Items') . '</a><br />';
if (isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
+ $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
}
if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
$InputError = 0; /*Start assuming the best */
- if ($StockID == '' OR !isset($StockID)) {
+
+if ($StockID == '' OR !isset($StockID)) {
$InputError = 1;
prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
}
@@ -41,8 +42,7 @@
$InputError = 1;
unset($_POST['Price']);
prnMsg(_('The price entered was not numeric and a number is expected. No changes have been made to the database'), 'error');
- }
- if ($_POST['Price'] == 0) {
+ }elseif ($_POST['Price'] == 0) {
prnMsg(_('The price entered is zero') . ' ' . _('Is this intentional?'), 'warn');
}
if (!is_numeric(filter_number_format($_POST['LeadTime']))) {
@@ -60,252 +60,227 @@
unset($_POST['ConversionFactor']);
prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br />' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br /><br />' . _('No changes will be made to the database'), 'error');
}
- if ($InputError == 0 AND isset($_POST['AddRecord'])) {
- $sql = "INSERT INTO purchdata (supplierno,
- stockid,
- price,
- effectivefrom,
- suppliersuom,
- conversionfactor,
- supplierdescription,
- suppliers_partno,
- leadtime,
- minorderqty,
- preferred)
- VALUES ('" . $SupplierID . "',
- '" . $StockID . "',
- '" . filter_number_format($_POST['Price']) . "',
- '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- '" . $_POST['SuppliersUOM'] . "',
- '" . $_POST['ConversionFactor'] . "',
- '" . $_POST['SupplierDescription'] . "',
- '" . $_POST['SupplierCode'] . "',
- '" . $_POST['LeadTime'] . "',
- '" . $_POST['MinOrderQty'] . "',
- '" . $_POST['Preferred'] . "'
- )";
- $ErrMsg = _('The supplier purchasing details could not be added to the database because');
- $DbgMsg = _('The SQL that failed was');
- $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
-
- /* If the new purchdata is the preferred one, the old ones from the same suppliers shouldn't be preferred.
- Are kept only for historic information only */
- if ($_POST['Preferred'] == 1){
- $sql = "UPDATE purchdata SET preferred='0'
- WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom < '" . FormatDateForSQL($_POST['EffectiveFrom']) . "'";
- $ErrMsg = _('The preferred supplier details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier preferred flag has been updated'), 'success');
- }
- }
- if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
- $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
- effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- suppliersuom='" . $_POST['SuppliersUOM'] . "',
- conversionfactor='" . $_POST['ConversionFactor'] . "',
- supplierdescription='" . $_POST['SupplierDescription'] . "',
- suppliers_partno='" . $_POST['SupplierCode'] . "',
- leadtime='" . $_POST['LeadTime'] . "',
- minorderqty='" . $_POST['MinOrderQty'] . "',
- preferred='" . $_POST['Preferred'] . "'
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO purchdata (supplierno,
+ stockid,
+ price,
+ effectivefrom,
+ suppliersuom,
+ conversionfactor,
+ supplierdescription,
+ suppliers_partno,
+ leadtime,
+ minorderqty,
+ preferred)
+ VALUES ('" . $SupplierID . "',
+ '" . $StockID . "',
+ '" . filter_number_format($_POST['Price']) . "',
+ '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ '" . $_POST['SuppliersUOM'] . "',
+ '" . filter_number_format($_POST['ConversionFactor']) . "',
+ '" . $_POST['SupplierDescription'] . "',
+ '" . $_POST['SupplierCode'] . "',
+ '" . filter_number_format($_POST['LeadTime']) . "', '" . filter_number_format($_POST['MinOrderQty']) . "',
+ '" . $_POST['Preferred'] . "')";
+ $ErrMsg = _('The supplier purchasing details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
+ effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ suppliersuom='" . $_POST['SuppliersUOM'] . "',
+ conversionfactor='" . filter_number_format($_POST['ConversionFactor']) . "',
+ supplierdescription='" . $_POST['SupplierDescription'] . "',
+ suppliers_partno='" . $_POST['SupplierCode'] . "',
+ leadtime='" . filter_number_format($_POST['LeadTime']) . "',
+ minorderqty='" . filter_number_format($_POST['MinOrderQty']) . "',
+ preferred='" . $_POST['Preferred'] . "'
WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier purchasing data has been updated'), 'success');
- }
- if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
- /*update or insert took place and need to clear the form */
- unset($SupplierID);
- unset($_POST['Price']);
- unset($CurrCode);
- unset($_POST['SuppliersUOM']);
- unset($_POST['EffectiveFrom']);
- unset($_POST['ConversionFactor']);
- unset($_POST['SupplierDescription']);
- unset($_POST['LeadTime']);
- unset($_POST['Preferred']);
- unset($_POST['SupplierCode']);
- unset($_POST['MinOrderQty']);
- unset($SuppName);
- }
+ AND purchdata.supplierno='".$SupplierID."'
+ AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be updated because');
+ $DbgMsg = _('The SQL that failed was'
+);
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('Supplier purchasing data has been updated'), 'success');
+ }
+ if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
+ /*update or insert took place and need to clear the form */
+ unset($SupplierID);
+ unset($_POST['Price']);
+ unset($CurrCode);
+ unset($_POST['SuppliersUOM']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['ConversionFactor']
+);
+ unset($_POST['SupplierDescription']);
+ unset($_POST['LeadTime']);
+ unset($_POST['Preferred']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['MinOrderQty']);
+ unset($SuppName);
+ }
}
if (isset($_GET['Delete'])) {
- $sql = "DELETE FROM purchdata
- WHERE purchdata.supplierno='".$SupplierID."'
- AND purchdata.stockid='".$StockID."'
- AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be deleted because');
- $DelResult = DB_query($sql, $db, $ErrMsg);
- prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
- unset($SupplierID);
+ $sql = "DELETE FROM purchdata
+ WHERE purchdata.supplierno='".$SupplierID."'
+ AND purchdata.stockid='".$StockID."'
+ AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be deleted because');
+ $DelResult = DB_query($sql, $db, $ErrMsg);
+ prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
+ unset($SupplierID);
}
if (!isset($_GET['Edit'])) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
- $sql = "SELECT purchdata.supplierno,
- suppliers.suppname,
- purchdata.price,
- suppliers.currcode,
- purchdata.effectivefrom,
- purchdata.suppliersuom,
- purchdata.supplierdescription,
- purchdata.leadtime,
- purchdata.suppliers_partno,
- purchdata.minorderqty,
- purchdata.preferred,
- purchdata.conversionfactor,
- currencies.decimalplaces AS currdecimalplaces
- FROM purchdata
- INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE purchdata.stockid = '" . $StockID . "'
- ORDER BY purchdata.effectivefrom DESC, supplierno";
- $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
- $PurchDataResult = DB_query($sql, $db, $ErrMsg);
- if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
+ $sql = "SELECT purchdata.supplierno,
+ suppliers.suppname,
+ purchdata.price,
+ suppliers.currcode,
+ purchdata.effectivefrom,
+ purchdata.suppliersuom,
+ purchdata.supplierdescription,
+ purchdata.leadtime,
+ purchdata.suppliers_partno,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ purchdata.conversionfactor,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $StockID . "'
+ ORDER BY purchdata.effectivefrom DESC";
+ $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+ $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
- $sql="SELECT stockmaster.decimalplaces
- FROM stockmaster
- WHERE stockmaster.stockid = '" . $StockID . "'";
- $DecimalPlacesResult=DB_query($sql, $db);
- $DecimalPlacesRow=DB_fetch_array($DecimalPlacesResult);
- $StockDecimalPlaces=$DecimalPlacesRow['decimalplaces'];
$NoPurchasingData=1;
- } else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Supplier') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Currency') . '</th>
- <th>' . _('Effective From') . '</th>
- <th>' . _('Supplier Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th>' . _('Price Our Units') . '</th>
- <th>' . _('Min Order Qty') . '</th>
- <th>' . _('Lead Time') . '</th>
- <th>' . _('Preferred') . '</th>
- </tr>';
- echo $TableHeader;
- $CountPreferreds = 0;
- $k = 0; //row colour counter
- while ($myrow = DB_fetch_array($PurchDataResult)) {
- if ($myrow['preferred'] == 1) {
- echo '<tr class="EvenTableRows">';
- } elseif ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- if ($myrow['preferred'] == 1) {
- $DisplayPreferred = _('Yes');
- $CountPreferreds++;
- } else {
- $DisplayPreferred = _('No');
- }
- printf('<td>%s</td>
+ } else if ($StockID != '') {
+ echo '<table cellpadding="2" class="selection">';
+ $TableHeader = '<tr><th>' . _('Supplier') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Supplier Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th>' . _('Cost Per Our Unit') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Effective From') . '</th>
+ <th>' . _('Min Order Qty') . '</th>
+ <th>' . _('Lead Time') . '</th>
+ <th>' . _('Preferred') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $CountPreferreds = 0;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchDataResult)) {
+ if ($myrow['preferred'] == 1) {
+ echo '<tr class="EvenTableRows">';
+ } elseif ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['preferred'] == 1) {
+ $DisplayPreferred = _('Yes');
+ $CountPreferreds++;
+
+ } else {
+ $DisplayPreferred = _('No');
+ }
+ $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+ printf('<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s ' . _('days') . '</td>
<td>%s</td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Copy=1&EffectiveFrom=%s">' . _('Copy') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s ' . _('days') . '</td>
+ <td>%s</td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick=\'return confirm("' . _('Are you sure you wish to delete this suppliers price?') . '");\'>' . _('Delete') . '</a></td>
</tr>',
$myrow['suppname'],
- locale_number_format($myrow['price'], $myrow['currdecimalplaces']),
- $myrow['currcode'],
- ConvertSQLDate($myrow['effectivefrom']),
+ locale_number_format($myrow['price'],$UPriceDecimalPlaces),
$myrow['supplie...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X