Menu
▾
▴
web-erp-svn
|
From: <rc...@us...> - 2016-09-28 00:08:43
|
Revision: 7638
http://sourceforge.net/p/web-erp/reponame/7638
Author: rchacon
Date: 2016-09-28 00:08:40 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------
Add webERP logo in Scalable Vector Graphics format.
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/webERP_logo.svg
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-09-25 10:38:47 UTC (rev 7637)
+++ trunk/doc/Change.log 2016-09-28 00:08:40 UTC (rev 7638)
@@ -1,5 +1,6 @@
webERP Change Log
+27/09/16 RChacon: Add webERP logo in Scalable Vector Graphics format.
25/09/16 Exson: Make customer reference GET method workable in SelectCompletedOrder.php. Fixed decimalplaces missing bug in SelectOrderItems.php. Add due date, order date and customer reference option in SelectSalesOrder.php.
25/09/16 Exson: Make the details show immediately when the search result is one in SelectCompletedOrder.php.And add return links in OrderDetails.php.
24/10/16 Simon Kelly: Fixed placing POs for sales orders using array form variable
Added: trunk/webERP_logo.svg
===================================================================
--- trunk/webERP_logo.svg (rev 0)
+++ trunk/webERP_logo.svg 2016-09-28 00:08:40 UTC (rev 7638)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ height="192"
+ width="770"
+ viewBox="0 0 770 192"
+ id="svg2"
+ version="1.1">
+ <title
+ id="title3343">webERP icon</title>
+ <metadata
+ id="metadata18">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>webERP icon</dc:title>
+ <dc:rights>
+ <cc:Agent>
+ <dc:title>weberp.org</dc:title>
+ </cc:Agent>
+ </dc:rights>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ <dc:date>2016-09-10</dc:date>
+ <dc:description>webERP scalable icon</dc:description>
+ <dc:source>http://weberp.org</dc:source>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs16" />
+ <rect
+ height="192"
+ id="WhiteRoundedRectangle"
+ rx="19"
+ ry="19"
+ style="fill:#ffffff"
+ width="770"
+ x="0"
+ y="0" />
+ <rect
+ height="192"
+ id="GrayRoundedRectangle"
+ rx="19"
+ ry="19"
+ style="fill:#808080"
+ width="385"
+ x="385"
+ y="0" />
+ <path
+ d="M 19,53 19,139 122,139 122,53 103,53 103,122 80,122 80,53 61,53 61,122 38,122 38,53 Z"
+ id="W"
+ style="fill:#808080" />
+ <path
+ d="M 141,53 141,139 244,139 244,120 160,120 160,87 244,87 244,105 160,105 160,72 244,72 244,53 Z"
+ id="E"
+ style="fill:#808080" />
+ <path
+ d="M 263,19 263,139 366,139 366,53 282,53 282,19 Z M 347,72 347,120 282,120 282,72 Z"
+ id="B"
+ style="fill:#808080" />
+ <path
+ d="M 404,53 404,139 507,139 507,120 423,120 423,87 507,87 507,105 423,105 423,72 507,72 507,53 Z"
+ id="E2"
+ style="fill:#ffffff" />
+ <path
+ d="M 526,53 526,139 545,139 545,72 629,72 629,53 Z"
+ id="R"
+ style="fill:#ffffff" />
+ <path
+ d="M 648,53 648,173 667,173 667,139 751,139 751,53 Z M 732,72 732,120 667,120 667,72 Z"
+ id="P"
+ style="fill:#ffffff" />
+</svg>
|
|
From: <rc...@us...> - 2016-10-04 18:37:49
|
Revision: 7639
http://sourceforge.net/p/web-erp/reponame/7639
Author: rchacon
Date: 2016-10-04 18:37:47 +0000 (Tue, 04 Oct 2016)
Log Message:
-----------
Add return.svg image for Returnbutton in Scalable Vector Graphics (SVG) format.
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/aguapop/images/return.svg
trunk/css/default/images/return.svg
trunk/css/fluid/images/return.svg
trunk/css/fresh/images/return.svg
trunk/css/gel/images/return.svg
trunk/css/professional/images/return.svg
trunk/css/professional-rtl/images/return.svg
trunk/css/silverwolf/images/return.svg
trunk/css/wood/images/return.svg
trunk/css/xenos/images/return.svg
Added: trunk/css/aguapop/images/return.svg
===================================================================
--- trunk/css/aguapop/images/return.svg (rev 0)
+++ trunk/css/aguapop/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/default/images/return.svg
===================================================================
--- trunk/css/default/images/return.svg (rev 0)
+++ trunk/css/default/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/fluid/images/return.svg
===================================================================
--- trunk/css/fluid/images/return.svg (rev 0)
+++ trunk/css/fluid/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/fresh/images/return.svg
===================================================================
--- trunk/css/fresh/images/return.svg (rev 0)
+++ trunk/css/fresh/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/gel/images/return.svg
===================================================================
--- trunk/css/gel/images/return.svg (rev 0)
+++ trunk/css/gel/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/professional/images/return.svg
===================================================================
--- trunk/css/professional/images/return.svg (rev 0)
+++ trunk/css/professional/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/professional-rtl/images/return.svg
===================================================================
--- trunk/css/professional-rtl/images/return.svg (rev 0)
+++ trunk/css/professional-rtl/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/silverwolf/images/return.svg
===================================================================
--- trunk/css/silverwolf/images/return.svg (rev 0)
+++ trunk/css/silverwolf/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <filter
+ id="i1"
+ width="150%"
+ height="150%">
+ <feOffset
+ result="offOut"
+ in="SourceAlpha"
+ dx="2"
+ dy="4"
+ id="feOffset6" />
+ <feGaussianBlur
+ result="blurOut"
+ in="offOut"
+ stdDeviation="1"
+ id="feGaussianBlur8" />
+ <feBlend
+ in="SourceGraphic"
+ in2="blurOut"
+ mode="normal"
+ id="feBlend10" />
+ </filter>
+ <g
+ filter="url(#i1)"
+ id="g12">
+ <path
+ id="Return"
+ d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
+ style="fill:#000080" />
+ </g>
+</svg>
Added: trunk/css/wood/images/return.svg
===================================================================
--- trunk/css/wood/images/return.svg (rev 0)
+++ trunk/css/wood/images/return.svg 2016-10-04 18:37:47 UTC (rev 7639)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ version="1.1"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <defs
+ id="defs17" />
+ <title
+ id="title3359">Return image</title>
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Return image</dc:title>
+ <dc:date>2016-09-28</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Rafael E. Chacón</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:description>Return image</dc:description>
+ <dc:language>en-GB</dc:language>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:prohibits
+ rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:Lice...
[truncated message content] |
|
From: <rc...@us...> - 2016-10-04 19:32:18
|
Revision: 7640
http://sourceforge.net/p/web-erp/reponame/7640
Author: rchacon
Date: 2016-10-04 19:32:15 +0000 (Tue, 04 Oct 2016)
Log Message:
-----------
In class.pdf.php, functions Rectangle() and RoundRectangle() use the functionalities Rect() and RoundedRectXY() of TCPDF class.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-04 18:37:47 UTC (rev 7639)
+++ trunk/doc/Change.log 2016-10-04 19:32:15 UTC (rev 7640)
@@ -1,6 +1,8 @@
webERP Change Log
-04/10/16 RChacon: Add return.svg image for Returnbutton in Scalable Vector Graphics (SVG) format.
+04/10/16 RChacon: In class.pdf.php, functions Rectangle() and RoundRectangle() use the functionalities
+Rect() and RoundedRectXY() of TCPDF class.
+04/10/16 RChacon: Add return.svg image for Return button in Scalable Vector Graphics (SVG) format.
27/09/16 RChacon: Add webERP logo in Scalable Vector Graphics format.
25/09/16 Exson: Make customer reference GET method workable in SelectCompletedOrder.php. Fixed decimalplaces missing bug in SelectOrderItems.php. Add due date, order date and customer reference option in SelectSalesOrder.php.
25/09/16 Exson: Make the details show immediately when the search result is one in SelectCompletedOrder.php.And add return links in OrderDetails.php.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2016-10-04 18:37:47 UTC (rev 7639)
+++ trunk/includes/class.pdf.php 2016-10-04 19:32:15 UTC (rev 7640)
@@ -68,7 +68,7 @@
function line($x1,$y1,$x2,$y2,$style=array()) {
// Javier FPDF::line($x1, $this->h-$y1, $x2, $this->h-$y2);
// Javier: width, color and style might be edited
- TCPDF::Line ($x1,$this->h-$y1,$x2,$this->h-$y2,$style);
+ TCPDF::Line($x1,$this->h-$y1,$x2,$this->h-$y2,$style);
}
function addText($XPos,$YPos,$fontsize,$text/*,$angle=0,$wordSpaceAdjust=0*/) {
@@ -89,7 +89,7 @@
// $Height = Font size in dpi (72dpi = 25.4mm).
// $Text = Text to be split in portion to be add to the page and the remainder to be returned.
// $Align = 'left', 'center', 'centre', 'full' or 'right'.
-
+
//some special characters are html encoded
//this code serves to make them appear human readable in pdf file
$Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8');// Convert all HTML entities to their applicable characters.
@@ -320,27 +320,26 @@
$this->Output($DocumentFilename,'D');
}
- function Rectangle($XPos, $YPos, $Width, $Height) {
- // $XPos, $YPos = Left top position (left line, top line).
- // $Width, $Height = Size (line-to-line).
- $this->line($XPos, $YPos, $XPos+$Width, $YPos);// Top side.
- $this->line($XPos, $YPos-$Height, $XPos+$Width, $YPos-$Height);// Bottom side.
- $this->line($XPos, $YPos, $XPos, $YPos-$Height);// Left side.
- $this->line($XPos+$Width, $YPos, $XPos+$Width, $YPos-$Height);// Right side
+ function Rectangle($x, $YPos, $w, $h) {
+ // Draws a rectangle.
+ // $x (float) Abscissa from left border to the upper-left corner (LTR).
+ // $this->h is page height.
+ // $YPos Ordinate of upper-left corner. WARNING: Mesured from bottom left corner!
+ // $w (float) Rectangle width.
+ // $h (float) Rectangle height.
+ $this->Rect($x, $this->h-$YPos, $w, $h);// Public function Rect() in ~/includes/tcpdf/tcpdf.php.
}
- function RoundRectangle($XPos, $YPos, $Width, $Height, $RadiusX, $RadiusY) {
- // $XPos, $YPos = Left top position (left line, top line).
- // $Width, $Height = Size (line-to-line).
- // $RadiusX, $RadiusY = corner radii (horizontal, vertical).
- $this->line($XPos+$RadiusX, $YPos, $XPos+$Width-$RadiusX, $YPos);// Top side.
- $this->line($XPos+$RadiusX, $YPos-$Height, $XPos+$Width-$RadiusX, $YPos-$Height);// Bottom side.
- $this->line($XPos, $YPos-$RadiusY, $XPos, $YPos-$Height+$RadiusY);// Left side.
- $this->line($XPos+$Width, $YPos-$RadiusY, $XPos+$Width, $YPos-$Height+$RadiusY);// Right side.
- $this->partEllipse($XPos+$RadiusX, $YPos-$RadiusY, 90, 180, $RadiusX, $RadiusY);// Top left corner.
- $this->partEllipse($XPos+$Width-$RadiusX, $YPos-$RadiusY, 0, 90, $RadiusX, $RadiusY);// Top right corner.
- $this->partEllipse($XPos+$RadiusX, $YPos-$Height+$RadiusY, 180, 270, $RadiusX, $RadiusY);// Bottom left corner.
- $this->partEllipse($XPos+$Width-$RadiusX, $YPos-$Height+$RadiusY, 270, 360, $RadiusX, $RadiusY);// Bottom right corner.
+ function RoundRectangle($x, $YPos, $w, $h, $rx, $ry) {
+ // Draws a rounded rectangle.
+ // $x (float) Abscissa from left border to the upper-left corner (LTR).
+ // $this->h is page height.
+ // $YPos Ordinate of upper-left corner. WARNING: Mesured from bottom left corner!
+ // $w (float) Rectangle width.
+ // $h (float) Rectangle height.
+ // $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
+ // $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
+ $this->RoundedRectXY($x, $this->h-$YPos, $w, $h, $rx, $ry);// Public function RoundedRectXY() in ~/includes/tcpdf/tcpdf.php.
}
} // end of class
|
|
From: <rc...@us...> - 2016-10-04 20:37:47
|
Revision: 7641
http://sourceforge.net/p/web-erp/reponame/7641
Author: rchacon
Date: 2016-10-04 20:37:44 +0000 (Tue, 04 Oct 2016)
Log Message:
-----------
In class.pdf.php, fix the function addJpegFromFile() use of the functionality Image() of TCPDF class.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-04 19:32:15 UTC (rev 7640)
+++ trunk/doc/Change.log 2016-10-04 20:37:44 UTC (rev 7641)
@@ -1,7 +1,7 @@
webERP Change Log
-04/10/16 RChacon: In class.pdf.php, functions Rectangle() and RoundRectangle() use the functionalities
-Rect() and RoundedRectXY() of TCPDF class.
+04/10/16 RChacon: In class.pdf.php, fix the function addJpegFromFile() use of the functionality Image() of TCPDF class.
+04/10/16 RChacon: In class.pdf.php, functions Rectangle() and RoundRectangle() use the functionalities Rect() and RoundedRectXY() of TCPDF class.
04/10/16 RChacon: Add return.svg image for Return button in Scalable Vector Graphics (SVG) format.
27/09/16 RChacon: Add webERP logo in Scalable Vector Graphics format.
25/09/16 Exson: Make customer reference GET method workable in SelectCompletedOrder.php. Fixed decimalplaces missing bug in SelectOrderItems.php. Add due date, order date and customer reference option in SelectSalesOrder.php.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2016-10-04 19:32:15 UTC (rev 7640)
+++ trunk/includes/class.pdf.php 2016-10-04 20:37:44 UTC (rev 7641)
@@ -82,7 +82,7 @@
function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='full', $border=0, $fill=0) {
// R&OS version 0.12.2: "addTextWrap function is no more, use addText instead".
- /* Returns the balance of the string that could not fit in the width */
+ // Adds text to the page and returns the balance of the string that could not fit in the width.
// $XPos = cell horizontal coordinate from page left side to cell left side in dpi (72dpi = 25.4mm).
// $YPos = cell vertical coordinate from page bottom side to cell bottom side in dpi (72dpi = 25.4mm).
// $Width = Cell (line) width in dpi (72dpi = 25.4mm).
@@ -207,8 +207,15 @@
}
}
- function addJpegFromFile($img,$XPos,$YPos,$Width=0,$Height=0,$Type=''){
- $this->Image($img, $x=$XPos, $y=$this->h-$YPos-$Height, $w=$Width, $h=$Height,$type=$Type);
+ function addJpegFromFile($file, $x, $YPos, $width=0, $height) {
+ // Puts an image in the page.
+ // $file (string) Name of the file containing the image.
+ // $x (float) Abscissa from left border to the upper-left corner (LTR).
+ // $this->h is the page height.
+ // $YPos Ordinate of upper-left corner. WARNING: Measured from bottom left corner!
+ // $width (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+ // $height (float) Height of the image in the page.
+ $this->Image($file, $x, $this->h-$YPos-$height, $width, $height);// Public function Image() in ~/includes/tcpdf/tcpdf.php.
}
/*
@@ -320,28 +327,28 @@
$this->Output($DocumentFilename,'D');
}
- function Rectangle($x, $YPos, $w, $h) {
+ function Rectangle($x, $YPos, $width, $height) {
// Draws a rectangle.
// $x (float) Abscissa from left border to the upper-left corner (LTR).
- // $this->h is page height.
- // $YPos Ordinate of upper-left corner. WARNING: Mesured from bottom left corner!
- // $w (float) Rectangle width.
- // $h (float) Rectangle height.
- $this->Rect($x, $this->h-$YPos, $w, $h);// Public function Rect() in ~/includes/tcpdf/tcpdf.php.
+ // $this->h is the page height.
+ // $YPos Ordinate of upper-left corner. WARNING: Measured from bottom left corner!
+ // $width (float) Rectangle width.
+ // $height (float) Rectangle height.
+ $this->Rect($x, $this->h-$YPos, $width, $height);// Public function Rect() in ~/includes/tcpdf/tcpdf.php.
}
- function RoundRectangle($x, $YPos, $w, $h, $rx, $ry) {
+ function RoundRectangle($x, $YPos, $width, $height, $rx, $ry) {
// Draws a rounded rectangle.
// $x (float) Abscissa from left border to the upper-left corner (LTR).
- // $this->h is page height.
- // $YPos Ordinate of upper-left corner. WARNING: Mesured from bottom left corner!
- // $w (float) Rectangle width.
- // $h (float) Rectangle height.
+ // $this->h is the page height.
+ // $YPos Ordinate of upper-left corner. WARNING: Measured from bottom left corner!
+ // $width (float) Rectangle width.
+ // $height (float) Rectangle height.
// $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
// $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
- $this->RoundedRectXY($x, $this->h-$YPos, $w, $h, $rx, $ry);// Public function RoundedRectXY() in ~/includes/tcpdf/tcpdf.php.
+ $this->RoundedRectXY($x, $this->h-$YPos, $width, $height, $rx, $ry);// Public function RoundedRectXY() in ~/includes/tcpdf/tcpdf.php.
}
} // end of class
} //end if Cpdf class exists already
-?>
+?>
\ No newline at end of file
|
|
From: <rc...@us...> - 2016-10-06 02:13:24
|
Revision: 7642
http://sourceforge.net/p/web-erp/reponame/7642
Author: rchacon
Date: 2016-10-06 02:13:21 +0000 (Thu, 06 Oct 2016)
Log Message:
-----------
Add cross.svg, next.svg, previous.svg, and tick.svg images in Scalable Vector Graphics (SVG) format for general use (any size).
Modified Paths:
--------------
trunk/css/aguapop/images/return.svg
trunk/css/default/images/return.svg
trunk/css/fluid/images/return.svg
trunk/css/fresh/images/return.svg
trunk/css/gel/images/return.svg
trunk/css/professional/images/return.svg
trunk/css/professional-rtl/images/return.svg
trunk/css/silverwolf/images/return.svg
trunk/css/wood/images/return.svg
trunk/css/xenos/images/return.svg
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/aguapop/images/cross.svg
trunk/css/aguapop/images/next.svg
trunk/css/aguapop/images/previous.svg
trunk/css/aguapop/images/tick.svg
trunk/css/default/images/cross.svg
trunk/css/default/images/next.svg
trunk/css/default/images/previous.svg
trunk/css/default/images/tick.svg
trunk/css/fluid/images/cross.svg
trunk/css/fluid/images/next.svg
trunk/css/fluid/images/previous.svg
trunk/css/fluid/images/tick.svg
trunk/css/fresh/images/cross.svg
trunk/css/fresh/images/next.svg
trunk/css/fresh/images/previous.svg
trunk/css/fresh/images/tick.svg
trunk/css/gel/images/cross.svg
trunk/css/gel/images/next.svg
trunk/css/gel/images/previous.svg
trunk/css/gel/images/tick.svg
trunk/css/professional/images/cross.svg
trunk/css/professional/images/next.svg
trunk/css/professional/images/previous.svg
trunk/css/professional/images/tick.svg
trunk/css/professional-rtl/images/cross.svg
trunk/css/professional-rtl/images/next.svg
trunk/css/professional-rtl/images/previous.svg
trunk/css/professional-rtl/images/tick.svg
trunk/css/silverwolf/images/cross.svg
trunk/css/silverwolf/images/next.svg
trunk/css/silverwolf/images/previous.svg
trunk/css/silverwolf/images/tick.svg
trunk/css/wood/images/cross.svg
trunk/css/wood/images/next.svg
trunk/css/wood/images/previous.svg
trunk/css/wood/images/tick.svg
trunk/css/xenos/images/cross.svg
trunk/css/xenos/images/next.svg
trunk/css/xenos/images/previous.svg
trunk/css/xenos/images/tick.svg
Added: trunk/css/aguapop/images/cross.svg
===================================================================
--- trunk/css/aguapop/images/cross.svg (rev 0)
+++ trunk/css/aguapop/images/cross.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3382">Cross image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Cross image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:date>2016-09-28</dc:date><dc:description>Cross image</dc:description><dc:language>en-GB</dc:language><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Cross" d="M 8,47 23,32 8,17 C 2,11 11,2 17,8 L 32,23 47,8 C 53,2 62,11 56,17 L 41,32 56,47 C 62,53 53,62 47,56 L 32,41 17,56 C 11,62 2,53 8,47 Z" /></g></svg>
\ No newline at end of file
Added: trunk/css/aguapop/images/next.svg
===================================================================
--- trunk/css/aguapop/images/next.svg (rev 0)
+++ trunk/css/aguapop/images/next.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3336">Next image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Next image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:date>2016-09-28</dc:date><dc:description>Next image</dc:description><dc:language>en-GB</dc:language><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Next" d="M 46,32 18,6 18,58 Z" /></g></svg>
\ No newline at end of file
Added: trunk/css/aguapop/images/previous.svg
===================================================================
--- trunk/css/aguapop/images/previous.svg (rev 0)
+++ trunk/css/aguapop/images/previous.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3336">Previous image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Previous image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:date>2016-09-28</dc:date><dc:description>Previous image</dc:description><dc:language>en-GB</dc:language><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Previous" d="M 18,32 46,6 46,58 Z" /></g></svg>
\ No newline at end of file
Modified: trunk/css/aguapop/images/return.svg
===================================================================
--- trunk/css/aguapop/images/return.svg 2016-10-04 20:37:44 UTC (rev 7641)
+++ trunk/css/aguapop/images/return.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -1,90 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg2"
- version="1.1"
- width="64"
- height="64"
- viewBox="0 0 64 64">
- <defs
- id="defs17" />
- <title
- id="title3359">Return image</title>
- <metadata
- id="metadata8">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Return image</dc:title>
- <dc:date>2016-09-28</dc:date>
- <dc:creator>
- <cc:Agent>
- <dc:title>Rafael E. Chacón</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:publisher>
- <cc:Agent>
- <dc:title>Rafael E. Chacón</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:description>Return image</dc:description>
- <dc:language>en-GB</dc:language>
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Notice" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Attribution" />
- <cc:prohibits
- rdf:resource="http://creativecommons.org/ns#CommercialUse" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#ShareAlike" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <filter
- id="i1"
- width="150%"
- height="150%">
- <feOffset
- result="offOut"
- in="SourceAlpha"
- dx="2"
- dy="4"
- id="feOffset6" />
- <feGaussianBlur
- result="blurOut"
- in="offOut"
- stdDeviation="1"
- id="feGaussianBlur8" />
- <feBlend
- in="SourceGraphic"
- in2="blurOut"
- mode="normal"
- id="feBlend10" />
- </filter>
- <g
- filter="url(#i1)"
- id="g12">
- <path
- id="Return"
- d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
- style="fill:#000080" />
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" id="svg2" version="1.1" width="64" height="64" viewBox="0 0 64 64"><title id="title3359">Return image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Return image</dc:title><dc:date>2016-09-28</dc:date><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:description>Return image</dc:description><dc:language>en-GB</dc:language><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter id="sh" width="150%" height="150%"><feOffset result="offOut" in="SourceAlpha" dx="2" dy="4" id="feOffset6" /><feGaussianBlur result="blurOut" in="offOut" stdDeviation="1" id="feGaussianBlur8" /><feBlend in="SourceGraphic" in2="blurOut" mode="normal" id="feBlend10" /></filter><g filter="url(#sh)" id="g12"><path id="Return" d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z" style="fill:#000080" /></g></svg>
\ No newline at end of file
Added: trunk/css/aguapop/images/tick.svg
===================================================================
--- trunk/css/aguapop/images/tick.svg (rev 0)
+++ trunk/css/aguapop/images/tick.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3383">Tick image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Tick image</dc:title><dc:date>2016-09-28</dc:date><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:description>Tick image</dc:description><dc:language>en-GB</dc:language><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#008000" id="Tick" d="M 55,17 C 59,12 49,5 46,10 19,36 27,51 19,32 15,26 5,33 9,39 30,75 23,45 55,17 Z" /></g></svg>
\ No newline at end of file
Added: trunk/css/default/images/cross.svg
===================================================================
--- trunk/css/default/images/cross.svg (rev 0)
+++ trunk/css/default/images/cross.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3382">Cross image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Cross image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:date>2016-09-28</dc:date><dc:description>Cross image</dc:description><dc:language>en-GB</dc:language><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Cross" d="M 8,47 23,32 8,17 C 2,11 11,2 17,8 L 32,23 47,8 C 53,2 62,11 56,17 L 41,32 56,47 C 62,53 53,62 47,56 L 32,41 17,56 C 11,62 2,53 8,47 Z" /></g></svg>
\ No newline at end of file
Added: trunk/css/default/images/next.svg
===================================================================
--- trunk/css/default/images/next.svg (rev 0)
+++ trunk/css/default/images/next.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3336">Next image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Next image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:date>2016-09-28</dc:date><dc:description>Next image</dc:description><dc:language>en-GB</dc:language><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Next" d="M 46,32 18,6 18,58 Z" /></g></svg>
\ No newline at end of file
Added: trunk/css/default/images/previous.svg
===================================================================
--- trunk/css/default/images/previous.svg (rev 0)
+++ trunk/css/default/images/previous.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" height="64" width="64" version="1.1" id="svg2"><title id="title3336">Previous image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Previous image</dc:title><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:date>2016-09-28</dc:date><dc:description>Previous image</dc:description><dc:language>en-GB</dc:language><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter height="150%" width="150%" id="sh"><feOffset id="feOffset6" dy="4" dx="2" in="SourceAlpha" result="offOut" /><feGaussianBlur id="feGaussianBlur8" stdDeviation="1" in="offOut" result="blurOut" /><feBlend id="feBlend10" mode="normal" in2="blurOut" in="SourceGraphic" /></filter><g id="g12" filter="url(#sh)"><path style="fill:#fc0e0c" id="Previous" d="M 18,32 46,6 46,58 Z" /></g></svg>
\ No newline at end of file
Modified: trunk/css/default/images/return.svg
===================================================================
--- trunk/css/default/images/return.svg 2016-10-04 20:37:44 UTC (rev 7641)
+++ trunk/css/default/images/return.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -1,90 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg2"
- version="1.1"
- width="64"
- height="64"
- viewBox="0 0 64 64">
- <defs
- id="defs17" />
- <title
- id="title3359">Return image</title>
- <metadata
- id="metadata8">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Return image</dc:title>
- <dc:date>2016-09-28</dc:date>
- <dc:creator>
- <cc:Agent>
- <dc:title>Rafael E. Chacón</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:publisher>
- <cc:Agent>
- <dc:title>Rafael E. Chacón</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:description>Return image</dc:description>
- <dc:language>en-GB</dc:language>
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Notice" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Attribution" />
- <cc:prohibits
- rdf:resource="http://creativecommons.org/ns#CommercialUse" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#ShareAlike" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <filter
- id="i1"
- width="150%"
- height="150%">
- <feOffset
- result="offOut"
- in="SourceAlpha"
- dx="2"
- dy="4"
- id="feOffset6" />
- <feGaussianBlur
- result="blurOut"
- in="offOut"
- stdDeviation="1"
- id="feGaussianBlur8" />
- <feBlend
- in="SourceGraphic"
- in2="blurOut"
- mode="normal"
- id="feBlend10" />
- </filter>
- <g
- filter="url(#i1)"
- id="g12">
- <path
- id="Return"
- d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z"
- style="fill:#000080" />
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" id="svg2" version="1.1" width="64" height="64" viewBox="0 0 64 64"><title id="title3359">Return image</title><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Return image</dc:title><dc:date>2016-09-28</dc:date><dc:creator><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:creator><dc:publisher><cc:Agent><dc:title>Rafael E. Chacon</dc:title></cc:Agent></dc:publisher><dc:description>Return image</dc:description><dc:language>en-GB</dc:language><cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><filter id="sh" width="150%" height="150%"><feOffset result="offOut" in="SourceAlpha" dx="2" dy="4" id="feOffset6" /><feGaussianBlur result="blurOut" in="offOut" stdDeviation="1" id="feGaussianBlur8" /><feBlend in="SourceGraphic" in2="blurOut" mode="normal" id="feBlend10" /></filter><g filter="url(#sh)" id="g12"><path id="Return" d="M 20.96875,54.658359 8.46875,43.158359 C 7.84375,42.158359 7.84375,41.158359 8.46875,40.158359 L 20.96875,29.658359 C 22.46875,28.428777 27.062502,26.158966 27,32.15864 L 27,35.15864 37.5,35.157999 C 40.5,35.157816 42.5,31.4 42.5,28.4 42.5,25.4 40.5,21.5 37.5,21.5 L 27,21.5 C 25.5,21.5 24,20 24,18.5 L 24,11 C 24,9.5 25.5,8 27,8 L 37.5,8 C 46.75,8 56,18.275 56,28.4 56,38.525 46.75,48.657684 37.5,48.657999 L 27,48.65864 27,51.65864 C 27,57.65864 22.588527,56.158359 20.96875,54.658359 Z" style="fill:#000080" /></g></svg>
\ No newline at end of file
Added: trunk/css/default/images/tick.svg
===================================================================
--- trunk/css/default/images/tick.svg (rev 0)
+++ trunk/css/default/images/tick.svg 2016-10-06 02:13:21 UTC (rev 7642)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalo...
[truncated message content] |
|
From: <dai...@us...> - 2016-10-07 09:21:47
|
Revision: 7643
http://sourceforge.net/p/web-erp/reponame/7643
Author: daintree
Date: 2016-10-07 09:21:45 +0000 (Fri, 07 Oct 2016)
Log Message:
-----------
Eatong: Format the ManualAPITutorial.html for easier reading
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualAPITutorial.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/style/manual.css
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-06 02:13:21 UTC (rev 7642)
+++ trunk/doc/Change.log 2016-10-07 09:21:45 UTC (rev 7643)
@@ -1,5 +1,8 @@
webERP Change Log
+05/10/16 Eatong: Format the ManualAPITutorial.html for easier reading.
+05/10/16 Eatong: Add CSS rule for <pre> for easier reading.
+05/10/16 Eatong: Align field length of salesanalysis.salesperson to salesman.salesmancode.
05/10/16 RChacon: Add cross.svg, next.svg, previous.svg, and tick.svg images in Scalable Vector Graphics (SVG) format for general use (any size).
04/10/16 RChacon: In class.pdf.php, fix the function addJpegFromFile() use of the functionality Image() of TCPDF class.
04/10/16 RChacon: In class.pdf.php, functions Rectangle() and RoundRectangle() use the functionalities Rect() and RoundedRectXY() of TCPDF class.
@@ -10,7 +13,7 @@
24/10/16 Simon Kelly: Fixed placing POs for sales orders using array form variable
24/09/16 waynemcdougall: Fixed missing date in Sales Price history
24/09/16 Exson: Make Justify feature workable in addTextWrap in class.pdf.php.
-24/09/16 Exson: Fixed the AddTextWrap missing characters errors when there is space and make it more reliable.
+24/09/16 Exson: Fixed the AddTextWrap missing characters errors when there is space and make it more reliable.
21/09/16 RChacon: In SuppWhereAlloc.php, accepts the payment multiple creditors. In CustWhereAlloc.php, accepts the receipt of multiple debtors.
18/09/16 RChacon: Add style to describe how button image should be displayed. Clean up Xenos css.
18/09/16 Exson: Add multiple items issue for non-controlled items feature to Work Orders in WorkOrderIssue.php.
@@ -22,7 +25,7 @@
04/09/16 Exson: Fixed the undefined noise in WorkOrderStatus.php.
04/09/16 Exson: Fixed the bug that work order location will be wrong when user select location which is not user's default location.
04/09/16 Dave Parrish fixed accumulated No of orders bug in SalesByTypePeriodInquiry.php.
-31/08/16 Exson: Addd new feature assign cash from one tab to another.
+31/08/16 Exson: Addd new feature assign cash from one tab to another.
24/08/16 Exson: Fixed the latin1 charset mixed bug in supplierdiscounts table;
24/9/16 Exson: Fixed the bug that days of payment terms in the following month over 31 days can not be handled correctly in DateFunctions.inc.
20/08/16 RChacon: In ConfirmDispatch_Invoice.php, fix table html code.
Modified: trunk/doc/Manual/ManualAPITutorial.html
===================================================================
--- trunk/doc/Manual/ManualAPITutorial.html 2016-10-06 02:13:21 UTC (rev 7642)
+++ trunk/doc/Manual/ManualAPITutorial.html 2016-10-07 09:21:45 UTC (rev 7643)
@@ -1,447 +1,430 @@
-<a id="APITutorial"><h1>Application Programming Interface</h1></a>
-
-<h2> API - Getting Started</h2>
-<p>
-webERP comes with a simple to use and flexible API that allows client programs to access webERP in a safe and secure manner. If you wish to write an application that accesses webERP, either to post transactions, or to extract information, then you should use the API, rather than try to access the webERP database directly, as the API makes sure that the integrity of the data is maintained. The API is an "<i>Application Program Interface</i>", that is intended to expose functionality to external programs. There are currently a number of low level functions it exposes to enable external applications to retrieve data and to update or insert data. However the API was structured in a manner that allows other protocols to be used very easily. All that would need to be done to use the SOAP protocol for instance would be to create an api_soap.php file with the same functions as the api_xmlrpc.php file.
-</p>
-The API uses the XML-RPC protocol to communicate between the client and the server. This was chosen because it is lightweight, simple, and easy to use. The API uses the XML-RPC for PHP - also called the phpxmlrpc class from Useful Inc originally developed by Edd Dumbill. This is an external library that is bundled with webERP code ready to run. Whilst the standard PHP XML-RPC extension could have been used, the extension is often not installed by default, so would add another dependency to webERP and complexity for the setup and installation of webERP.
-</p>
-<p>XML-RPC is a protocl to use XML to make RPC - remote procedure calls.</p>
-<p>
-Simply put the XML-RPC call is XML that contains the method of the remote procedure call together with any parameters and their data types and is sent over http as a POST to the XML-RPC server - the server returns an XML payload containing the results of the call. The parameters sent to the methods can contain arrays and associative arrays of data.</p>
-<p>
-The clever thing about XML-RPC is that it is the simplest protocol around for doing web-services. The newer and MUCH more complex SOAP - Simple Object Access Protocol - is quite involved and complicated. is founded on the KISS principle.</p>
-<p>
-In fact the XML-RPC "Server" in is just the script http://www.yourdomain.com//api/api_xml-rpc.php</p>
-<p>There is no daemon background process running continuously to field calls to the "server" it is just a script that is http posted to by the XML-RPC call sending the XML encoded method to be run together with the necessary parameters to the API - the server script runs the API php functions exposed by the xml-rpc methods and returns the XML-RPC response as an XML payload. The phpxmlrpc class does the packaging converting the PHP variables and arrays to the XML required for the XML-RPC call and also has the functions to convert the XML response into something useable in PHP without having to write the XML parsing routines.</p>
-<p>There is one hardcoded parameter that needs to be set in the api before you start to use it. The database name - the company database - to use with the api is defined in the file api/api_php.php - the variable
-<blockquote><i>$api_DatabaseName="demo";</i></blockquote>
-<p>should be set before attempting to use the api.</p>
-<p>
-It is worthwhile reading a how-to on XML-RPC with PHP which explains in more detail what is going on as a primer for the concepts.</p>
-<p>
-The beauty of XML-RPC is that the client calling the XML-RPC server and performing native functions can be called from any language (with XML-RPC bindings). I have used Vala, Genie and Python. Python particularly has been very straight forward as it has an xmlrpclib bundled with it. Of course a PHP client is also possible and is demonstrated below.</p>
-<p>
-The API help is actually produced by an xml-rpc call to the API using the system.listMethods method (this is a phpxmlrpc method - not a API method). Aother system xml-rpc method of phpxmlrpc class is used to return the details of each method"s parameters required. So the help file not only documents each of the API methods it is itself and illustration of how the API can be used!!</p>
-<p>In the narrative below, the word "<i>Server</i>" is used to refer to the host webERP installation - in fact the <i>"server"</i> this is the script webERP/xml-rpc/api_xmlrpc.php</p>
-<p>The API is configured by default to use the company database weberpdemo, and this is hard coded in the script api/api_php.php on line 6:
-<blockquote><i>
-$api_DatabaseName="weberpdemo";
-</i></blockquote>
-<p>This database should be changed manually before the API can be used to the company database that you wish the API to access. Note that the API can only work on one company in a webERP installation. This is a limitation of the design.</p>
-<p>Below is a simple example of how to use the API.</p>
-<p>It is a simple <i>client</i> (a consumer of the API) application where the stock quantity for the item DVD-TOPGUN is retrieved from the webERP installation using the API.
-<p>
-<hr>
-<blockquote><i>
-echo "Test API";
-<br />
-<br />//the xmlrpc class can output some funny warnings so make sure notices are turned off error_reporting (E_ALL & ~E_NOTICE);
-<br />
-<br />/* you need to include the phpxmlrpc class - see link above - copy the whole directory structure of the class over to your client application from the /xmlrpc directory */
-<br />
-<br />include ("xmlrpc/lib/xmlrpc.inc");
-<br />
-<br />//if your install is on a server at http://www.yourdomain.com/
-<br />
-<br />$ServerURL = "http://www.yourdomain.com//api/api_xml-rpc.php";
-<br />
-<br />$DebugLevel = 0; //Set to 0,1, or 2 with 2 being the highest level of debug info
-<br />
-<br />$Parameters = array();
-<br />
-<br />/* The trap for me was that each parameter needs to be run through xmlrpcval() - to create the necessary xml required for the rpc call if one of the parameters required is an array then it needs to be processing into xml for the rpc call through php_xmlrpc_encode()*/
-<br />
-<br />$Parameters["StockID"] = new xmlrpcval("DVD-TOPGUN"); //the stockid of the item we wish to know the balance for
-<br />
-<br />//assuming the demo username and password will work !
-<br />
-<br />$Parameters["Username"] = new xmlrpcval("admin");
-<br />
-<br />$Parameters["Password"] = new xmlrpcval("");
-<br />
-<br />$Msg = new xmlrpcmsg(".xmlrpc_GetStockBalance", $Parameters);
-<br />
-<br />$Client = new xmlrpc_client($ServerURL);
-<br />
-<br />$Client->setDebug($DebugLevel);
-<br />
-<br />$Response = $Client->send($Msg);
-<br />
-<br />$Answer = php_xmlrpc_decode($Response->value());
-<br />
-<br />if ($Answer[0]!=0){ //then the API returned some errors need to figure out what went wrong
-<br />
-<br /><blockquote>//need to figure out how to return all the error descriptions associated with the codes</blockquote>
-<br />
-<br />} else { //all went well the returned data is in $answer[1]
-<br />
-<br /><blockquote>//answer will be an array of the locations and quantity on hand for DVD_TOPGUN so we need to run through the array to print out
-<br />
-<br />for ($i=0; $i < sizeof($Answer[1]);$i++) {
-<br />
-<br /><blockquote>echo "" . $Answer[1][$i]["loccode"] . " has " . $Answer[1][$i]["quantity"] . " on hand";</blockquote>
-<br />
-<br />}
-<br /></blockquote>
-<br />}
-</blockquote></i>
-<hr />
-<p>
-To create invoices in you need to use the following methods:</p>
-<p>
-InsertOrderHeader InsertOrderLine - potentially multiple times for all the lines on the order then InvoiceSalesOrder - to invoice sales orders directly assuming the entire order is delivered - it cannot deal with controlled stock items though. However, it does process invoices in much the same way as standard with updates to the stock quantities dispatched, GL entries and records required to record taxes and sales analysis records.</p>
-<p>
-To create a credit note just a sinlge API call is required:</p>
-<p>
-CreateCreditNote - to create a credit note from some base header data and an array of line items (as an associative array. In the same way as the InvoiceSalesOrder function this does all the same processing as a standard credit note from the interface in .</p>
-<p>
-There are some example scripts on the wiki showing how a number of the API XML-RPC functions are called - these scripts should be put on a web-server outside a installation - all you need to do is edit the config.inc file to give the system your username and password and the URL of your installation you wish to connect to. As always playing with the examples helps to figure out how it all works.</p>
-<br />
-<h2>An Example Client</h2>
-<p>For this example we will build a small PHP application that will first interrogate webERP for a full list of available stock locations, build them into an HTML drop down list and then allow a user to input a stock item code and return the quantity of stock of that item at the selected location. We will use PHP for simplicity but any language that has an xmlrpc library (just about every language) can be used to write a client.</p>
-<p>Firstly we need the xmlrpc library, so we copy the xmlrpc sub-directory from webERP to this new project.</p>
-<p>The basic code will look like this, and be saved into a file called index.php:</p>
-<blockquote><i>
-<html>
- <head>
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- </head>
- <body>
- <form action="index.html" method="post">
- Stock Code:<input type="text" name="StockID" /><br />
- Location:<select name="location">
- <?php // Here will go the available stock locations from webERP?>
- </select><br />
- <input type="submit" name="submit" value="Submit" />
- </form>
- </body>
-</html>
-</blockquote></i>
-<p>As its name suggests, the xmlrpc function calls are made by sending an XML file with the function name and the parameters to the server, and receive an XML file back from the server.</p>
-<p>To assist with this, the phpxmlrpc library that webERP uses (and we will use as well for our client) contains methods to encode our function call as XML, and to decode the XML that we receive back.</p>
-<p>First off we need to include the xmlrpc library in our file, so immediately above the HTML, we need the following:</p>
-<blockquote><i>
-<?php
- include "xmlrpc/lib/xmlrpc.inc";
- $xmlrpc_internalencoding="UTF-8";
- include "xmlrpc/lib/xmlrpcs.inc";
-?>
-</blockquote></i>
-<p>To populate the drop down box with the stock locations in it the API function called webERP.xmlrpc_GetLocationList() is used. This function takes two parameters, a valid userid for the webERP instance, and the password for that user. Using the demo credentials is admin/weberp. Also, the file api_php.php must have the $api_databasename set to whatever the name of the database is on your target webERP installation.</p>
-<p>The function to get the inventory locations will look like this, and be at the bottom of the file, within a PHP code section (ie <?php ?>).</p>
-<blockquote><i>
-<br /> function GetLocations() {
-<br />
-<br /> //Encode the user/password combination
-<br /> $UserID = php_xmlrpc_encode("admin");
-<br /> $Password = php_xmlrpc_encode("webERP");
-<br />
-<br /> //Create a client object to use for xmlrpc call
-<br /> $Client = new xmlrpc_client("http://localhost/webERP/api/api_xml-rpc.php");
-<br />
-<br /> //Create a message object, containing the parameters and the function name
-<br /> $Message = new xmlrpcmsg("webERP.xmlrpc_GetLocationList", array($UserID, $Password));
-</blockquote></i>
-<p>The most common error just return no authorisation with no information about why this has happened. Most webERP API/XML-RPC calls returns an array containing two elements, the first - $Response[0] containing an integer code, and the second the result of the call, if one is expected. If the integer code is zero, this indicates success. Any other code indicates an error. These are the errors and the codes that are returned to represent them:
-<blockquote><i>
-<br />NoAuthorisation - 1
-<br />IncorrectDebtorNumberLength - 1000
-<br />DebtorNoAlreadyExists - 1001
-<br />IncorrectDebtorNameLength - 1002
-<br />InvalidAddressLine - 1003
-<br />CurrencyCodeNotSetup - 1004
-<br />SalesTypeNotSetup - 1005
-<br />InvalidClientSinceDate - 1006
-<br />HoldReasonNotSetup - 1007
-<br />PaymentTermsNotSetup - 1008
-<br />InvalidDiscount - 1009
-<br />InvalidPaymentDiscount - 1010
-<br />InvalidLastPaid - 1011
-<br />InvalidLastPaidDate - 1012
-<br />InvalidCreditLimit - 1013
-<br />InvalidInvAddrBranch - 1014
-<br />InvalidDiscountCode - 1015
-<br />InvalidEDIInvoices - 1016
-<br />InvalidEDIOrders - 1017
-<br />InvalidEDIReference - 1018
-<br />InvalidEDITransport - 1019
-<br />InvalidEDIAddress - 1020
-<br />InvalidEDIServerUser - 1021
-<br />InvalidEDIServerPassword - 1022
-<br />InvalidTaxRef - 1023
-<br />InvalidCustomerPOLine - 1024
-<br />DatabaseUpdateFailed - 1025
-<br />NoDebtorNumber - 1026
-<br />DebtorDoesntExist - 1027
-<br />IncorrectBranchNumberLength - 1028
-<br />BranchNoAlreadyExists - 1029
-<br />IncorrectBranchNameLength - 1030
-<br />InvalidEstDeliveryDays - 1031
-<br />AreaCodeNotSetup - 1032
-<br />SalesmanCodeNotSetup - 1033
-<br />InvalidFwdDate - 1034
-<br />InvalidPhoneNumber - 1035
-<br />InvalidFaxNumber - 1036
-<br />InvalidContactName - 1037
-<br />InvalidEmailAddress - 1038
-<br />LocationCodeNotSetup - 1039
-<br />TaxGroupIdNotSetup - 1040
-<br />ShipperNotSetup - 1041
-<br />InvalidDeliverBlind - 1042
-<br />InvalidDisableTrans - 1043
-<br />InvalidSpecialInstructions - 1044
-<br />InvalidCustBranchCode - 1045
-<br />BranchNoDoesntExist - 1046
-<br />StockCodeDoesntExist - 1047
-<br />StockCategoryDoesntExist - 1048
-<br />IncorrectStockDescriptionLength - 1049
-<br />IncorrectUnitsLength - 1050
-<br />IncorrectMBFlag - 1051
-<br />InvalidCurCostDate - 1052
-<br />InvalidActualCost - 1053
-<br />InvalidLowestLevel - 1054
-<br />InvalidDiscontinued - 1055
-<br />InvalidEOQ - 1056
-<br />InvalidVolume - 1057
-<br />InvalidKgs - 1058
-<br />IncorrectBarCodeLength - 1059
-<br />IncorrectDiscountCategory - 1060
-<br />TaxCategoriesDoesntExist - 1061
-<br />InvalidSerialised - 1062
-<br />IncorrectAppendFile - 1063
-<br />InvalidPerishable - 1064
-<br />InvalidDecmalPlaces - 1065
-<br />IncorrectLongStockDescriptionLength - 1066
-<br />StockCodeAlreadyExists - 1067
-<br />TransactionNumberAlreadyExists - 1068
-<br />InvalidTranDate - 1069
-<br />InvalidSettled - 1070
-<br />IncorrectReference - 1071
-<br />IncorrectTpe - 1072
-<br />InvalidOrderNumbers - 1073
-<br />InvalidExchangeRate - 1074
-<br />InvalidOVAmount - 1075
-<br />InvalidOVGst - 1076
-<br />InvalidOVFreight - 1077
-<br />InvalidDiffOnExchange - 1078
-<br />InvalidAllocation - 1079
-<br />IncorrectInvoiceText - 1080
-<br />InvalidShipVia - 1081
-<br />InvalidEdiSent - 1082
-<br />InvalidConsignment - 1083
-<br />InvalidLastCost - 1084
-<br />InvalidMaterialCost - 1085
-<br />InvalidLabourCost - 1086
-<br />InvalidOverheadCost - 1087
-<br />InvalidCustomerRef - 1088
-<br />InvalidBuyerName - 1089
-<br />InvalidComments - 1090
-<br />InvalidOrderDate - 1091
-<br />InvalidDeliverTo - 1092
-<br />InvalidFreightCost - 1094
-<br />InvalidDeliveryDate - 1095
-<br />InvalidQuotationFlag - 1096
-<br />OrderHeaderNotSetup - 1097
-<br />InvalidUnitPrice - 1098
-<br />InvalidQuantity - 1099
-<br />InvalidDiscountPercent - 1100
-<br />InvalidNarrative - 1101
-<br />InvalidItemDueDate - 1102
-<br />InvalidPOLine - 1103
-<br />GLAccountCodeAlreadyExists - 1104
-<br />IncorrectAccountNameLength - 1105
-<br />AccountGroupDoesntExist - 1106
-<br />GLAccountSectionAlreadyExists - 1107
-<br />IncorrectSectionNameLength - 1108
-<br />GLAccountGroupAlreadyExists - 1109
-<br />GLAccountSectionDoesntExist - 1110
-<br />InvalidPandL - 1111
-<br />InvalidSequenceInTB - 1112
-<br />GLAccountGroupDoesntExist - 1113
-<br />InvalidLatitude - 1114
-<br />InvalidLongitude - 1115
-<br />CustomerTypeNotSetup - 1116
-<br />NoPricesSetup - 1117
-<br />InvalidInvoicedQuantity - 1118
-<br />InvalidActualDispatchDate - 1119
-<br />InvalidCompletedFlag - 1120
-<br />InvalidCategoryID - 1121
-<br />InvalidCategoryDescription - 1122
-<br />InvalidStockType - 1123
-<br />GLAccountCodeDoesntExists - 1124
-<br />StockCategoryAlreadyExists - 1125
-<br />SupplierNoAlreadyExists - 1126
-<br />IncorrectSupplierNameLength - 1127
-<br />InvalidSupplierSinceDate - 1128
-<br />InvalidBankAccount - 1129
-<br />InvalidBankReference - 1130
-<br />InvalidBankPartics - 1131
-<br />InvalidRemittanceFlag - 1132
-<br />FactorCompanyNotSetup - 1133
-<br />SupplierNoDoesntExists - 1134
-<br />InvalidSuppliersUOM - 1135
-<br />InvalidConversionFactor - 1136
-<br />InvalidSupplierDescription - 1137
-<br />InvalidLeadTime - 1138
-<br />InvalidPreferredFlag - 1139
-<br />StockSupplierLineDoesntExist - 1140
-<br />InvalidRequiredByDate - 1141
-<br />InvalidStartDate - 1142
-<br />InvalidCostIssued - 1143
-<br />InvalidQuantityRequired - 1144
-<br />InvalidQuantityReceived - 1145
-<br />InvalidStandardCost - 1146
-<br />IncorrectSerialNumber - 1147
-<br />WorkOrderDoesntExist - 1148
-<br />InvalidIssuedQuantity - 1149
-<br />InvalidTransactionDate - 1150
-<br />InvalidReceivedQuantity - 1151
-<br />ItemNotControlled - 1152
-<br />ItemSerialised - 1153
-<br />BatchNumberDoesntExist - 1154
-<br />BatchIsEmpty - 1155
-<br />NoSuchArea - 1156
-<br />NoSuchSalesMan - 1157
-<br />NoCompanyRecord - 1158
-<br />NoReadOrder - 1159
-<br />NoReadOrderLines - 1160
-<br />NoTaxProvince - 1161
-<br />TaxRatesFailed - 1162
-<br />NoReadCustomerBranch - 1163
-<br />NoReadItem - 1164
-<br />MustBeReceiptOrCreditNote - 1165
-<br />NoTransactionToAllocate - 1166
-</blockquote></i>
-
-<p>As you can see error code 1 indicates "NoAuthorisation" which will be the error returned if the user name or password is incorrect and also if the name of the database to be used in the api call is not specified correctly in the file webERP/api/api_php.php in the variable:</p>
-<blockquote><i>
-$api_DatabaseName="weberpdemo";
-</blockquote></i>
-<p>To catch the errors we create a session variable to hold any error messages that happen, so that we can show the to the user. So the initialisation code at the top of index.php becomes:</p>
-
-<blockquote><i><?php
-<br />include "xmlrpc/lib/xmlrpc.inc";
-<br />$xmlrpc_internalencoding="UTF-8";
-<br />include "xmlrpc/lib/xmlrpcs.inc";
-<br />$_SESSION["Errors"] = array();
-?>
-</i></blockquote>
-<p>and then at the bottom of the output we have a loop to output these errors:</p>
-<blockquote><i>
-<br />foreach ($_SESSION["Errors"] as $Error) {
-<br />echo $Error;
-<br />}
-</i></blockquote>
-<br />Now we just need to capture that error. We need to put this code at the bottom of the GetLocations() function so that it now reads:
-<blockquote><i>
-<br />if ($ReturnValue[0] == 0) {
-<br /> return $ReturnValue[1];
-<br />} elseif ($ReturnValue[0] == 1) {
-<br /> $_SESSION["Errors"][] = "Incorrect login/password credentials used";
-<br />}
-</i></blockquote>
-<br />Now run the index.php script again in your browser and you should get output similar to this:
-<br />
-<br />We just need to put this code at the bottom of our other functions, and then they will all be able to catch this error.
-<br />
-<br />Now if we put the proper password back in index.php should work as before.
-<br />
-<br />Now try entering a stock code that you know doesn"t exist and see what happens. I entered a part code called "wrong" and this is what I see.
-<br />
-<br />This is not very helpful output so we need catch this error. A quick look here shows that error code 1047 is "StockCodeDoesntExist" and this should be returned if the code we entered is wrong. So we need to capture error 1047 in the GetStockQuantity() function. The code at the end of this function now becomes:
-<blockquote><i>
-<br />} elseif ($ReturnValue[0] == 1) {
-<br />$_SESSION["Errors"][] = "Incorrect login/password credentials used";
-<br />} elseif ($ReturnValue[0] == 1047) {
-<br />$_SESSION["Errors"][] = "The stock code you entered does not exist";
-<br />}
-</blockquote></i>
-<br />So now the function is checking that the user/password is correct and also checking that the stock code is correct and providing useful feedback in the case of any problems. We could go on and check for other errors but this should be enough for now.
-<br />
-<br />To do this we need a function much like the one we used to extract the array of location codes. Here is the full code:
-<blockquote><i>
-<br /> function LocationName($LocationCode) {
-<br />
-<br />//Encode the data items
-<br /> $UserID = php_xmlrpc_encode("admin");
-<br /> $Password = php_xmlrpc_encode("webERP");
-<br /> $Code = php_xmlrpc_encode($LocationCode);
-<br />
-<br /> //Create a client object to use for xmlrpc call and set its debug level to zero
-<br /> $Client = new xmlrpc_client("http://localhost/webERP/api/api_xml-rpc.php");
-<br /> $Client->setDebug(0);
-<br />
-<br /> //Create a message object, containing the parameters and the function name
-<br /> $Message = new xmlrpcmsg("webERP.xmlrpc_GetLocationDetails", array($Code, $UserID, $Password));
-<br />
-<br /> //Use the client object to send the message object to the server, returning the response
-<br /> $Response = $Client->send($Message);
-<br />
-<br /> //Decode the response and return the array
-<br /> $ReturnValue = php_xmlrpc_decode($Response->value());
-<br /> if ($ReturnValue[0] == 0) {
-<br /> return $ReturnValue[1]["locationname"];
-<br /> }
-<br /> }
-</blockquote></i>
-<br />
-<p>The first section encodes the parameters as XML. The first two parameters are always the userid/password combination, and for this function call we need a third parameter, which is the code of the location that we require the name of. The second section is identical to the previous function and creates an instance of the XML-RPC client class. The third section then creates an instance of the message class, with the first parameter being the full name of the API function being called, in this case webERP.xmlrpc_GetLocationDetails, and then the second parameter is an array of the encoded parameters, (location code, userid, password). This message is then sent to the server, and the response decoded into an array called $ReturnValue.</p>
-<p>As last time the first element of the array signifies whether the function was successful (a zero), or any other integer for an error code. The second element is an associative array of details for that location. The key of each element is the field name for that value. In our case we just want the location name, so we return the element ["locationname"]. If it was the telephone number we were interested in we would just return the ["tel"] element.</p>
-<p>Changing the line in the HTML where we fill the drop down box to:</p>
-<blockquote><i>
-echo <option value=" . $LocationCode . "> . LocationName($LocationCode) . "</option>";
-</blockquote></i>
-<p>The full name of the location appears in the drop down the list, but the value returned by the form is still just the code.</p>
-<p>All that is left to complete our client, is to type a stock code in the text box, submit the form and return the amount of stock for that code at the chosen location. First we need to insert some PHP code in the HTML to handle the form being sent:</p>
-
-<blockquote><i>
-<br /> if (isset($_POST["submit"])) {
-<br /> echo "The quantity of " . $_POST["StockID"] . " at " . $_POST["location"] . " is : " . GetStockQuantity($_POST["StockID"], $_POST["location"]);
-<br /> }
-</blockquote></i>
-<p>As you can see this calls another PHP function - GetStockQuantity() - that retrieves the stock quantity for the required item at the required location. Looking at the API function reference in the manual the API function we require is webERP.xmlrpc_GetStockBalance. However this time there is a small addition we require as this function returns an array containing the stock balances at all the locations for the given stock item.</p>
-<p>The full code for the PHP function is:</p>
-<blockquote><i>
-<br />function GetStockQuantity($StockID, $LocationCode) {
-<br /> //Encode the data items
-<br /> $UserID = php_xmlrpc_encode("admin");
-<br /> $Password = php_xmlrpc_encode("webERP");
-<br /> $StockCode = php_xmlrpc_encode($StockID);
-<br />
-<br /> //Create a client object to use for xmlrpc call and set its debug level to zero
-<br /> $Client = new xmlrpc_client("http://localhost/webERP/api/api_xml-rpc.php");
-<br /> $Client->setDebug(0);
-<br /> //Create a message object, containing the parameters and the function name
-<br /> $Message = new xmlrpcmsg("webERP.xmlrpc_GetStockBalance", array($StockCode, $UserID, $Password));
-<br /> //Use the client object to send the message object to the server, returning the response
-<br /> $Response = $Client->send($Message);
-<br /> //Decode the response and return the array
-<br /> $ReturnValue = php_xmlrpc_decode($Response->value());
-<br /> if ($ReturnValue[0] == 0) {
-<br /> $Items = $ReturnValue[1];
-<br /> for ($i=0; $i<sizeOf($Items); $i++) {
-<br /> if ($Items[$i]["loccode"]==$LocationCode) {
-<br /> return $Items[$i]["quantity"];
-<br /> }
-<br /> }
-<br /> }
-<br /> }
-</blockquote></i>
-<br />
-<p>I wont go through this in details as it is mostly the same as the previous functions. The key section is the last:</p>
-<blockquote><i>
-<br /> $ReturnValue = php_xmlrpc_decode($Response->value());
-<br /> if ($ReturnValue[0] == 0) {
-<br /> $Items = $ReturnValue[1];
-<br /> for ($i=0; $i<sizeOf($Items); $i++) {
-<br /> ...
[truncated message content] |
|
From: <rc...@us...> - 2016-10-11 15:52:22
|
Revision: 7644
http://sourceforge.net/p/web-erp/reponame/7644
Author: rchacon
Date: 2016-10-11 15:52:19 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
In CompanyPreferences.php, add label tag and id attribute to ease the input of CurrencyDefault. In Currencies.php, add link to the input of CurrencyDefault. In SystemParameters.php, fix link to manual. In doc/Manual/ManualCreatingNewSystem.html, fix links and content.
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/Currencies.php
trunk/SystemParameters.php
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/CompanyPreferences.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -1,11 +1,9 @@
<?php
+/* $Id$ */
+/* Defines the settings applicable for the company, including name, address, tax authority reference, whether GL integration used etc. */
-/* $Id$*/
-
include('includes/session.inc');
-
$Title = _('Company Preferences');
-/* webERP manual links before header.inc */
$ViewTopic= 'CreatingNewSystem';
$BookMark = 'CompanyParameters';
include('includes/header.inc');
@@ -234,8 +232,8 @@
include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
echo '<tr>
- <td>' . _('Home Currency') . ':</td>
- <td><select tabindex="13" name="CurrencyDefault">';
+ <td><label for="CurrencyDefault">', _('Home Currency'), ':</label></td>
+ <td><select id="CurrencyDefault" name="CurrencyDefault" tabindex="13" >';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrencyDefault']==$myrow['currabrev']){
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/Currencies.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -389,7 +389,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?&SelectedCurrency=' . urlencode($myrow['currabrev']) . '">' . _('Edit') . '</a></td>
- <td colspan="2">' . _('Functional Currency') . '</td>
+ <td colspan="2"><a href="CompanyPreferences.php#CurrencyDefault">' . _('Functional Currency') . '</a></td>
</tr>',
$ImageFile,
$myrow['currabrev'],
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/SystemParameters.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -3,16 +3,16 @@
/* This script is for maintenance of the system parameters. */
include('includes/session.inc');
-
-$Title = _('System Parameters');// Screen identificator.
-$ViewTopic= 'GettingStarted';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'SystemConfiguration';// Anchor's id in the manual's html document.
+$Title = _('System Parameters');
+$ViewTopic = 'CreatingNewSystem';
+$BookMark = 'SystemParameters';
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/maintenance.png" title="' .// Title icon.
- $Title . '" />' .// Icon title.
- $Title . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+
include('includes/CountriesArray.php');
if (isset($_POST['submit'])) {
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2016-10-11 15:52:19 UTC (rev 7644)
@@ -60,30 +60,33 @@
For GL integration at the sales level the posting codes for sales for a specific sales type, sales area and stock category need to be defined from Setup > Sales GL Interface Postings. For Stock GL integration then the cost of sales posting codes for a specific sales type, sales area and stock catgeory also need to be set up from Setup > COGS GL Interface Postings (COGS = Cost Of Goods Sold). If appropriate GL codes are not specified the system will automatically create a new GL account number 1 for the postings to be made to. If you have this account keep appearing then this is a good sign that default posting codes are not created.</p>
<!-- Help End: CompanyPreferences -->
- <!-- Help Begin: SystemConfiguration -->
+ <!-- Help Begin: SystemParameters -->
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
-<h2><a id="SystemConfiguration">System Configuration</a></h2>
+<h2><a id="SystemParameters">System Parameters</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>
<table border="1" width="100%">
+<thead>
<tr>
<th style="width:20%;">Parameter</th>
<th>Description</th>
</tr>
+</thead>
+<tbody>
<tr>
- <td>Default Date Format (for input and to appear on reports)</td>
-
- <td>The default date format for entry of dates and display use d/m/Y for England/Australia/NZ or m/d/Y for US and Canada</td>
+ <td align="center" colspan="2"><b>General Settings</b></td>
</tr>
-
<tr>
- <td>New Users Default Theme:</td>
-
- <td>The default theme is used for new users who have not yet defined the display colour scheme theme of their choice</td>
+ <td>Default Date Format:</td>
+ <td>The default date format for entry of dates and display. It is for input and to appear on reports. The default date format for entry of dates and display use Y-m-d for ISO 8601, d/m/Y for England/Australia/NZ, m/d/Y for US and Canada, or else.</td>
</tr>
+ <tr>
+ <td>Default Theme:</td>
+ <td>The default theme to use for the login screen and the setup of new users. It is used for new users who have not yet defined the display colour scheme theme of their choice. The users' theme selection will override it.</td>
+ </tr>
<tr>
<td colspan="2" align="center"><b>Accounts Receivable/Payable Settings</b></td>
@@ -360,6 +363,7 @@
<p></p>
</td>
</tr>
+</tbody>
</table>
<!-- Help End: SystemConfiguration -->
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-11 15:52:19 UTC (rev 7644)
@@ -8,8 +8,8 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-06-11 14:24-0600\n"
-"Last-Translator: Rafael Chacon <raf...@gm...>\n"
+"PO-Revision-Date: 2016-10-07 12:41-0600\n"
+"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
@@ -3877,7 +3877,7 @@
#: BOMs_SingleLevel.php:7
msgid "Bill Of Materials Maintenance"
-msgstr ""
+msgstr "Mantenimiento de lista de materiales"
#: BOMs_SingleLevel.php:260 StockAdjustments.php:171
msgid "The quantity entered cannot be zero"
@@ -11212,7 +11212,7 @@
#: DailyBankTransactions.php:182
msgid "Previous Balance"
-msgstr ""
+msgstr "Saldo anterior"
#: DailyBankTransactions.php:198
msgid "Failed to retrieve gl narrative"
@@ -11220,7 +11220,7 @@
#: DailyBankTransactions.php:238
msgid "Account Balance"
-msgstr ""
+msgstr "Saldo de la cuenta"
#: DailyBankTransactions.php:252 GLJournalInquiry.php:142
msgid "Select Another Date"
@@ -26160,7 +26160,7 @@
#: ReprintGRN.php:92 SupplierGRNAndInvoiceInquiry.php:41
#: SupplierGRNAndInvoiceInquiry.php:75
msgid "Invoice No"
-msgstr ""
+msgstr "Factura No."
#: ReprintGRN.php:112
msgid "Reprint GRN "
@@ -28433,11 +28433,11 @@
#: SelectCustomer.php:558
msgid "Latitude"
-msgstr ""
+msgstr "Latitud"
#: SelectCustomer.php:558
msgid "Longitude"
-msgstr ""
+msgstr "Longitud"
#: SelectCustomer.php:562
msgid "Unable to update GeoCode for CustomerID"
@@ -28467,7 +28467,7 @@
#: SelectCustomer.php:681
msgid "Last Paid Date"
-msgstr ""
+msgstr "Última fecha de pago"
#: SelectCustomer.php:687
msgid "Last Paid Amount (inc tax)"
@@ -39724,7 +39724,7 @@
#: WorkOrderIssue.php:939
msgid "Lot No"
-msgstr ""
+msgstr "Lote No."
#: WorkOrderIssue.php:952
msgid "Quantity Issued"
Modified: trunk/sql/mysql/upgrade4.13-4.13.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-10-11 15:52:19 UTC (rev 7644)
@@ -1,15 +1,14 @@
-INSERT INTO scripts VALUES ('InternalStockRequestInquiry.php',1,'Internal Stock Request inquiry');
-ALTER table stockrequest ADD initiator varchar(20) NOT NULL DEFAULT '';
-INSERT INTO securitytokens VALUES (19,'Internal stock request fully access authority');
-INSERT INTO scripts VALUES ('PDFGLJournalCN.php',1,'Print GL Journal Chinese version');
-ALTER table custcontacts ADD statement tinyint(4) NOT NULL DEFAULT 0;
-INSERT INTO scripts VALUES ('PcTabExpensesList.php', '15', 'Creates excel with all movements of tab between dates');
-
+ALTER TABLE `custcontacts` ADD `statement` TINYINT(4) NOT NULL DEFAULT 0;
-- standardise transaction date to DATE type:
ALTER TABLE `debtortrans` CHANGE `trandate` `trandate` DATE NOT NULL DEFAULT '0000-00-00';
-ALTER table supplierdiscounts CONVERT TO CHARACTER SET utf8;
-INSERT INTO scripts VALUES ('PcAssignCashTabToTab.php',12,'Assign cash from one tab to another');
-ALTER table workorders ADD remark text DEFAULT NULL;
-ALTER table workorders ADD reference varchar(40) NOT NULL DEFAULT '';
+ALTER TABLE `salesanalysis` CHANGE `salesperson` `salesperson` VARCHAR(4) DEFAULT '' NOT NULL;
+ALTER TABLE `stockrequest` ADD `initiator` VARCHAR(20) NOT NULL DEFAULT '';
+ALTER TABLE `supplierdiscounts` CONVERT TO CHARACTER SET utf8;
+ALTER TABLE `workorders` ADD `reference` VARCHAR(40) NOT NULL DEFAULT '';
+ALTER TABLE `workorders` ADD `remark` TEXT DEFAULT NULL;
+INSERT INTO `scripts` VALUES ('InternalStockRequestInquiry.php', 1, 'Internal Stock Request inquiry');
+INSERT INTO `scripts` VALUES ('PcAssignCashTabToTab.php', 12, 'Assign cash from one tab to another');
+INSERT INTO `scripts` VALUES ('PcTabExpensesList.php', '15', 'Creates excel with all movements of tab between dates');
+INSERT INTO `scripts` VALUES ('PDFGLJournalCN.php', 1, 'Print GL Journal Chinese version');
+INSERT INTO `securitytokens` VALUES (19, 'Internal stock request fully access authority');
-ALTER TABLE `salesanalysis` CHANGE `salesperson` `salesperson` VARCHAR(4) DEFAULT '' NOT NULL;
|
|
From: <rc...@us...> - 2016-10-17 05:34:10
|
Revision: 7645
http://sourceforge.net/p/web-erp/reponame/7645
Author: rchacon
Date: 2016-10-17 05:34:08 +0000 (Mon, 17 Oct 2016)
Log Message:
-----------
Fix function convertDate(dS,dF).
Modified Paths:
--------------
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-11 15:52:19 UTC (rev 7644)
+++ trunk/doc/Change.log 2016-10-17 05:34:08 UTC (rev 7645)
@@ -1,5 +1,6 @@
webERP Change Log
+16/10/16 RChacon: Fix function convertDate(dS,dF).
05/10/16 Eatong: Format the ManualAPITutorial.html for easier reading.
05/10/16 Eatong: Add CSS rule for <pre> for easier reading.
05/10/16 Eatong: Align field length of salesanalysis.salesperson to salesman.salesmancode.
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2016-10-11 15:52:19 UTC (rev 7644)
+++ trunk/javascripts/MiscFunctions.js 2016-10-17 05:34:08 UTC (rev 7645)
@@ -2,9 +2,11 @@
c.select();
c.focus();
}
+
function ReloadForm(fB){
fB.click();
}
+
function rTN(event){
if (window.event) k=window.event.keyCode;
else if (event) k=event.which;
@@ -15,6 +17,7 @@
else if ((("0123456789.,- ").indexOf(kC)>-1)) return true;
else return false;
}
+
function rTI(event){
if (window.event) k=window.event.keyCode;
else if (event) k=event.which;
@@ -24,6 +27,7 @@
else if ((("0123456789-").indexOf(kC)>-1)) return true;
else return false;
}
+
function rLocaleNumber(){
var Lang = document.getElementById('Lang').value;
switch(Lang){
@@ -56,9 +60,11 @@
return false;
};
}
+
function assignComboToInput(c,i){
i.value=c.value;
}
+
function inArray(v,tA,m){
for (i=0;i<tA.length;i++) {
if (v.value==tA[i].value) {
@@ -68,6 +74,7 @@
alert(m);
return false;
}
+
function isDate(dS,dF){
switch (dF) {
case "d/m/Y":
@@ -120,6 +127,7 @@
}
return true;
}
+
function eitherOr(o,t){
if (o.value!='') t.value='';
else if (o.value=='NaN') o.value='';
@@ -155,6 +163,7 @@
cD.style.zIndex=10000;
drawCalendar(md,dt.getFullYear(),dt.getMonth(),dt.getDate(),dF);
}
+
function drawCalendar(md,y,m,d,dF){
var tD=new Date();
if ((m>=0) && (y>0)) tD=new Date(y,m,1);
@@ -183,6 +192,7 @@
html+="</table>";
document.getElementById(dateDivID).innerHTML=html;
}
+
function getButtonCode(mD,dV,a,lb,dF){
nM=(dV.getMonth()+a)%12;
nY=dV.getFullYear()+parseInt((dV.getMonth()+a)/12,10);
@@ -192,6 +202,7 @@
}
return "<button onClick='drawCalendar(\""+mD+"\","+nY+","+nM+","+1+",\""+dF+"\");'>"+lb+"</button>";
}
+
function formatDate(dV,dF){
ds=String(dV.getDate());
ms=String(dV.getMonth()+1);
@@ -211,37 +222,50 @@
return m+"/"+d+"/"+y;
}
}
+
function convertDate(dS,dF){
- var d,m,y;
- if (dF=="d.m.Y")
- dA=dS.split(".");
- else
- dA=dS.split("/");
- switch (dF){
- case "d/m/Y":
+ // Converts a date in DefaultDateFormat into a javascript date-object.
+ // dS: Date to convert.
+ // dF: Date format. Formats: "d/m/Y", "d.m.Y", "m/d/Y", "Y-m-d", "Y/m/d".
+ var y,m,d;
+ switch(dF){
+ case "d/m/Y":
+ dA=dS.split("/");
d=parseInt(dA[0],10);
m=parseInt(dA[1],10)-1;
y=parseInt(dA[2],10);
- break;
- case "d.m.Y":
- d=parseInt(dA[0],10);
- m=parseInt(dA[1],10)-1;
- y=parseInt(dA[2],10);
- break;
- case "Y-m-d":
- case "Y/m/d":
- d=parseInt(dA[2],10);
- m=parseInt(dA[1],10)-1;
- y=parseInt(dA[0],10);
- break;
- default :
- d=parseInt(dA[1],10);
- m=parseInt(dA[0],10)-1;
- y=parseInt(dA[2],10);
- break;
-}
+ break;
+ case "d.m.Y":
+ dA=dS.split(".");
+ d=parseInt(dA[0],10);
+ m=parseInt(dA[1],10)-1;
+ y=parseInt(dA[2],10);
+ break;
+ case "m/d/Y":
+ dA=dS.split("/");
+ m=parseInt(dA[0],10);
+ d=parseInt(dA[1],10)-1;
+ y=parseInt(dA[2],10);
+ break;
+ case "Y-m-d":
+ dA=dS.split("-");
+ y=parseInt(dA[0],10);
+ m=parseInt(dA[1],10)-1;
+ d=parseInt(dA[2],10);
+ break;
+ case "Y/m/d":
+ dA=dS.split("/");
+ y=parseInt(dA[0],10);
+ m=parseInt(dA[1],10)-1;
+ d=parseInt(dA[2],10);
+ break;
+ default:
+ alert("Unknown date format "+dF);
+ return false;
+ }
return new Date(y,m,d);
}
+
function postDate(mydate,dS){
var iF=document.getElementsByName(mydate).item(0);
iF.value=dS;
@@ -250,12 +274,15 @@
cD.style.display="none";
iF.focus();
}
+
function clickDate(){
Calendar(this.name,this.alt);
}
+
function changeDate(){
isDate(this.value,this.alt);
}
+
function SortSelect() {
selElem=this;
var tmpArray = new Array();
@@ -321,6 +348,7 @@
}
return;
}
+
function initial(){
if (document.getElementsByTagName){
var as=document.getElementsByTagName("a");
@@ -355,6 +383,7 @@
if (ds[i].className=="ascending") ds[i].onclick=SortSelect;
}
}
+
function AddAmount(t,Target,d) {
if (t.checked) {
document.getElementById(Target).value=Number(t.value);
|
|
From: <rc...@us...> - 2016-10-18 05:14:02
|
Revision: 7648
http://sourceforge.net/p/web-erp/reponame/7648
Author: rchacon
Date: 2016-10-18 05:13:59 +0000 (Tue, 18 Oct 2016)
Log Message:
-----------
Add comments and format.
Modified Paths:
--------------
trunk/css/default/default.css
trunk/javascripts/MiscFunctions.js
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-10-17 05:56:20 UTC (rev 7647)
+++ trunk/css/default/default.css 2016-10-18 05:13:59 UTC (rev 7648)
@@ -11,7 +11,7 @@
width:16px;
}
-body{
+body {
background-color:#ccd;
font-family:Arial, Verdana, Helvetica, sans-serif;
font-size:10pt;
@@ -19,60 +19,70 @@
padding:0;
}
-a{
+a {
color:blue;
text-decoration:none;
}
-a:hover{
+
+a:hover {
color:blue;
text-decoration:underline;
}
-img{
+img {
border:none;
vertical-align:middle;
}
-p.good{
+p.bad {
+ color:red;
font-weight:bold;
+}
+
+p.good {
color:green;
-}
-p.bad{
font-weight:bold;
- color:red;
}
-table{
+
+table {
margin:0 auto;
width:auto;
max-width:90%;
padding-bottom:5px;
}
-table.selection{
+
+table.selection {
padding-bottom:5px;
}
+
th {
background-color:#B06161;
color:white;
font-weight:normal;
}
+
th.ascending {
cursor: s-resize;
}
+
th.descending {
cursor: n-resize;
}
+
th:after {
content: "";
float: right;
margin-top: 7px;
visibility: hidden;
}
+
th.ascending:after {
border-width: 0 4px 4px;
border-style: solid;
border-color: #000 transparent;
visibility: visible;
}
+
th.descending:after {
border-bottom: none;
border-left: 4px solid transparent;
@@ -80,67 +90,91 @@
border-top: 4px solid #000;
visibility: visible;
}
+
td {
text-align:left;
}
-td.select{
+
+td.select {
background-color:#eee;
}
-div.centre{
+
+td a img {
+ height:16px;
+ width:16px;
+ /* Icon for a link inside a table element. */
+}
+
+div.centre {
margin:0 auto;
text-align:center;
padding:5px;
}
-input{
+
+input {
font-family:Arial, Verdana, Helvetica, sans-serif;
}
-input.number{
+
+input.number {
text-align:right;
}
-input.image{
+
+input.image {
border-width:0px;
background-color:transparent;
}
+
input:required, select:required, textarea:required {
background-color:lightyellow;
}
-input:hover{
+
+input:hover {
}
-select{
+
+select {
font-family:Arial, Verdana, Helvetica, sans-serif;
}
-textarea{
+
+textarea {
font-family:Arial, Verdana, Helvetica, sans-serif;
}
-textarea:hover{
+
+textarea:hover {
}
-.EvenTableRows{
+
+.EvenTableRows {
background-color:#CCCCCC;
}
-.OddTableRows{
+
+.OddTableRows {
background-color:#EEEEEE;
}
-div.error{
+
+div.error {
background-color:#fddbdb;
color:red;
border:1px solid red;
}
-div.warn{
+
+div.warn {
background-color:#f5dbfd;
color:maroon;
border:1px solid maroon;
}
-div.success{
+
+div.success {
background-color:#b9ecb4;
color:darkgreen;
border:1px solid darkgreen;
}
-div.info{
+
+div.info {
background-color:#c7ccf6;
color:navy;
border:1px solid navy;
}
-DIV.page_help_text{
+
+DIV.page_help_text {
background:lightgrey url(images/help.png) top left no-repeat;
BORDER:#a52a2a 1px solid;
padding-top:2px;
@@ -157,7 +191,8 @@
color:black;
TEXT-ALIGN:center;
}
-DIV.system_check{
+
+DIV.system_check {
BORDER:#a52a2a 1px solid;
PADDING-LEFT:3px;
Z-INDEX:1;
@@ -180,21 +215,24 @@
background:white;
box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
}
-.dpTD{
+
+.dpTD {
border:0;
width:20px;
background-color:#EEEEEE;
text-align:right;
cursor:pointer;
}
-.dpDayHighlight{
+
+.dpDayHighlight {
border:0;
width:20px;
background-color:yellow;
text-align:right;
cursor:pointer;
}
-.dpTDHover{
+
+.dpTDHover {
border:0;
width:20px;
background-color:#CCCCCC;
@@ -203,42 +241,48 @@
}
/* Table type is used for UI tables type 1 */
-.table1{
+.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{
+/*.table2 {
width:90%;
background:#eee;
border:0px 0px 2px 2px #222 solid;
margin:0 auto;
-}*/
+}
-.tableheader{
+*/
+
+.tableheader {
font-weight:normal;
background-color:#800000;
color:white;
}
-.notavailable{
+
+.notavailable {
font-weight:lighter;
font-style:italic;
color:#555555;
}
-.label{
+
+.label {
font-weight:bold;
font-style:normal;
font-size:120%;
color:black;
background-color:#cccccc;
}
-.table_index{
+
+.table_index {
background-color:#F1FFDD;
}
-.header{
+.header {
background-image:url("");
background-repeat:no-repeat;
background-attachment:fixed;
@@ -246,52 +290,58 @@
margin:0px;
padding:0px;
}
+
input.inputerror, input.error, select.error, select.selecterror, label.error {
color:red;
border: 2px solid red;
}
-textarea.texterror{
+textarea.texterror {
background-color:#fddbdb;
}
-.OsRow{
+.OsRow {
background-color:#234567;
color:white;
}
/*** CANVAS ***/
-#CanvasDiv{
+#CanvasDiv {
background:#588BB6;
}
/*** HEADER ***/
-#HeaderDiv{
+#HeaderDiv {
color:white;
/*background:#588BB6;*/
/*overflow:hidden;*/
}
-#HeaderDiv a{
+
+#HeaderDiv a {
color:white;
}
-#HeaderDiv a:hover{
+
+#HeaderDiv a:hover {
text-decoration:underline;
}
-#HeaderWrapDiv{
+
+#HeaderWrapDiv {
}
/*** HEADER - APP INFO ***/
-#AppInfoDiv{
+#AppInfoDiv {
float:left;
padding:0;
}
-#AppInfoCompanyDiv,#AppInfoUserDiv{
+
+#AppInfoCompanyDiv,#AppInfoUserDiv {
display:table-cell;
}
-#AppInfoModuleDiv{
+
+#AppInfoModuleDiv {
font-weight:bold;
font-size:120%;
padding:3px;
@@ -299,13 +349,15 @@
/*** HEADER - QUICK MENU ***/
-#QuickMenuDiv{
+#QuickMenuDiv {
float:right;
margin-top:2px;
}
-#QuickMenuDiv ul{
+
+#QuickMenuDiv ul {
}
-#QuickMenuDiv li{
+
+#QuickMenuDiv li {
display:inline;
border-left:thin ridge #588BB6;
padding:14px 12px;
@@ -313,10 +365,11 @@
/*** BODY ***/
-#BodyDiv{
+#BodyDiv {
clear:both;
}
-#BodyWrapDiv{
+
+#BodyWrapDiv {
background:#CCCCCC;
/*border:thin solid #ccc;*/
clear:both;
@@ -324,86 +377,101 @@
/*** BODY - MAIN MENU ***/
-#MainMenuDiv{
+#MainMenuDiv {
float:left;
width:11%;
border:thin solid #000;
text-align:center;
white-space:nowrap;
}
-#MainMenuDiv ul{
+
+#MainMenuDiv ul {
margin:0;
padding:0;
}
-#MainMenuDiv li{
+
+#MainMenuDiv li {
list-style:none;
}
-#MainMenuDiv li a{
+#MainMenuDiv li a {
color:black;
}
-#MainMenuDiv li a:hover{
+
+#MainMenuDiv li a:hover {
color:black;
text-decoration:underline;
}
-.main_menu_unselected{
+
+.main_menu_unselected {
background:#8EDE8D;
padding:2px;
}
-.main_menu_unselected:hover{
+
+.main_menu_unselected:hover {
background:white;
}
-.main_menu_selected{
+
+.main_menu_selected {
background-color:white;
padding:2px;
}
/*** BODY - SUB MENU ***/
-#SubMenuDiv{
+#SubMenuDiv {
display:table;
float:right;
overflow:hidden;
width:88.5%;
}
-#SubMenuDiv ul{
+
+#SubMenuDiv ul {
margin:0;
padding:0;
background:#fff;
border:thin solid black;
margin-left:3px;
}
-#SubMenuDiv li{
+
+#SubMenuDiv li {
list-style:none;
}
-#SubMenuDiv a{
+
+#SubMenuDiv a {
color:blue;
}
-#SubMenuDiv a:hover{
+
+#SubMenuDiv a:hover {
color:blue;
text-decoration:underline;
}
+
#TransactionsDiv,
#InquiriesDiv,
-#MaintenanceDiv{
+#MaintenanceDiv {
display:table-cell;
}
-.menu_group_headers{
+
+.menu_group_headers {
text-align:center;
color:black;
background:#eee;
border-bottom:thin solid black;
}
-.menu_group_item{
+
+.menu_group_item {
background-color:white;
padding:2px;
}
-.menu_group_item p{
+
+.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 */
}
-#InquiriesDiv div{ /* header for standard reports/forms, custom reports */
+
+#InquiriesDiv div { /* header for standard reports/forms, custom reports */
border-top:thin solid black;
border-bottom:thin solid black;
background:#eee;
@@ -413,47 +481,57 @@
/*** FOOTER ***/
-#FooterDiv{
+#FooterDiv {
clear:both;
overflow:hidden;
color:#CCCCCC;
padding:3px 2px;
}
-#FooterWrapDiv{
+#FooterWrapDiv {
+
}
-#FooterLogoDiv{
+
+#FooterLogoDiv {
background:white;
border-radius:7px;
float:left;
padding:3px;
}
-#FooterVersionDiv{
+
+#FooterVersionDiv {
float:left;
margin-left:10px;
margin-top:15px;
}
-#FooterTimeDiv{
+
+#FooterTimeDiv {
float:right;
margin-top:15px;
}
+
#Report {
/* Division id for reports. */}
+
#Report table {
/* Body of a report formatted with table tag. */
}
+
.centre {
text-align:center;
/* Class selector to horizontal align a text (centre) in an element. */
}
+
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+
.text {
text-align:left;
/* Class selector to horizontal align a text (left) in an element. */
}
+
.page_title_text {
color:black;
font-weight:bold;
@@ -461,6 +539,7 @@
text-align:center;
/* Class selector for page title. */
}
+
/* END Style for all. ********************************************************/
@@ -477,3 +556,5 @@
@media only screen and (min-device-width:1024px) {
/* Style for new browser in a device with a rendering width greater than 1024px. */
}
+
+
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2016-10-17 05:56:20 UTC (rev 7647)
+++ trunk/javascripts/MiscFunctions.js 2016-10-18 05:13:59 UTC (rev 7648)
@@ -1,39 +1,39 @@
/* $Id: MiscFunctions.js 7645 2016-10-17 05:34:08Z rchacon $ */
/* Miscellaneous JavaScript functions. */
-function defaultControl(c){
+function defaultControl(c) {
c.select();
c.focus();
}
-function ReloadForm(fB){
+function ReloadForm(fB) {
fB.click();
}
-function rTN(event){
- if (window.event) k=window.event.keyCode;
- else if (event) k=event.which;
+function rTN(event) {
+ if(window.event) k=window.event.keyCode;
+ else if(event) k=event.which;
else return true;
kC=String.fromCharCode(k);
- if (k==13) return false;
- if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
- else if ((("0123456789.,- ").indexOf(kC)>-1)) return true;
+ if(k==13) return false;
+ if((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
+ else if((("0123456789.,- ").indexOf(kC)>-1)) return true;
else return false;
}
-function rTI(event){
- if (window.event) k=window.event.keyCode;
- else if (event) k=event.which;
+function rTI(event) {
+ if(window.event) k=window.event.keyCode;
+ else if(event) k=event.which;
else return true;
kC=String.fromCharCode(k);
- if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
- else if ((("0123456789-").indexOf(kC)>-1)) return true;
+ if((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
+ else if((("0123456789-").indexOf(kC)>-1)) return true;
else return false;
}
-function rLocaleNumber(){
+function rLocaleNumber() {
var Lang = document.getElementById('Lang').value;
- switch(Lang){
+ switch(Lang) {
case 'US':
var patt = /(?:^(-)?([1-9]{1}\d{0,2}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0?\.\d{1,})$)|(?:^0$)/;
break;
@@ -51,26 +51,23 @@
break;
default:
alert('something is wrong with your language setting');
-
-
}
- if(patt.test(this.value)){
+ if(patt.test(this.value)) {
this.setCustomValidity('');
return true;
-
- }else{
+ } else {
this.setCustomValidity('The number format is wrong');
return false;
};
}
-function assignComboToInput(c,i){
+function assignComboToInput(c, i) {
i.value=c.value;
}
-function inArray(v,tA,m){
- for (i=0;i<tA.length;i++) {
- if (v.value==tA[i].value) {
+function inArray(v, tA, m) {
+ for(i=0;i<tA.length;i++) {
+ if(v.value==tA[i].value) {
return true;
}
}
@@ -78,8 +75,8 @@
return false;
}
-function isDate(dS,dF){
- switch (dF) {
+function isDate(dS, dF) {
+ switch(dF) {
case "d/m/Y":
case "d.m.Y":
case "m/d/Y":
@@ -91,15 +88,15 @@
break;
}
- if (mA==null){
+ if(mA==null) {
alert("Please enter the date in the format "+dF);
return false;
}
- if (dF=="d/m/Y"||dF=="d.m.Y"){
+ if(dF=="d/m/Y"||dF=="d.m.Y") {
d=mA[1];
m=mA[3];
y=mA[5];
- }else if(dF=='m/d/Y'){
+ }else if(dF=='m/d/Y') {
m=mA[1];
d=mA[3];
y=mA[5];
@@ -109,21 +106,21 @@
y=mA[1];
}
- if (m<1 || m>12){
+ if(m<1 || m>12) {
alert("Month must be between 1 and 12");
return false;
}
- if (d<1 || d>31){
+ if(d<1 || d>31) {
alert("Day must be between 1 and 31");
return false;
}
- if ((m==4 || m==6 || m==9 || m==11) && d==31){
+ if((m==4 || m==6 || m==9 || m==11) && d==31) {
alert("Month "+m+" doesn`t have 31 days");
return false;
}
- if (m==2){
+ if(m==2) {
var isleap=(y%4==0);
- if (d>29 || (d==29 && !isleap)){
+ if(d>29 || (d==29 && !isleap)) {
alert("February "+y+" doesn`t have "+d+" days");
return false;
}
@@ -131,88 +128,93 @@
return true;
}
-function eitherOr(o,t){
- if (o.value!='') t.value='';
- else if (o.value=='NaN') o.value='';
+function eitherOr(o, t) {
+ if(o.value!='') t.value='';
+ else if(o.value=='NaN') o.value='';
}
/*Renier & Louis (in...@ti...) 25.02.2007
Copyright 2004-2007 Tillcor International
*/
-days=new Array('Su','Mo','Tu','We','Th','Fr','Sa');
-months=new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+days=new Array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa');
+months=new Array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
dateDivID="calendar";
-function Calendar(md,dF){
- iF=document.getElementsByName(md).item(0);
- pB=iF;
- x=pB.offsetLeft;
- y=pB.offsetTop+pB.offsetHeight;
- var p=pB;
- while (p.offsetParent){
- p=p.offsetParent;
- x+=p.offsetLeft;
- y+=p.offsetTop;
+
+function Calendar(md, dF) {
+ // dF: Date format. Formats: "d/m/Y", "d.m.Y", "m/d/Y", "Y-m-d", "Y/m/d".
+ iF = document.getElementsByName(md).item(0);
+ pB = iF;
+ x = pB.offsetLeft;
+ y = pB.offsetTop+pB.offsetHeight;
+ var p = pB;
+ while(p.offsetParent) {
+ p = p.offsetParent;
+ x += p.offsetLeft;
+ y += p.offsetTop;
}
- dt=convertDate(iF.value,dF);
- nN=document.createElement("div");
- nN.setAttribute("id",dateDivID);
- nN.setAttribute("style","visibility:hidden;");
+ dt = convertDate(iF.value, dF);
+ nN = document.createElement("div");
+ nN.setAttribute("id", dateDivID);
+ nN.setAttribute("style", "visibility:hidden;");
document.body.appendChild(nN);
- cD=document.getElementById(dateDivID);
- cD.style.position="absolute";
- cD.style.left=x+"px";
- cD.style.top=y+"px";
- cD.style.visibility=(cD.style.visibility=="visible" ? "hidden" : "visible");
- cD.style.display=(cD.style.display=="block" ? "none" : "block");
- cD.style.zIndex=10000;
- drawCalendar(md,dt.getFullYear(),dt.getMonth(),dt.getDate(),dF);
+ cD = document.getElementById(dateDivID);
+ cD.style.position = "absolute";
+ cD.style.left = x + "px";
+ cD.style.top = y + "px";
+ cD.style.visibility = (cD.style.visibility == "visible" ? "hidden" : "visible");
+ cD.style.display = (cD.style.display == "block" ? "none" : "block");
+ cD.style.zIndex = 10000;
+ drawCalendar(md, dt.getFullYear(), dt.getMonth(), dt.getDate(), dF);
}
-function drawCalendar(md,y,m,d,dF){
- var tD=new Date();
- if ((m>=0) && (y>0)) tD=new Date(y,m,1);
- else{
- d=tD.getDate();
+function drawCalendar(md, y, m, d, dF) {
+ // y: Year. Number.
+ // m: Month. Number.
+ // d: Day. Number.
+ // dF: Date format. Formats: "d/m/Y", "d.m.Y", "m/d/Y", "Y-m-d", "Y/m/d".
+ var tD = new Date();
+ if((m>=0) && (y>0)) tD = new Date(y, m, 1);
+ else {
+ d = tD.getDate();
tD.setDate(1);
}
- TR="<tr>";
- xTR="</tr>";
- TD="<td class='dpTD' onMouseOut='this.className=\"dpTD\";' onMouseOver='this.className=\"dpTDHover\";'";
- xTD="</td>";
- html="<table class='dpTbl'>"+TR+"<th colspan=\"3\">"+months[tD.getMonth()]+" "+tD.getFullYear()+"</th>"+"<td colspan=\"2\">"+
- getButtonCode(md,tD,-1,"<",dF)+xTD+"<td colspan=\"2\">"+getButtonCode(md,tD,1,">",dF)+xTD+xTR+TR;
- for(i=0;i<days.length;i++) html+="<th>"+days[i]+"</th>";
- html+=xTR+TR;
- for (i=0;i<tD.getDay();i++) html+=TD+" "+xTD;
- do{
- dN=tD.getDate();
- TD_onclick=" onclick=\"postDate('"+md+"','"+formatDate(tD,dF)+"');\">";
- if (dN==d) html+="<td"+TD_onclick+"<div class='dpDayHighlight'>"+dN+"</div>"+xTD;
- else html+=TD+TD_onclick+dN+xTD;
- if (tD.getDay()==6) html+=xTR+TR;
- tD.setDate(tD.getDate()+1);
- } while (tD.getDate()>1)
- if (tD.getDay()>0) for (i=6;i>tD.getDay();i--) html+=TD+" "+xTD;
- html+="</table>";
- document.getElementById(dateDivID).innerHTML=html;
+ TR = "<tr>";
+ xTR = "</tr>";
+ TD = "<td class='dpTD' onMouseOut='this.className=\"dpTD\";' onMouseOver='this.className=\"dpTDHover\";'";
+ xTD = "</td>";
+ html = "<table class='dpTbl'>" + TR + "<th colspan=\"3\">" + months[tD.getMonth()] + " " + tD.getFullYear() + "</th>" + "<td colspan=\"2\">" + getButtonCode(md, tD, -1, "<", dF) + xTD + "<td colspan=\"2\">" + getButtonCode(md, tD, 1, ">", dF) + xTD + xTR + TR;
+ for(i = 0; i < days.length; i++) html += "<th>" + days[i] + "</th>";
+ html += xTR + TR;
+ for(i = 0; i < tD.getDay(); i++) html += TD + " " + xTD;
+ do {
+ dN = tD.getDate();
+ TD_onclick = " onclick=\"postDate('" + md + "','" + formatDate(tD, dF) + "');\">";
+ if(dN == d) html += "<td" + TD_onclick + "<div class='dpDayHighlight'>" + dN + "</div>" + xTD;
+ else html += TD + TD_onclick + dN + xTD;
+ if(tD.getDay() == 6) html += xTR + TR;
+ tD.setDate(tD.getDate() + 1);
+ } while(tD.getDate() > 1)
+ if(tD.getDay() > 0) for(i = 6; i > tD.getDay(); i--) html += TD + " " + xTD;
+ html += "</table>";
+ document.getElementById(dateDivID).innerHTML = html;
}
-function getButtonCode(mD,dV,a,lb,dF){
- nM=(dV.getMonth()+a)%12;
- nY=dV.getFullYear()+parseInt((dV.getMonth()+a)/12,10);
-if (nM<0){
- nM+=12;
- nY+=-1;
+function getButtonCode(mD, dV, a, lb, dF) {
+ nM = (dV.getMonth()+a)%12;
+ nY = dV.getFullYear() + parseInt((dV.getMonth()+a)/12, 10);
+if(nM < 0) {
+ nM += 12;
+ nY += -1;
}
return "<button onClick='drawCalendar(\""+mD+"\","+nY+","+nM+","+1+",\""+dF+"\");'>"+lb+"</button>";
}
-function formatDate(dV,dF){
+function formatDate(dV, dF) {
ds=String(dV.getDate());
ms=String(dV.getMonth()+1);
- d=("0"+dV.getDate()).substring(ds.length-1,ds.length+1);
- m=("0"+(dV.getMonth()+1)).substring(ms.length-1,ms.length+1);
+ d=("0"+dV.getDate()).substring(ds.length-1, ds.length+1);
+ m=("0"+(dV.getMonth()+1)).substring(ms.length-1, ms.length+1);
y=dV.getFullYear();
- switch (dF) {
+ switch(dF) {
case "d/m/Y":
return d+"/"+m+"/"+y;
case "d.m.Y":
@@ -226,64 +228,64 @@
}
}
-function convertDate(dS,dF){
+function convertDate(dS, dF) {
// Converts a date in DefaultDateFormat into a javascript date-object.
// dS: Date to convert.
// dF: Date format. Formats: "d/m/Y", "d.m.Y", "m/d/Y", "Y-m-d", "Y/m/d".
- var y,m,d;
- switch(dF){
- case "d/m/Y":
- dA=dS.split("/");
- d=parseInt(dA[0],10);
- m=parseInt(dA[1],10)-1;
- y=parseInt(dA[2],10);
- break;
- case "d.m.Y":
- dA=dS.split(".");
- d=parseInt(dA[0],10);
- m=parseInt(dA[1],10)-1;
- y=parseInt(dA[2],10);
- break;
- case "m/d/Y":
- dA=dS.split("/");
- m=parseInt(dA[0],10);
- d=parseInt(dA[1],10)-1;
- y=parseInt(dA[2],10);
- break;
- case "Y-m-d":
- dA=dS.split("-");
- y=parseInt(dA[0],10);
- m=parseInt(dA[1],10)-1;
- d=parseInt(dA[2],10);
- break;
- case "Y/m/d":
- dA=dS.split("/");
- y=parseInt(dA[0],10);
- m=parseInt(dA[1],10)-1;
- d=parseInt(dA[2],10);
- break;
- default:
- alert("Unknown date format "+dF);
+ var y, m, d;
+ switch(dF) {
+ case "d/m/Y":
+ dA = dS.split("/");
+ d = parseInt(dA[0], 10);
+ m = parseInt(dA[1], 10)-1;
+ y = parseInt(dA[2], 10);
+ break;
+ case "d.m.Y":
+ dA = dS.split(".");
+ d = parseInt(dA[0], 10);
+ m = parseInt(dA[1], 10)-1;
+ y = parseInt(dA[2], 10);
+ break;
+ case "m/d/Y":
+ dA = dS.split("/");
+ m = parseInt(dA[0], 10);
+ d = parseInt(dA[1], 10)-1;
+ y = parseInt(dA[2], 10);
+ break;
+ case "Y-m-d":
+ dA = dS.split("-");
+ y = parseInt(dA[0], 10);
+ m = parseInt(dA[1], 10)-1;
+ d = parseInt(dA[2], 10);
+ break;
+ case "Y/m/d":
+ dA = dS.split("/");
+ y = parseInt(dA[0], 10);
+ m = parseInt(dA[1], 10)-1;
+ d = parseInt(dA[2], 10);
+ break;
+ default:
+ alert("Unknown date format " + dF);
return false;
}
-return new Date(y,m,d);
+return new Date(y, m, d);
}
-function postDate(mydate,dS){
-var iF=document.getElementsByName(mydate).item(0);
-iF.value=dS;
-var cD=document.getElementById(dateDivID);
-cD.style.visibility="hidden";
-cD.style.display="none";
+function postDate(mydate, dS) {
+var iF = document.getElementsByName(mydate).item(0);
+iF.value = dS;
+var cD = document.getElementById(dateDivID);
+cD.style.visibility = "hidden";
+cD.style.display = "none";
iF.focus();
}
-function clickDate(){
- Calendar(this.name,this.alt);
+function clickDate() {
+ Calendar(this.name, this.alt);
}
-function changeDate(){
- isDate(this.value,this.alt);
+function changeDate() {
+ isDate(this.value, this.alt);
}
function SortSelect() {
@@ -293,10 +295,10 @@
parentElem=selElem.parentNode;
table=parentElem.parentNode;
row = table.rows[0];
- for (var j = 0, col; col = row.cells[j]; j++) {
- if (row.cells[j].innerHTML==columnText) {
+ for(var j = 0, col; col = row.cells[j]; j++) {
+ if(row.cells[j].innerHTML==columnText) {
columnNumber=j;
- if (selElem.className=="ascending") {
+ if(selElem.className=="ascending") {
selElem.className='descending';
direction="a";
} else {
@@ -305,10 +307,10 @@
}
}
}
- for (var i = 1, row; row = table.rows[i]; i++) {
+ for(var i = 1, row; row = table.rows[i]; i++) {
var rowArray = new Array();
- for (var j = 0, col; col = row.cells[j]; j++) {
- if (row.cells[j].tagName == 'TD' ) {
+ for(var j = 0, col; col = row.cells[j]; j++) {
+ if(row.cells[j].tagName == 'TD' ) {
rowArray[j]=row.cells[j].innerHTML;
columnClass=row.cells[columnNumber].className;
}
@@ -317,10 +319,10 @@
}
tmpArray.sort(
function(a,b) {
- if (direction=="a") {
- if (columnClass=="number") {
+ if(direction=="a") {
+ if(columnClass=="number") {
return parseFloat(a[columnNumber].replace(/[,.]/g, '')) - parseFloat(b[columnNumber].replace(/[,.]/g, ''));
- } else if (columnClass=="date") {
+ } else if(columnClass=="date") {
da=new Date(a[columnNumber]);
db=new Date(b[columnNumber]);
return da>db;
@@ -328,9 +330,9 @@
return a[columnNumber].localeCompare(b[columnNumber])
}
} else {
- if (columnClass=="number") {
+ if(columnClass=="number") {
return parseFloat(b[columnNumber].replace(/[,.]/g, '')) - parseFloat(a[columnNumber].replace(/[,.]/g, ''));
- } else if (columnClass=="date") {
+ } else if(columnClass=="date") {
da=new Date(a[columnNumber]);
db=new Date(b[columnNumber]);
return da<=db;
@@ -340,11 +342,11 @@
}
}
);
- for (var i = 0, row; row = table.rows[i+1]; i++) {
+ for(var i = 0, row; row = table.rows[i+1]; i++) {
var rowArray = new Array();
rowArray=tmpArray[i];
- for (var j = 0, col; col = row.cells[j]; j++) {
- if (row.cells[j].tagName == 'TD' ) {
+ for(var j = 0, col; col = row.cells[j]; j++) {
+ if(row.cells[j].tagName == 'TD' ) {
row.cells[j].innerHTML=rowArray[j];
}
}
@@ -352,29 +354,29 @@
return;
}
-function initial(){
- if (document.getElementsByTagName){
+function initial() {
+ if(document.getElementsByTagName) {
var as=document.getElementsByTagName("a");
- for (i=0;i<as.length;i++){
+ for(i=0;i<as.length;i++) {
var a=as[i];
- if (a.getAttribute("href") &&
+ if(a.getAttribute("href") &&
a.getAttribute("rel")=="external")
a.target="_blank";
}
}
var ds=document.getElementsByTagName("input");
- for (i=0;i<ds.length;i++){
- if (ds[i].className=="date"){
+ for(i=0;i<ds.length;i++) {
+ if(ds[i].className=="date") {
ds[i].onclick=clickDate;
ds[i].onchange=changeDate;
}
if(ds[i].getAttribute("data-type") == 'no-illegal-chars') ds[i].pattern="(?!^ +$)[^?\'\u0022+.&\\\\><]*";
- if (ds[i].className=="number") ds[i].onkeypress=rTN;
- if (ds[i].className=="integer") ds[i].onkeypress=rTI;
- if (ds[i].className=="number"){
+ if(ds[i].className=="number") ds[i].onkeypress=rTN;
+ if(ds[i].className=="integer") ds[i].onkeypress=rTI;
+ if(ds[i].className=="number") {
ds[i].origonchange=ds[i].onchange;
ds[i].newonchange=rLocaleNumber;
- ds[i].onchange=function(){
+ ds[i].onchange=function() {
if(this.origonchange)
this.origonchange();
this.newonchange();
@@ -382,13 +384,13 @@
}
}
var ds=document.getElementsByTagName("th");
- for (i=0;i<ds.length;i++){
- if (ds[i].className=="ascending") ds[i].onclick=SortSelect;
+ for(i=0;i<ds.length;i++) {
+ if(ds[i].className=="ascending") ds[i].onclick=SortSelect;
}
}
-function AddAmount(t,Target,d) {
- if (t.checked) {
+function AddAmount(t, Target, d) {
+ if(t.checked) {
document.getElementById(Target).value=Number(t.value);
if(d) document.getElementById(d).required="required";
} else {
|
|
From: <dai...@us...> - 2016-10-18 07:38:19
|
Revision: 7649
http://sourceforge.net/p/web-erp/reponame/7649
Author: daintree
Date: 2016-10-18 07:38:17 +0000 (Tue, 18 Oct 2016)
Log Message:
-----------
fix SQL in reverseGRN.php
Modified Paths:
--------------
trunk/ReverseGRN.php
trunk/doc/Change.log
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2016-10-18 05:13:59 UTC (rev 7648)
+++ trunk/ReverseGRN.php 2016-10-18 07:38:17 UTC (rev 7649)
@@ -304,7 +304,7 @@
'" . $GRN['deliverydate'] . "',
'" . $PeriodNo . "',
'" . $GRN['glcode'] . "',
- '" . _('GRN Reversal for PO') .": " . $GRN['orderno'] . " " . $_POST['SupplierID'] . " - " . $GRN['itemcode'] . "-" . $GRN['itemdescription'] . " x " . $QtyToReverse . " @ " . locale_number_format($GRN['stdcostunit'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . _('GRN Reversal for PO') .": " . $GRN['orderno'] . " " . $_POST['SupplierID'] . " - " . $GRN['itemcode'] . "-" . DB_escape_string($GRN['itemdescription']) . " x " . $QtyToReverse . " @ " . locale_number_format($GRN['stdcostunit'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($GRN['stdcostunit'] * $QtyToReverse) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase GL posting could not be inserted for the reversal of the received item because');
@@ -325,7 +325,7 @@
'" . $GRN['deliverydate'] . "',
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['grnact'] . "', '"
- . _('GRN Reversal PO') . ': ' . $GRN['orderno'] . " " . $_POST['SupplierID'] . " - " . $GRN['itemcode'] . "-" . $GRN['itemdescription'] . " x " . $QtyToReverse . " @ " . locale_number_format($GRN['stdcostunit'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ . _('GRN Reversal PO') . ': ' . $GRN['orderno'] . " " . $_POST['SupplierID'] . " - " . $GRN['itemcode'] . "-" . DB_escape_string($GRN['itemdescription']) . " x " . $QtyToReverse . " @ " . locale_number_format($GRN['stdcostunit'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . $GRN['stdcostunit'] * $QtyToReverse . "'
)";
@@ -360,9 +360,9 @@
<br />
<div class="centre">
<input type="submit" name="ShowGRNS" value="' . _('Show Outstanding Goods Received') . '" />
- </div>';
- echo '</div>
- </form>';
+ </div>
+ </div>
+ </form>';
if (isset($_POST['ShowGRNS'])){
@@ -459,4 +459,4 @@
}
}
include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-18 05:13:59 UTC (rev 7648)
+++ trunk/doc/Change.log 2016-10-18 07:38:17 UTC (rev 7649)
@@ -1,5 +1,6 @@
webERP Change Log
+17/10/16 Phil: Fix SQL in ReverseGRN.php as reported by Ricard/Tim
16/10/16 RChacon: Fix function convertDate(dS,dF).
05/10/16 Eatong: Format the ManualAPITutorial.html for easier reading.
05/10/16 Eatong: Add CSS rule for <pre> for easier reading.
|
|
From: <rc...@us...> - 2016-10-23 19:27:33
|
Revision: 7652
http://sourceforge.net/p/web-erp/reponame/7652
Author: rchacon
Date: 2016-10-23 19:27:31 +0000 (Sun, 23 Oct 2016)
Log Message:
-----------
Improve comments, and Spanish translation.
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2016-10-20 07:25:57 UTC (rev 7651)
+++ trunk/ConfirmDispatch_Invoice.php 2016-10-23 19:27:31 UTC (rev 7652)
@@ -1427,13 +1427,13 @@
$DisposalResult = DB_query( $SQL,$ErrMsg,$DbgMsg);
$DisposalRow = DB_fetch_array($DisposalResult);
- /*Need to :
- * 1.) debit accum depn account with whole amount of accum depn
- * 2.) credit cost account with the whole amount of the cost
- * 3.) debit the disposal account with the NBV
- * 4.) credit the disposal account with the sale proceeds net of discounts */
+ /* Need to :
+ * 1.) Debit the accumulated depreciation account with whole amount of accumulated depreciation
+ * 2.) Credit the cost account with the whole amount of the cost
+ * 3.) Debit the disposal account with the NBV
+ * 4.) Credit the disposal account with the sale proceeds net of discounts */
- /* 1 debit accum depn */
+ // 1.) Debit the accumulated depreciation account:
if($DisposalRow['accumdepn']!=0) {
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -1451,34 +1451,55 @@
'" . $_SESSION['Items'.$identifier]->DebtorNo . ' - ' . $OrderLine->StockID . ' ' . _('accumulated depreciation disposal') . "',
'" . $DisposalRow['accumdepn'] . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of accumulated depreciation GL posting on disposal could not be inserted because');
- $DbgMsg = _('The following SQL to insert the GLTrans record was used');
- $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- }
- /* 2 credit cost */
- if($DisposalRow['cost']!=0) {
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (
- 10,
- '" . $InvoiceNo . "',
- '" . $DefaultDispatchDate . "',
- '" . $PeriodNo . "',
- '" . $DisposalRow['costact'] . "',
- '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('cost disposal') . "',
- '" . -$DisposalRow['cost'] . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of accumulated depreciation GL posting on disposal could not be inserted because');
+ $DbgMsg = _('The following SQL to insert the GLTrans record was used');
+ $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
+ }
+ // 2.) Credit the cost account:
+ if($DisposalRow['cost']!=0) {
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount
+ ) VALUES (
+ 10,'" .
+ $InvoiceNo . "','" .
+ $DefaultDispatchDate . "','" .
+ $PeriodNo . "','" .
+ $DisposalRow['costact'] . "','" .
+ $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('cost disposal') . "','" .
+ -$DisposalRow['cost'] . "')";
+ $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,$ErrMsg,$DbgMsg,true);
+ }
+ // 3.) Debit the disposal account with the NBV:
+ if($DisposalRow['cost']-$DisposalRow['accumdepn']!=0) {
+ $SQL = "INSERT INTO gltrans (type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount )
+ VALUES (
+ 10,
+ '" . $InvoiceNo . "',
+ '" . $DefaultDispatchDate . "',
+ '" . $PeriodNo . "',
+ '" . $DisposalRow['disposalact'] . "',
+ '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('net book value disposal') . "',
+ '" . ($DisposalRow['cost']-$DisposalRow['accumdepn']) . "')";
- $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,$ErrMsg,$DbgMsg,true);
- }
- //3. Debit disposal account with NBV
- if($DisposalRow['cost']-$DisposalRow['accumdepn']!=0) {
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The disposal net book value GL posting could not be inserted because');
+ $DbgMsg = '<br />' ._('The following SQL to insert the GLTrans record was used');
+ $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
+ }
+ //4. Credit the disposal account with the proceeds
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -1492,36 +1513,14 @@
'" . $DefaultDispatchDate . "',
'" . $PeriodNo . "',
'" . $DisposalRow['disposalact'] . "',
- '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('net book value disposal') . "',
- '" . ($DisposalRow['cost']-$DisposalRow['accumdepn']) . "')";
+ '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('asset disposal proceeds') . "',
+ '" . (-$OrderLine->Price * $OrderLine->QtyDispatched* (1 - $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate']) . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The disposal net book value GL posting could not be inserted because');
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The disposal proceeds GL posting could not be inserted because');
$DbgMsg = '<br />' ._('The following SQL to insert the GLTrans record was used');
$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- }
+ }// End if the item being sold was an asset.
- //4. Credit the disposal account with the proceeds
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount )
- VALUES (
- 10,
- '" . $InvoiceNo . "',
- '" . $DefaultDispatchDate . "',
- '" . $PeriodNo . "',
- '" . $DisposalRow['disposalact'] . "',
- '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('asset disposal proceeds') . "',
- '" . (-$OrderLine->Price * $OrderLine->QtyDispatched* (1 - $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate']) . "')";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The disposal proceeds GL posting could not be inserted because');
- $DbgMsg = '<br />' ._('The following SQL to insert the GLTrans record was used');
- $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
-
- } // end if the item being sold was an asset
} /*end of if sales integrated with debtors */
if($IsAsset) {
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-20 07:25:57 UTC (rev 7651)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-23 19:27:31 UTC (rev 7652)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-10-07 12:41-0600\n"
+"PO-Revision-Date: 2016-10-23 13:23-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -5698,7 +5698,7 @@
#: ConfirmDispatch_Invoice.php:1453
msgid "accumulated depreciation disposal"
-msgstr ""
+msgstr "eliminación de la depreciación acumulada"
#: ConfirmDispatch_Invoice.php:1456
msgid ""
@@ -5710,13 +5710,15 @@
#: ConfirmDispatch_Invoice.php:1475
msgid "cost disposal"
-msgstr ""
+msgstr "eliminación de costos"
#: ConfirmDispatch_Invoice.php:1478
msgid ""
"The reversal of asset cost on disposal GL posting could not be inserted "
"because"
msgstr ""
+"La reversión del costo de los activos mediante el asiento contable de "
+"eliminación no pudo insertarse porque"
#: ConfirmDispatch_Invoice.php:1497
msgid "net book value disposal"
@@ -36474,7 +36476,7 @@
#: SystemParameters.php:477
msgid "Show Settled Last Month"
-msgstr "Mostrar Conformes del Mes"
+msgstr "Mostrar liquidado del mes pasado"
#: SystemParameters.php:482
msgid ""
@@ -36485,10 +36487,10 @@
"allocated"
msgstr ""
"Esta opción se refiere al formato de los estados de cuenta del cliente. "
-"Seleccione Sí para que se muestren las facturas y las notas de crédito que "
-"han sido pagadas y conformes durante el mes en curso. Seleccione No para "
-"mostrar sólo las facturas pendientes, notas de crédito y pagos que no han "
-"sido consignados."
+"Seleccione Si para mostrar las facturas y las notas de crédito que han sido "
+"pagadas y liquidadas durante el mes en curso. Seleccione No para mostrar "
+"sólo las facturas pendientes, y notas de crédito y pagos que no han sido "
+"consignados."
#: SystemParameters.php:485
msgid "Romalpa Clause"
@@ -36583,7 +36585,8 @@
#: SystemParameters.php:541
msgid "A picking note must be produced before an order can be delivered"
msgstr ""
-"Debe producirse una nota de Recolección para que una orden pueda despacharse"
+"Se debe producir una nota de recolección para que un pedido pueda ser "
+"entregado"
#: SystemParameters.php:546
msgid ""
@@ -36628,7 +36631,7 @@
#: SystemParameters.php:566
msgid "Format of Packing Slips"
-msgstr "Formato de las Hojas de Embalaje"
+msgstr "Formato de los albaranes (notas de entrega)"
#: SystemParameters.php:568
msgid "Laser Printed"
@@ -36640,7 +36643,8 @@
#: SystemParameters.php:571
msgid "Choose the format that packing notes should be printed by default"
-msgstr "Elija el formato predeterminado al imprimir hojas de embalaje."
+msgstr ""
+"Elija el formato predeterminado al imprimir albaranes (notas de entrega)"
#: SystemParameters.php:575
msgid "Invoice Orientation"
@@ -36654,7 +36658,7 @@
#: SystemParameters.php:584
msgid "Invoice Quantity Default"
-msgstr ""
+msgstr "Cantidad predeterminada en la factura"
#: SystemParameters.php:586
msgid "0"
@@ -36708,7 +36712,7 @@
#: SystemParameters.php:614
msgid "Dispatch Cut-Off Time"
-msgstr "No Despachar después de esta hora"
+msgstr "Hora de cierre de los despachos"
#: SystemParameters.php:619
msgid ""
@@ -36854,7 +36858,7 @@
#: SystemParameters.php:730
msgid "Tax Authority Reference Name"
-msgstr "Nombre de Referencia de la Autoridad Fiscal"
+msgstr "Nombre de la referencia de la autoridad fiscal"
#: SystemParameters.php:732
msgid ""
@@ -36886,7 +36890,7 @@
#: SystemParameters.php:754
msgid "Number Of Periods Of StockUsage"
-msgstr "Número de Períodos de Uso de Existencias"
+msgstr "Cantidad de períodos de uso de inventario"
#: SystemParameters.php:758
msgid ""
@@ -36970,7 +36974,7 @@
#: SystemParameters.php:796
msgid "Purchase Order Allows Same Item Multiple Times"
-msgstr "La Orden de Compra permite el mismo Artículo muchas veces"
+msgstr "La orden de compra permite el mismo artículo varias veces"
#: SystemParameters.php:800
msgid ""
@@ -37047,7 +37051,7 @@
#: SystemParameters.php:826
msgid "Financial Year Ends On"
-msgstr "El Ejercicio termina en"
+msgstr "El año contable concluye en"
#: SystemParameters.php:831
msgid ""
@@ -37059,7 +37063,7 @@
#: SystemParameters.php:834
msgid "Report Page Length"
-msgstr "Longitud de la Página del Informe"
+msgstr "Longitud de la página del informe"
#: SystemParameters.php:835 SystemParameters.php:859
msgid "The input should be between 1 and 999"
@@ -37177,7 +37181,7 @@
#: SystemParameters.php:952
msgid "Perform Database Maintenance At Logon"
-msgstr "Ejecutar Mantenimiento de la BD al Iniciar Sesión"
+msgstr "Realizar el mantenimiento de la base de datos al iniciar sesión"
#: SystemParameters.php:970 SystemParameters.php:972
msgid "Never"
@@ -37300,7 +37304,7 @@
#: SystemParameters.php:1037
msgid "Prohibit GL Journals to Control Accounts"
-msgstr "Prohibir a los Diarios Contables Controlar las Cuentas"
+msgstr "Prohibir a los diarios contables el controlar las cuentas"
#: SystemParameters.php:1040 SystemParameters.php:1043
msgid "Prohibited"
@@ -37322,7 +37326,7 @@
#: SystemParameters.php:1050
msgid "Prohibit GL Journals to Periods Prior To"
-msgstr "Prohibir a los Diarios Contables a Períodos Anteriores a"
+msgstr "Prohibir a los diarios contables los períodos anteriores a"
#: SystemParameters.php:1067
msgid ""
@@ -37336,15 +37340,15 @@
#: SystemParameters.php:1070
msgid "Inventory Costing Method"
-msgstr "Método de Cálculo del Costo del Inventario"
+msgstr "Método de costeo del inventario"
#: SystemParameters.php:1074 SystemParameters.php:1078
msgid "Weighted Average Costing"
-msgstr "Costo Medio Ponderado"
+msgstr "Costo promedio ponderado"
#: SystemParameters.php:1075 SystemParameters.php:1077
msgid "Standard Costing"
-msgstr "Costo Estándar"
+msgstr "Costo estándar"
#: SystemParameters.php:1081
msgid ""
@@ -46158,7 +46162,7 @@
#: includes/MainMenuLinksArray.php:65
msgid "Sales Order Detail Or Summary Inquiries"
-msgstr "Consultar Detalles/Sumario de Pedidos de Venta"
+msgstr "Consultas detalladas o resumidas de órdenes de venta"
#: includes/MainMenuLinksArray.php:67
msgid "Top Customers Inquiry"
@@ -46279,7 +46283,7 @@
#: includes/MainMenuLinksArray.php:192
msgid "Purchase Order Detail Or Summary Inquiries"
-msgstr "Consultar Detalle ó Sumario de Órdenes de Compra"
+msgstr "Consultas detalladas o resumidas de órdenes de compra"
#: includes/MainMenuLinksArray.php:199
msgid "Maintain Supplier Price Lists"
@@ -46460,7 +46464,7 @@
#: includes/MainMenuLinksArray.php:315
msgid "Multiple Work Orders Total Cost Inquiry"
-msgstr ""
+msgstr "Consulta de costo total de varias ordenes de trabajo"
#: includes/MainMenuLinksArray.php:337
msgid "Bills Of Material"
@@ -46468,7 +46472,7 @@
#: includes/MainMenuLinksArray.php:338
msgid "Copy a Bill Of Materials Between Items"
-msgstr "Copiar una Lista de Materiales entre Artículos"
+msgstr "Copiar una lista de materiales entre artículos"
#: includes/MainMenuLinksArray.php:339
msgid "Master Schedule"
|
|
From: <rc...@us...> - 2016-10-24 01:18:54
|
Revision: 7653
http://sourceforge.net/p/web-erp/reponame/7653
Author: rchacon
Date: 2016-10-24 01:18:52 +0000 (Mon, 24 Oct 2016)
Log Message:
-----------
Fixes column, adds buttons, formats code and moves form after selected table.
Modified Paths:
--------------
trunk/SecurityTokens.php
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2016-10-23 19:27:31 UTC (rev 7652)
+++ trunk/SecurityTokens.php 2016-10-24 01:18:52 UTC (rev 7653)
@@ -1,138 +1,157 @@
<?php
+/* $Id: SecurityTokens.php 4424 2010-12-22 16:27:45Z tim_schofield $ */
+/* Administration of security tokens */
-/* $Id: SecurityTokens.php 4424 2010-12-22 16:27:45Z tim_schofield $*/
-
include('includes/session.inc');
$Title = _('Maintain Security Tokens');
-
+$ViewTopic = 'SecuritySchema';
+$BookMark = 'SecurityTokens';// Pending ?
include('includes/header.inc');
-if (isset($_GET['SelectedToken'])) {
- if ($_GET['Action']=='delete'){
+if(isset($_GET['SelectedToken'])) {
+ if($_GET['Action'] == 'delete'){
$Result = DB_query("SELECT script FROM scripts WHERE pagesecurity='" . $_GET['SelectedToken'] . "'");
- if (DB_num_rows($Result)>0){
- prnMsg(_('This secuirty token is currently used by the following scripts and cannot be deleted'),'error');
+ if(DB_num_rows($Result)>0) {
+ prnMsg(_('This secuirty token is currently used by the following scripts and cannot be deleted'), 'error');
echo '<table>
<tr>';
- $i=0;
- while ($ScriptRow = DB_fetch_array($Result)){
- if ($i==5){
- $i=0;
+ $i = 0;
+ while($ScriptRow = DB_fetch_array($Result)) {
+ if($i == 5){
+ $i = 0;
echo '</tr>
<tr>';
}
$i++;
- echo '<td>' . $ScriptRow['script'] . '</td>';
+ echo '<td>', $ScriptRow['script'], '</td>';
}
echo '</tr></table>';
} else {
$Result = DB_query("DELETE FROM securitytokens WHERE tokenid='" . $_GET['SelectedToken'] . "'");
}
- } else { // it must be an edit
- $sql="SELECT tokenid,
- tokenname
+ } else {// It must be an edit
+ $Sql = "SELECT tokenid, tokenname
FROM securitytokens
- WHERE tokenid='".$_GET['SelectedToken']."'";
- $Result= DB_query($sql);
- $myrow = DB_fetch_array($Result,$db);
- $_POST['TokenID']=$myrow['tokenid'];
- $_POST['TokenDescription']=$myrow['tokenname'];
+ WHERE tokenid='" . $_GET['SelectedToken'] . "'";
+ $Result = DB_query($Sql);
+ $MyRow = DB_fetch_array($Result);
+ $_POST['TokenID'] = $MyRow['tokenid'];
+ $_POST['TokenDescription'] = $MyRow['tokenname'];
}
}
-if (!isset($_POST['TokenID'])){
- $_POST['TokenID']='';
- $_POST['TokenDescription']='';
+if(!isset($_POST['TokenID'])) {
+ $_POST['TokenID'] = '';
+ $_POST['TokenDescription'] = '';
}
-$InputError =0;
+$InputError = 0;
-if (isset($_POST['Submit']) OR isset($_POST['Update'])){
- if (!is_numeric($_POST['TokenID'])){
- prnMsg(_('The token ID is expected to be a number. Please enter a number for the token ID'),'error');
+if(isset($_POST['Submit']) OR isset($_POST['Update'])) {
+ if(!is_numeric($_POST['TokenID'])) {
+ prnMsg(_('The token ID is expected to be a number. Please enter a number for the token ID'), 'error');
$InputError = 1;
+
}
- if (mb_strlen($_POST['TokenDescription'])==0){
- prnMsg(_('A token description must be entered'),'error');
+ if(mb_strlen($_POST['TokenDescription']) == 0) {
+ prnMsg(_('A token description must be entered'), 'error');
$InputError = 1;
}
}
-if (isset($_POST['Submit'])) {
-
- $TestSQL="SELECT tokenid FROM securitytokens WHERE tokenid='".$_POST['TokenID']."'";
- $TestResult=DB_query($TestSQL);
- if (DB_num_rows($TestResult)!=0) {
+if(isset($_POST['Submit'])) {
+ $TestSql = "SELECT tokenid FROM securitytokens WHERE tokenid='" . $_POST['TokenID'] . "'";
+ $TestResult = DB_query($TestSql);
+ if(DB_num_rows($TestResult)!=0) {
prnMsg( _('This token ID has already been used. Please use a new one') , 'warn');
$InputError = 1;
}
- if ($InputError == 0){
- $sql = "INSERT INTO securitytokens values('".$_POST['TokenID']."', '".$_POST['TokenDescription']."')";
- $Result= DB_query($sql);
- $_POST['TokenID']='';
- $_POST['TokenDescription']='';
+ if($InputError == 0) {
+ $Sql = "INSERT INTO securitytokens values('" . $_POST['TokenID'] . "', '" . $_POST['TokenDescription'] . "')";
+ $Result = DB_query($Sql);
+ $_POST['TokenID'] = '';
+ $_POST['TokenDescription'] = '';
}
}
-if (isset($_POST['Update']) AND $InputError == 0) {
- $sql = "UPDATE securitytokens
- SET tokenname='".$_POST['TokenDescription'] . "'
- WHERE tokenid='".$_POST['TokenID']."'";
- $Result= DB_query($sql);
- $_POST['TokenDescription']='';
- $_POST['TokenID']='';
+if(isset($_POST['Update']) AND $InputError == 0) {
+ $Sql = "UPDATE securitytokens
+ SET tokenname='" . $_POST['TokenDescription'] . "'
+ WHERE tokenid='" . $_POST['TokenID'] . "'";
+ $Result = DB_query($Sql);
+ $_POST['TokenDescription'] = '';
+ $_POST['TokenID'] = '';
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' .
- _('Print') . '" alt="" />' . ' ' . $Title . '</p>
- <form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" id="form">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <br />
- <table>
- <tr>';
-if (isset($_GET['Action']) and $_GET['Action']=='edit') {
- echo '<td>' . _('Description') . '</td>
- <td><input type="text" size="50" autofocus="autofocus" required="required" maxlength="50" name="TokenDescription" value="'.$_POST['TokenDescription'] .'" /></td>
- <td><input type="hidden" name="TokenID" value="'.$_GET['SelectedToken'].'" />
- <input type="submit" name="Update" value="' . _('Update') . '" />';
-} else {
- echo '<td>' . _('Token ID') . '</td>
- <td><input type="text" autofocus="autofocus" required="required" class="integer" name="TokenID" value="'.$_POST['TokenID'].'" /></td>
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+
+echo '<table class="selection">
+ <thead>
+ <tr>
+ <th>', _('Token ID'), '</th>
+ <th>', _('Description'), '</th>
+ <th class="noprint" colspan="2"> </th>
</tr>
- <tr>
- <td>' . _('Description') . '</td>
- <td><input type="text" required="required" size="50" maxlength="50" name="TokenDescription" value="'.$_POST['TokenDescription'] .'" title="' . _(
- 'The security token description should describe which functions this token allows a user/role to access') . '" /></td>
- <td><input type="submit" name="Submit" value="' . _('Insert') . '" />';
+ </thead><tbody>';
+$Sql = "SELECT tokenid, tokenname FROM securitytokens ORDER BY tokenid";
+$Result = DB_query($Sql);
+while($MyRow = DB_fetch_array($Result)) {
+ echo '<tr>
+ <td class="number">', $MyRow['tokenid'], '</td>
+ <td class="text">', htmlspecialchars($MyRow['tokenname'], ENT_QUOTES, 'UTF-8'), '</td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedToken=', $MyRow['tokenid'], '&Action=edit">', _('Edit'), '</a></td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedToken=', $MyRow['tokenid'], '&Action=delete" onclick="return confirm(\'', _('Are you sure you wish to delete this security token?'), '\');">', _('Delete'), '</a></td>
+ </tr>';
}
+echo '</tbody></table>';
-echo '</td>
- </tr>
- </table>
- <br />';
+echo '<br />
+ <form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" id="form" method="post">
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
+ <table class="noprint">
+ <thead>
+ <tr>
+ <th colspan="2">';
-echo '</div>
- </form>';
-
-echo '<table class="selection">';
-echo '<tr>
- <th>' . _('Token ID') . '</th>
- <th>' . _('Description'). '</th>
- </tr>';
-
-$sql="SELECT tokenid, tokenname FROM securitytokens ORDER BY tokenid";
-$Result= DB_query($sql);
-
-while ($myrow = DB_fetch_array($Result,$db)){
- echo '<tr>
- <td>' . $myrow['tokenid'] . '</td>
- <td>' . htmlspecialchars($myrow['tokenname'],ENT_QUOTES,'UTF-8') . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td>
- </tr>';
+if(isset($_GET['Action']) and $_GET['Action']=='edit') {
+ echo ('Edit'), '</th>',
+ '</tr>
+ </thead><tfoot>',
+ '<tr>
+ <td colspan="2" class="centre">',
+ '<button name="Update" type="submit" value="', _('Update'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Update'), '</button>', // "Update" button.
+ '</td>',
+ '</tr>
+ </tfoot><tbody>',
+ '<tr>
+ <td>', _('Token ID'), '</td>
+ <td>', $_GET['SelectedToken'], '<input name="TokenID" type="hidden" value="', $_GET['SelectedToken'], '" />';
+} else {
+ echo ('Insert'), '</th>',
+ '</tr>
+ </thead><tfoot>',
+ '<tr>
+ <td colspan="2" class="centre">',
+ '<button name="Submit" type="submit" value="', _('Insert'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Insert'), '</button>', // "Insert" button.
+ '</td>',
+ '</tr>
+ </tfoot><tbody>',
+ '<tr>
+ <td><label for="TokenID">', _('Token ID'), '</label></td>
+ <td><input autofocus="autofocus" class="number" id="TokenID" maxlength="4" name="TokenID" required="required" size="6" type="text" value="', $_POST['TokenID'], '" />';
}
+echo '</td>
+ </tr>
+ <tr>
+ <td><label for="TokenDescription">', _('Description'), '</label></td>
+ <td><input id="TokenDescription" maxlength="50" name="TokenDescription" required="required" size="50" title="', _('The security token description should describe which functions this token allows a user/role to access'), '" type="text" value="', $_POST['TokenDescription'], '" /></td>
+ </tr>
+ </table>
+ </form>';
-echo '</table>';
-
include('includes/footer.inc');
?>
Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc 2016-10-23 19:27:31 UTC (rev 7652)
+++ trunk/includes/ConnectDB_mysql.inc 2016-10-24 01:18:52 UTC (rev 7653)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Database abstraction for mysql */
define ('LIKE','LIKE');
@@ -122,9 +122,8 @@
Return $RowPointer;
}
-function DB_fetch_array (&$ResultIndex) {
-
- $RowPointer=mysql_fetch_array($ResultIndex);
+function DB_fetch_array(&$ResultIndex) {
+ $RowPointer = mysql_fetch_array($ResultIndex);
Return $RowPointer;
}
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2016-10-23 19:27:31 UTC (rev 7652)
+++ trunk/includes/ConnectDB_mysqli.inc 2016-10-24 01:18:52 UTC (rev 7653)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Database abstraction for mysqli */
/* PeterMoulding.com
20071102 Change from mysql to mysqli;
@@ -129,8 +129,8 @@
Return $RowPointer;
}
-function DB_fetch_array (&$ResultIndex) {
- $RowPointer=mysqli_fetch_array($ResultIndex);
+function DB_fetch_array(&$ResultIndex) {
+ $RowPointer = mysqli_fetch_array($ResultIndex);
Return $RowPointer;
}
Modified: trunk/includes/ConnectDB_postgres.inc
===================================================================
--- trunk/includes/ConnectDB_postgres.inc 2016-10-23 19:27:31 UTC (rev 7652)
+++ trunk/includes/ConnectDB_postgres.inc 2016-10-24 01:18:52 UTC (rev 7653)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Database abstraction for postgres */
define ('LIKE','ILIKE');
/* $PgConnStr = $PgConnStr = "host=".$host." dbname=".$_SESSION['DatabaseName']; */
@@ -84,8 +84,8 @@
Return $RowPointer;
}
-function DB_fetch_array (&$ResultIndex) {
- $RowPointer=pg_fetch_array($ResultIndex);
+function DB_fetch_array(&$ResultIndex) {
+ $RowPointer = pg_fetch_array($ResultIndex);
Return $RowPointer;
}
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-23 19:27:31 UTC (rev 7652)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-24 01:18:52 UTC (rev 7653)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-10-23 13:23-0600\n"
+"PO-Revision-Date: 2016-10-23 13:47-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -36535,7 +36535,7 @@
#: SystemParameters.php:500
msgid "Sales Order Allows Same Item Multiple Times"
-msgstr "La Orden de Venta permite el mismo Artículo muchas veces"
+msgstr "La orden de venta permite el mismo artículo varias veces"
#: SystemParameters.php:508
msgid "Order Entry allows Line Item Narrative"
@@ -36843,6 +36843,8 @@
"Set to Automatic - Supplier codes are automatically created - as a "
"sequential number"
msgstr ""
+"Establecida en automático - los códigos de proveedores se crean "
+"automáticamente - como un número secuencial"
#: SystemParameters.php:714
msgid "Could not load tax categories table"
@@ -36942,7 +36944,7 @@
#: SystemParameters.php:787 SystemParameters.php:792
msgid "The input must between 0 and 100"
-msgstr ""
+msgstr "La entrada debe ser entre 0 y 100"
#: SystemParameters.php:787
msgid "integer between 0 and 100"
@@ -37125,7 +37127,7 @@
#: SystemParameters.php:872
msgid "Number Of Month Must Be Shown"
-msgstr "El número de mes se debe demostrar"
+msgstr "Cantidad de meses a mostrar"
#: SystemParameters.php:873
msgid "input must be positive integer"
@@ -37136,8 +37138,8 @@
"Number of month must be shown on report can be changed with this parameters "
"ex: in CustomerInquiry.php "
msgstr ""
-"La cantidad de meses a mostrar por omisión en el informe se puede cambiar "
-"con este parámetro. E.g. en CustomerInquiry.php"
+"La cantidad de meses a mostrar en un informe se puede cambiar con este "
+"parámetro. E.g. en CustomerInquiry.php"
#: SystemParameters.php:878
msgid "The directory where images are stored"
|
|
From: <rc...@us...> - 2016-10-31 03:29:43
|
Revision: 7654
http://sourceforge.net/p/web-erp/reponame/7654
Author: rchacon
Date: 2016-10-31 03:29:41 +0000 (Mon, 31 Oct 2016)
Log Message:
-----------
On SupplierPriceList.php, add ViewTopic and BookMark, and complete html table. Add info to manual.
Modified Paths:
--------------
trunk/SupplierPriceList.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualPurchaseOrdering.html
Modified: trunk/SupplierPriceList.php
===================================================================
--- trunk/SupplierPriceList.php 2016-10-24 01:18:52 UTC (rev 7653)
+++ trunk/SupplierPriceList.php 2016-10-31 03:29:41 UTC (rev 7654)
@@ -1,11 +1,13 @@
<?php
+/* $Id: SupplierPriceList.php 6941 2014-10-26 23:18:08Z daintree $*/
+/* Maintain Supplier Price Lists */
-include ('includes/session.inc');
-
+include('includes/session.inc');
$Title = _('Supplier Purchasing Data');
+$ViewTopic = 'PurchaseOrdering';
+$BookMark = 'SupplierPriceList';
+include('includes/header.inc');
-include ('includes/header.inc');
-
if (isset($_POST['StockSearch'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
<div>
@@ -540,6 +542,7 @@
<th>' . _('Effective From') . '</th>
<th>' . _('Suppliers Item Code') . '</th>
<th>' . _('Min Order Qty') . '</th>
+ <th>', _('Save'), '</th>
</tr>';
if (isset($_POST['Select'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-24 01:18:52 UTC (rev 7653)
+++ trunk/doc/Change.log 2016-10-31 03:29:41 UTC (rev 7654)
@@ -1,6 +1,7 @@
webERP Change Log
-17/10/16 Phil: Fix SQL in ReverseGRN.php as reported by Ricard/Tim
+30/10/16 RChacon: On SupplierPriceList.php, add ViewTopic and BookMark, and complete html table. Add info to manual.
+17/10/16 Phil: Fix SQL in ReverseGRN.php as reported by Ricard/Tim.
16/10/16 RChacon: Fix function convertDate(dS,dF).
05/10/16 Eatong: Format the ManualAPITutorial.html for easier reading.
05/10/16 Eatong: Add CSS rule for <pre> for easier reading.
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2016-10-24 01:18:52 UTC (rev 7653)
+++ trunk/doc/Manual/ManualInventory.html 2016-10-31 03:29:41 UTC (rev 7654)
@@ -126,7 +126,7 @@
</ul>Entry of the base information is done from the menu, select the inventory tab and click "Add a New Inventory Item".
<p>
- <h3>Item Code</h3>
+ <h3><a id="ItemCode">Item Code</a></h3>
<p>A stock code is required for each stock item, this can be any combination of characters up to 20 characters long. The coding structure of stock items should be considered, to ensure that like stock items appear together. Internally the system looks at the code to order stock items in the various look up tables. A systematic approach to naming stock items can save a lot of time later. However, good facilities are available to search. Under supplier purchasing data it is also possible to record the supplier's part number against an item.</p>
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-10-24 01:18:52 UTC (rev 7653)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-10-31 03:29:41 UTC (rev 7654)
@@ -150,7 +150,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>Recieving Purchase Orders</h2>
+<h2>Receiving Purchase Orders</h2>
<ul>
<li>When the supplier delivers the goods to the warehouse , the stock manager will log into webERP</li>
@@ -175,4 +175,29 @@
<p>The goods received note should signed off by the person who received the goods - optionally a copy to the supplier's driver. </p>
<p>An alternative short-cut method is also provided for auto-receiving purchase orders at the prices defined in the purchase order, for authorised purchase orders. After having entered a purchase order or modified a purchase order a link to automatically receive the entire order and create the supplier invoice will show if the order is authorised. This will happen automatically if the configuration option to auto authorise purchase orders is set and the user creating or modifying the order is authorised to do so. Clicking this link will receive all the items on the purchase order to the extent there is any quantity yet to be received. However, this program cannot handle controlled items. If there is even one line of controlled/serialised stock on the purchase order then this facility cannot be used.</p>
+<div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+</div>
+<h2>Maintenance</h2>
+
+<h3><a id="SupplierPriceList">Maintain Supplier Price Lists</a></h3>
+
+<p>Use this script to maintain supplier price lists used in purchase orders.</p>
+<p>Fields (columns):</p>
+<ul>
+<li><b>StockID</b>. The item code used in the company. See <a href="ManualContents.php?ViewTopic=Inventory#ItemCode">Item Code</a>.</li>
+<li><b>Description</b>. The short part description (title) used in the company. See <a href="ManualContents.php?ViewTopic=Inventory#ItemCode">Part Descriptions</a>.</li>
+<li><b>Price</b>. Sales price from supplier to company, without taxes.</li>
+<li><b>Suppliers UOM</b>. Unit of measure used by the supplier.</li>
+<li><b>Conversion Factor</b>. Quantity of company UOM in supplier's UOM. E.g. Quantity of retail units in a wholesale unit.</li>
+<li><b>Suppliers Description</b>. The short part description (title) used by supplier in his documents.</li>
+<li><b>Lead Time</b>. .</li>
+<li><b>Preferred</b>. All the items with this stock Id will be purchased to this supplier?</li>
+<li><b>Effective From</b>. Start date.</li>
+<li><b>Suppliers Item Code</b>. The item code used by supplier in his documents.</li>
+<li><b>Min Order Qty</b>. Minimal quantity sold by the supplier.</li>
+<li><b>Save</b>. To commit info.</li>
+</ul>
+
+
<!-- Help End: PurchaseOrdering -->
\ No newline at end of file
|
|
From: <rc...@us...> - 2016-10-31 16:47:19
|
Revision: 7658
http://sourceforge.net/p/web-erp/reponame/7658
Author: rchacon
Date: 2016-10-31 16:47:12 +0000 (Mon, 31 Oct 2016)
Log Message:
-----------
Correct word, and modifies .PO files to preserve translations.
Modified Paths:
--------------
trunk/SecurityTokens.php
trunk/SelectProduct.php
trunk/doc/Change.log
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/SecurityTokens.php 2016-10-31 16:47:12 UTC (rev 7658)
@@ -50,7 +50,7 @@
while($ScriptRow = DB_fetch_array($Result)) {
$List .= ' ' . $ScriptRow['script'];
}
- prnMsg(_('This secuirty token is currently used by the following scripts and cannot be deleted') . ':' . $List, 'error');
+ prnMsg(_('This security token is currently used by the following scripts and cannot be deleted') . ':' . $List, 'error');
} else {
$Result = DB_query("DELETE FROM securitytokens WHERE tokenid='" . $_POST['TokenId'] . "'");
if($Result) {prnMsg(_('The security token was deleted successfully'), 'success');}
@@ -171,4 +171,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/SelectProduct.php 2016-10-31 16:47:12 UTC (rev 7658)
@@ -188,7 +188,7 @@
echo '</td>';
}
echo '</tr>';
- } //end of if PricesSecuirty allows viewing of prices
+ } //end of if PricesSecurity allows viewing of prices
echo '</table>'; //end of first nested table
// Item Category Property mod: display the item properties
echo '<table>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/doc/Change.log 2016-10-31 16:47:12 UTC (rev 7658)
@@ -1290,7 +1290,7 @@
2/5/11 Phil: Fix PO_PDFPurchOrder.php to allow emailing but email option not to appear on printed/emailed orders
1/5/11 Tim PageSecurity.php fix bug that prevented updates to Security Token for a particular script.
1/5/11 Phil: Many scripts quoting changes single quotes for strings double quotes for xhtml variables
-1/5/11 Phil: SecuirtyTokens allow deletion of tokens if no scripts using it
+1/5/11 Phil: SecurityTokens allow deletion of tokens if no scripts using it
28/4/11 Tim: add facility to select an account group to limit GL acccounts returned as options to post payments to
28/4/11 Tim: new SecurityTokens script
28/4/11 Phil: Fix Secunia reported vulnerability by checking for dodgy characters in CompanyNameField - then matched to a real directory on the web-server
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26253,7 +26253,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26285,7 +26285,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26962,7 +26962,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27826,7 +27826,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Diese Berechtigung wird derzeit von den folgenden Skrips verwendet und kann "
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27784,7 +27784,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-10-31 16:47:12 UTC (rev 7658)
@@ -24914,7 +24914,7 @@
msgstr ""
#: SecurityTokens.php:14
-msgid "This secuirty token is currently used by the following scripts and cannot be deleted"
+msgid "This security token is currently used by the following scripts and cannot be deleted"
msgstr ""
#: SecurityTokens.php:51
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26299,7 +26299,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27801,7 +27801,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Este testigo de seguridad es utilizado actualmente por los siguientes "
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26297,7 +26297,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26954,7 +26954,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27549,7 +27549,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Ce jeton de sécurité est utilisé par le(s) script(s) suivants et ne peut pas "
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -28034,7 +28034,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Ce jeton de sécurité est utilisé par le(s) script(s) suivants et ne peut pas "
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -28261,7 +28261,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26795,7 +26795,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26267,7 +26267,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26855,7 +26855,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27135,7 +27135,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Token keamanan ini sedang digunakan oleh script berikut dan tdk dapat dihapus"
Modified: trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27675,7 +27675,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"Questo token di protezione è attualmente utilizzato dai seguenti script e "
Modified: trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26316,7 +26316,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26968,7 +26968,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
"이 보안] 토큰은 현재 다음과 같은 스크립트에 의해 사용되며 삭제할 수 없습니다"
Modified: trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26359,7 +26359,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26764,9 +26764,9 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
-msgstr "हे secuirty टोकन सध्या खालील स्क्रिप्ट वापरली जाते आणि हटविले जाऊ शकत नाही"
+msgstr "हे security टोकन सध्या खालील स्क्रिप्ट वापरली जाते आणि हटविले जाऊ शकत नाही"
#: SecurityTokens.php:51
msgid ""
Modified: trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27283,7 +27283,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26938,7 +26938,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27172,7 +27172,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr "Esse token segurança é usado pelos scripts e não pode ser removido"
Modified: trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27172,7 +27172,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr "Esse token segurança é usado pelos scripts e não pode ser removido"
Modified: trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27504,7 +27504,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27164,7 +27164,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27358,7 +27358,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26870,7 +26870,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -27095,7 +27095,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26823,7 +26823,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26671,7 +26671,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26400,7 +26400,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr "此令牌目前被以下脚本使用无法删除"
Modified: trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26365,7 +26365,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr ""
Modified: trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po 2016-10-31 15:35:29 UTC (rev 7657)
+++ trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po 2016-10-31 16:47:12 UTC (rev 7658)
@@ -26478,7 +26478,7 @@
#: SecurityTokens.php:14
msgid ""
-"This secuirty token is currently used by the following scripts and cannot be "
+"This security token is currently used by the following scripts and cannot be "
"deleted"
msgstr "這個編制主任令牌是目前使用以下腳本，不能被刪除"
|
|
From: <rc...@us...> - 2016-11-01 18:42:40
|
Revision: 7660
http://sourceforge.net/p/web-erp/reponame/7660
Author: rchacon
Date: 2016-11-01 18:42:38 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
On SupplierInquiry.php, replace the printf() statements with echo statements to fix bug caused by a supplier invoice with a comment that includes a % character (reported by R2-G, solution by Tim).
Revision Links:
--------------
http://sourceforge.net/p/web-erp/reponame/2
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2016-11-01 02:25:44 UTC (rev 7659)
+++ trunk/SupplierInquiry.php 2016-11-01 18:42:38 UTC (rev 7660)
@@ -3,9 +3,9 @@
/* Inquiry showing invoices, credit notes and payments made to suppliers together with the amounts outstanding. */
include('includes/session.inc');
-$Title = _('Supplier Inquiry');// Screen identification.
-$ViewTopic = 'AccountsPayable';// Filename in ManualContents.php's TOC./* RChacon: Is there any content for Supplier Inquiry? */
-$BookMark = 'AccountsPayable';// Anchor's id in the manual's html document.
+$Title = _('Supplier Inquiry');
+$ViewTopic = 'AccountsPayable';// RChacon: Is there any content for Supplier Inquiry?
+$BookMark = 'AccountsPayable';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -21,16 +21,16 @@
include('includes/footer.inc');
exit;
} else {
- if (isset($_GET['SupplierID'])) {
+ if(isset($_GET['SupplierID'])) {
$_SESSION['SupplierID'] = $_GET['SupplierID'];
}
$SupplierID = $_SESSION['SupplierID'];
}
-if (isset($_GET['FromDate'])) {
+if(isset($_GET['FromDate'])) {
$_POST['TransAfterDate']=$_GET['FromDate'];
}
-if (!isset($_POST['TransAfterDate']) OR !Is_Date($_POST['TransAfterDate'])) {
+if(!isset($_POST['TransAfterDate']) OR !Is_Date($_POST['TransAfterDate'])) {
$_POST['TransAfterDate'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date('m')-12,Date('d'),Date('Y')));
}
@@ -74,13 +74,11 @@
paymentterms.terms,
paymentterms.daysbeforedue,
paymentterms.dayinfollowingmonth";
-
$ErrMsg = _('The supplier details could not be retrieved by the SQL because');
$DbgMsg = _('The SQL that failed was');
-
$SupplierResult = DB_query($SQL, $ErrMsg, $DbgMsg);
-if (DB_num_rows($SupplierResult) == 0) {
+if(DB_num_rows($SupplierResult) == 0) {
/*Because there is no balance - so just retrieve the header information about the Supplier - the choice is do one query to get the balance and transactions for those Suppliers who have a balance and two queries for those who don't have a balance OR always do two queries - I opted for the former */
@@ -108,41 +106,39 @@
$SupplierRecord = DB_fetch_array($SupplierResult);
-if ($NIL_BALANCE == True) {
+if($NIL_BALANCE == True) {
$SupplierRecord['balance'] = 0;
$SupplierRecord['due'] = 0;
$SupplierRecord['overdue1'] = 0;
$SupplierRecord['overdue2'] = 0;
}
include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" /> ' .
- _('Supplier') . ': ' .
- $SupplierID . ' - ' . $SupplierRecord['suppname'] . '<br />' .
- _('All amounts stated in') . ': ' .
- $SupplierRecord['currcode'] . ' - ' . $CurrencyName[$SupplierRecord['currcode']] . '<br />' .
- _('Terms') . ': ' .
- $SupplierRecord['terms'] . '</p>';
-if (isset($_GET['HoldType']) AND isset($_GET['HoldTrans'])) {
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Supplier'), '" /> ', // Icon title.
+ _('Supplier'), ': ', $SupplierID, ' - ', $SupplierRecord['suppname'], '<br />',
+ _('All amounts stated in'), ': ', $SupplierRecord['currcode'], ' - ', $CurrencyName[$SupplierRecord['currcode']], '<br />',
+ _('Terms'), ': ', $SupplierRecord['terms'], '</p>';// Page title.
- if ($_GET['HoldStatus'] == _('Hold')) {
+if(isset($_GET['HoldType']) AND isset($_GET['HoldTrans'])) {
+ if($_GET['HoldStatus'] == _('Hold')) {
$SQL = "UPDATE supptrans SET hold=1
WHERE type='" . $_GET['HoldType'] . "'
AND transno='" . $_GET['HoldTrans'] . "'";
- } elseif ($_GET['HoldStatus'] == _('Release')) {
+ } elseif($_GET['HoldStatus'] == _('Release')) {
$SQL = "UPDATE supptrans SET hold=0
WHERE type='" . $_GET['HoldType'] . "'
AND transno='" . $_GET['HoldTrans'] . "'";
}
-
$ErrMsg = _('The Supplier Transactions could not be updated because');
$DbgMsg = _('The SQL that failed was');
$UpdateResult = DB_query($SQL, $ErrMsg, $DbgMsg);
-
}
echo '<table class="selection">
- <tr><th>' . _('Total Balance') . '</th>
+ <tr>
+ <th>' . _('Total Balance') . '</th>
<th>' . _('Current') . '</th>
<th>' . _('Now Due') . '</th>
<th>' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th>
@@ -190,13 +186,11 @@
AND supptrans.supplierno = '" . $SupplierID . "'
AND supptrans.trandate >= '" . $DateAfterCriteria . "'
ORDER BY supptrans.trandate";
-
$ErrMsg = _('No transactions were returned by the SQL because');
$DbgMsg = _('The SQL that failed was');
-
$TransResult = DB_query($SQL, $ErrMsg, $DbgMsg);
-if (DB_num_rows($TransResult) == 0) {
+if(DB_num_rows($TransResult) == 0) {
echo '<br /><div class="centre">' . _('There are no transactions to display since') . ' ' . $_POST['TransAfterDate'];
echo '</div>';
include('includes/footer.inc');
@@ -220,28 +214,31 @@
</tr>
</thead><tbody>';
-$AuthSQL="SELECT offhold
+$AuthSQL = "SELECT offhold
FROM purchorderauth
WHERE userid='" . $_SESSION['UserID'] . "'
AND currabrev='" . $SupplierRecord['currcode']."'";
-$AuthResult=DB_query($AuthSQL);
-$AuthRow=DB_fetch_array($AuthResult);
+$AuthResult = DB_query($AuthSQL);
+$AuthRow = DB_fetch_array($AuthResult);
$j = 1;
$k = 0;// Row colour counter.
-while ($myrow=DB_fetch_array($TransResult)) {
-
- if ($myrow['hold'] == 0 AND $myrow['settled'] == 0) {
+while($MyRow = DB_fetch_array($TransResult)) {
+ if($MyRow['hold'] == 0 AND $MyRow['settled'] == 0) {
$HoldValue = _('Hold');
- } elseif ($myrow['settled'] == 1) {
+ } elseif($MyRow['settled'] == 1) {
$HoldValue = '';
- }else {
+ } else {
$HoldValue = _('Release');
}
- if ($myrow['hold'] == 1) {
-// echo "<tr bgcolor='#DD99BB'>";
- }elseif ($k == 1) {
+
+ // Comment: All table-row (tag tr) must have 10 table-datacells (tag td).
+
+ if($MyRow['hold'] == 1) {
+ echo '<tr bgcolor="#DD99BB">';
+/* echo '<tr class="Highlight">';*/
+ } elseif($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
} else {
@@ -249,96 +246,62 @@
$k = 1;
}
- $FormatedTranDate = ConvertSQLDate($myrow['trandate']);
+ // Prints first 8 columns that are in common (columns 1-8):
+ echo '<td class="centre">', ConvertSQLDate($MyRow['trandate']), '</td>
+ <td class="text">', _($MyRow['typename']), '</td>
+ <td class="number"><a href="', $RootPath, '/SuppWhereAlloc.php?TransType=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', $MyRow['transno'], '</a></td>
+ <td class="text">', $MyRow['suppreference'], '</td>
+ <td class="text">', $MyRow['transtext'], '</td>
+ <td class="number">', locale_number_format($MyRow['totalamount'], $SupplierRecord['currdecimalplaces']), '</td>
+ <td class="number">', locale_number_format($MyRow['allocated'], $SupplierRecord['currdecimalplaces']), '</td>
+ <td class="number">', locale_number_format($MyRow['totalamount']-$MyRow['allocated'], $SupplierRecord['currdecimalplaces']), '</td>';
- // All table-row (tag tr) must have 10 table-datacells (tag td).
+ // STORE "Link to GL transactions inquiry" column to use in some of the cases (column 10):
+ $GLEntriesTD1 = '<td class="noprint"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '" target="_blank" title="' . _('Click to view the GL entries') . '"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/gl.png" width="16" /> ' . _('GL Entries') . '</a></td>';
- $BaseTD8 = '<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td>' . _($myrow['typename']) . '</td>
- <td class="number"><a href="' . $RootPath . '/SuppWhereAlloc.php?TransType=' . $myrow['type'] . '&TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td>
- <td>' . $myrow['suppreference'] . '</td>
- <td>' . $myrow['transtext'] . '</td>
- <td class="number">' . locale_number_format($myrow['totalamount'],$SupplierRecord['currdecimalplaces']) . '</td>
- <td class="number">' . locale_number_format($myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>
- <td class="number">' . locale_number_format($myrow['totalamount']-$myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>';
-
- $PaymentTD1 = '<td class="noprint"><a href="' . $RootPath . '/PaymentAllocations.php?SuppID=%s&InvID=%s" title="' .
- _('Click to view payments') . '"><img alt="" src="' . $RootPath .
- '/css/' . $Theme . '/images/money_delete.png" width="16"/> ' . _('Payments') . '</a></td>';
-
-/* To do: $HoldValueTD1*/
-
- $AllocationTD1 = '<td class="noprint"><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=%s" title="' .
- _('Click to allocate funds') . '"><img alt="" src="' . $RootPath .
- '/css/' . $Theme . '/images/allocation.png" /> ' . _('Allocation') . '</a></td>';
-
- $GLEntriesTD1 = '<td class="noprint"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=%s&TransNo=%s" target="_blank" title="' .
- _('Click to view the GL entries') . '"><img alt="" src="' . $RootPath .
- '/css/' . $Theme . '/images/gl.png" width="16" /> ' . _('GL Entries') . '</a></td>';
-
- if ($myrow['type'] == 20) { /*Show a link to allow GL postings to be viewed but no link to allocate */
-
- if ($_SESSION['CompanyRecord']['gllink_creditors'] == True) {
- if ($myrow['totalamount'] - $myrow['allocated'] == 0) {
- /*The trans is settled so don't show option to hold */
- printf($BaseTD8 . $PaymentTD1 . $GLEntriesTD1 . '</tr>',
- // $PaymentTD1 parameters:
- $myrow['supplierno'],
- $myrow['suppreference'],
- // $GLEntriesTD1 parameters:
- $myrow['type'],
- $myrow['transno']);
-
- } else {
- printf($BaseTD8);
- if ($AuthRow['offhold']==0) {
- echo '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>';
+ // Now prints columns 9 and 10:
+ if($MyRow['type'] == 20) {// It is a Purchase Invoice (systype = 20).
+ if($_SESSION['CompanyRecord']['gllink_creditors'] == True) {// Show a link to GL transactions inquiry:
+/* if($MyRow['totalamount'] - $MyRow['allocated'] == 0) {// The transaction is settled so don't show option to hold:*/
+ if($MyRow['totalamount'] == $MyRow['allocated']) {// The transaction is settled so don't show option to hold:
+ echo '<td class="noprint"><a href="', $RootPath, '/PaymentAllocations.php?SuppID=', $MyRow['supplierno'], '&InvID=', $MyRow['suppreference'], '" title="', _('Click to view payments'), '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/money_delete.png" width="16"/> ', _('Payments'), '</a></td>';// Payment column (column 9).
+ } else {// The transaction is NOT settled so show option to hold:
+ if($AuthRow['offhold'] == 0) {
+ echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8'), '?HoldType=', $MyRow['type'], '&HoldTrans=', $MyRow['transno'], '&HoldStatus=', $HoldValue, '&FromDate=', $_POST['TransAfterDate'], '">', $HoldValue, '</a></td>';// Column 9.
} else {
- if ($HoldValue==_('Release')) {
- echo '<td>' . $HoldValue . '</a></td>';
+ if($HoldValue == _('Release')) {
+ echo '<td class="noprint">', $HoldValue , '</a></td>';// Column 9.
} else {
- echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">' . $HoldValue . '</a></td>';
+ echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8'), '?HoldType=', $MyRow['type'], '&HoldTrans=', $MyRow['transno'], '&HoldStatus=', $HoldValue, '&FromDate=', $_POST['TransAfterDate'], '">', $HoldValue, '</a></td>';// Column 9.
}
}
- printf($GLEntriesTD1 . '</tr>',
- // $GLEntriesTD1 parameters:
- $myrow['type'],
- $myrow['transno']);
-
}
- } else {
- if ($myrow['totalamount'] - $myrow['allocated'] == 0) {
- /*The trans is settled so don't show option to hold */
- echo $BaseTD8 . '<td class="noprint"> </td><td class="noprint"> </td></tr>';
+ echo $GLEntriesTD1;// Column 10.
- } else {
- echo $BaseTD8 . '
- <td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' .
- $myrow['type'] . '&InvID=' . $myrow['transno'] . '">' . _('View Payments') . '</a></td>
- <td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' .
- $RootPath . '&FromDate='. $myrow['supplierno'] . '">' . $myrow['suppreference'] . '</a></td></tr>';
+ } else {// Do NOT show a link to GL transactions inquiry:
+/* if($MyRow['totalamount'] - $MyRow['allocated'] == 0) {// The transaction is settled so don't show option to hold:*/
+ if($MyRow['totalamount'] == $MyRow['allocated']) {// The transaction is settled so don't show option to hold:
+ echo '<td class="noprint"> </td>',// Column 9.
+ '<td class="noprint"> </td>';// Column 10.
+ } else {// The transaction is NOT settled so show option to hold:
+ echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8'), '/PaymentAllocations.php?SuppID=',
+ $MyRow['type'], '&InvID=', $MyRow['transno'], '">', _('View Payments'), '</a></td>',// Column 9.
+ '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8'), '?HoldType=', $_POST['TransAfterDate'], '&HoldTrans=', $HoldValue, '&HoldStatus=' .
+ $RootPath, '&FromDate=', $MyRow['supplierno'], '">' . $MyRow['suppreference'], '</a></td>';// Column 10.
}
}
- } else { /*its a credit note or a payment */
-
- if ($_SESSION['CompanyRecord']['gllink_creditors'] == True) {
- printf($BaseTD8 . $AllocationTD1 . $GLEntriesTD1 . '</tr>',
- // $AllocationTD1 parameters:
- $myrow['id'],
- // $GLEntriesTD1 parameters:
- $myrow['type'],
- $myrow['transno']);
-
- } else { /*Not linked to GL */
- printf($BaseTD8 . $AllocationTD1 . '<td class="noprint"> </td></tr>',
- // $AllocationTD1 parameters:
- $myrow['id']);
-
+ } else {// It is NOT a Purchase Invoice (a credit note or a payment).
+ echo '<td class="noprint"><a href="', $RootPath, '/SupplierAllocations.php?AllocTrans=', $MyRow['id'], '" title="', _('Click to allocate funds'), '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" /> ', _('Allocation'), '</a></td>';// Allocation column (column 9).
+ if($_SESSION['CompanyRecord']['gllink_creditors'] == True) {// Show a link to GL transactions inquiry:
+ echo $GLEntriesTD1;// Column 10.
+ } else {// Do NOT show a link to GL transactions inquiry:
+ echo '<td class="noprint"> </td>';// Column 10.
}
- }// End of page full new headings if
+ }// END printing columns 9 and 10.
+ echo '</tr>';// Close the table row.
}// End of while loop
echo '</tbody></table>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-01 02:25:44 UTC (rev 7659)
+++ trunk/doc/Change.log 2016-11-01 18:42:38 UTC (rev 7660)
@@ -1,5 +1,6 @@
webERP Change Log
+01/11/16 RChacon: On SupplierInquiry.php, replace the printf() statements with echo statements to fix bug caused by a supplier invoice with a comment that includes a % character (reported by R2-G, solution by Tim).
30/10/16 RChacon: In SecurityTokens.php: Fix Description's input maxlength, fix table head in data table, move form-tables after data table, add cancel button in edit form table, add return button, add style to print data table, add title in form tables, regroup code, change from if/elseif to switch/case to improve code readability, and add code documentation.
30/10/16 RChacon: On SupplierPriceList.php, add ViewTopic and BookMark, and complete html table. Add info to manual.
17/10/16 Phil: Fix SQL in ReverseGRN.php as reported by Ricard/Tim.
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2016-11-01 02:25:44 UTC (rev 7659)
+++ trunk/javascripts/MiscFunctions.js 2016-11-01 18:42:38 UTC (rev 7660)
@@ -11,10 +11,10 @@
}
function rTN(event) {
- if(window.event) k=window.event.keyCode;
- else if(event) k=event.which;
+ if(window.event) k = window.event.keyCode;
+ else if (event) k = event.which;
else return true;
- kC=String.fromCharCode(k);
+ kC = String.fromCharCode(k);
if(k==13) return false;
if((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
else if((("0123456789.,- ").indexOf(kC)>-1)) return true;
@@ -22,10 +22,10 @@
}
function rTI(event) {
- if(window.event) k=window.event.keyCode;
- else if(event) k=event.which;
+ if(window.event) k = window.event.keyCode;
+ else if(event) k = event.which;
else return true;
- kC=String.fromCharCode(k);
+ kC = String.fromCharCode(k);
if((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
else if((("0123456789-").indexOf(kC)>-1)) return true;
else return false;
@@ -55,6 +55,7 @@
if(patt.test(this.value)) {
this.setCustomValidity('');
return true;
+
} else {
this.setCustomValidity('The number format is wrong');
return false;
|
|
From: <rc...@us...> - 2016-11-03 20:33:10
|
Revision: 7661
http://sourceforge.net/p/web-erp/reponame/7661
Author: rchacon
Date: 2016-11-03 20:33:07 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
On Dashboard.php, fix creditors payment to point to allocation instead to payment, replace printf() with plain list echo, regroup code, and complete column styles.
Modified Paths:
--------------
trunk/Dashboard.php
trunk/doc/Change.log
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2016-11-01 18:42:38 UTC (rev 7660)
+++ trunk/Dashboard.php 2016-11-03 20:33:07 UTC (rev 7661)
@@ -1,80 +1,93 @@
<?php
/* $Id: Dashboard.php 6843 2014-08-20 06:04:47Z daintree $*/
+/* Display outstanding debtors, creditors, etc */
include('includes/session.inc');
-
$Title = _('Dashboard');
-
+$ViewTopic = 'GeneralLedger';// RChacon: You should be in this topic ?
+$BookMark = 'Dashboard';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/gl.png" title="' . _('Dashboard') . '" alt="" />' . _('Dashboard') . '</p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ $Title, '" /> ',// Icon title.
+ $Title, '</p>';// Page title.
-$sql = "SELECT pagesecurity
+$Sql = "SELECT pagesecurity
FROM scripts
WHERE scripts.script = 'AgedDebtors.php'";
$ErrMsg = _('The security for Aging Debtors cannot be retrieved because');
$DbgMsg = _('The SQL that was used and failed was');
-$Security1Result = DB_query($sql, $ErrMsg, $DbgMsg);
+$Security1Result = DB_query($Sql, $ErrMsg, $DbgMsg);
$MyUserRow = DB_fetch_array($Security1Result);
$DebtorSecurity = $MyUserRow['pagesecurity'];
-$sql = "SELECT pagesecurity
+$Sql = "SELECT pagesecurity
FROM scripts
WHERE scripts.script = 'SuppPaymentRun.php'";
$ErrMsg = _('The security for upcoming payments cannot be retrieved because');
$DbgMsg = _('The SQL that was used and failed was');
-$Security2Result = DB_query($sql, $ErrMsg, $DbgMsg);
+$Security2Result = DB_query($Sql, $ErrMsg, $DbgMsg);
$MyUserRow = DB_fetch_array($Security2Result);
$PayeeSecurity = $MyUserRow['pagesecurity'];
-$sql = "SELECT pagesecurity
+$Sql = "SELECT pagesecurity
FROM scripts
WHERE scripts.script = 'GLAccountInquiry.php'";
$ErrMsg = _('The security for G/L Accounts cannot be retrieved because');
$DbgMsg = _('The SQL that was used and failed was');
-$Security2Result = DB_query($sql, $ErrMsg, $DbgMsg);
+$Security2Result = DB_query($Sql, $ErrMsg, $DbgMsg);
$MyUserRow = DB_fetch_array($Security2Result);
$CashSecurity = $MyUserRow['pagesecurity'];
-$sql = "SELECT pagesecurity
+$Sql = "SELECT pagesecurity
FROM scripts
WHERE scripts.script = 'SelectSalesOrder.php'";
$ErrMsg = _('The security for Aging Debtors cannot be retrieved because');
$DbgMsg = _('The SQL that was used and failed was');
-$Security1Result = DB_query($sql, $ErrMsg, $DbgMsg);
+$Security1Result = DB_query($Sql, $ErrMsg, $DbgMsg);
$MyUserRow = DB_fetch_array($Security1Result);
$OrderSecurity = $MyUserRow['pagesecurity'];
-if (in_array($DebtorSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($DebtorSecurity)) {
- echo '<br /><b>' . _('Overdue Customer Balances') . '</b>
- <table class="selection"><tbody>';
+if(in_array($DebtorSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($DebtorSecurity)) {
+ echo '<br />
+ <h2>', _('Overdue Customer Balances'), '</h2>
+ <table class="selection">
+ <thead>
+ <tr>
+ <th>', _('Customer'), '</th>
+ <th>', _('Reference'), '</th>
+ <th>', _('Trans Date'), '</th>
+ <th>', _('Due Date'), '</th>
+ <th>', _('Balance'), '</th>
+ <th>', _('Current'), '</th>
+ <th>', _('Due Now'), '</th>
+ <th>', '> ', $_SESSION['PastDueDays1'], ' ', _('Days Over'), '</th>
+ <th>', '> ', $_SESSION['PastDueDays2'], ' ', _('Days Over'), '</th>
+ </tr>
+ </thead><tbody>';
+ $j = 1;
+ $k = 0;// Row colour counter.
+ $TotBal = 0;
+ $TotCurr = 0;
+ $TotDue = 0;
+ $TotOD1 = 0;
+ $TotOD2 = 0;
+ $ListCount = DB_num_rows($CustomerResult);
+ $CurrDecimalPlaces = 2;//By default.
- $TableHeader = '<tr>
- <th>' . _('Customer') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Trans Date') . '</th>
- <th>' . _('Due Date') . '</th>
- <th>' . _('Balance') . '</th>
- <th>' . _('Current') . '</th>
- <th>' . _('Due Now') . '</th>
- <th>' . '> ' . $_SESSION['PastDueDays1'] . ' ' . _('Days Over') . '</th>
- <th>' . '> ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Over') . '</th>
- </tr>';
- echo $TableHeader;
- $j = 1;
- $k=0; //row colour counter
- if (!isset($_POST['Salesman'])){
- $_POST['Salesman']='';
+ if(!isset($_POST['Salesman'])) {
+ $_POST['Salesman'] = '';
}
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$_POST['Salesman'] = $_SESSION['SalesmanLogin'];
}
- if (trim($_POST['Salesman'])!=''){
+ if(trim($_POST['Salesman']) != '') {
$SalesLimit = " AND debtorsmaster.debtorno IN (SELECT DISTINCT debtorno FROM custbranch WHERE salesman = '".$_POST['Salesman']."') ";
} else {
$SalesLimit = '';
}
- $SQL = "SELECT debtorsmaster.debtorno,
+ $Sql = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
currencies.decimalplaces,
@@ -139,35 +152,25 @@
holdreasons.reasondescription
HAVING
ROUND(ABS(SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)),currencies.decimalplaces) > 0";
- $CustomerResult = DB_query($SQL,'','',False,False); /*dont trap errors handled below*/
+ $CustomerResult = DB_query($Sql, '', '', False, False); /*dont trap errors handled below*/
- if (DB_error_no() !=0) {
+ if(DB_error_no() != 0) {
prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
- echo '<br />' . $SQL;
+ if($debug==1) {
+ echo '<br />', $Sql;
}
include('includes/footer.inc');
exit;
}
-
- $TotBal=0;
- $TotCurr=0;
- $TotDue=0;
- $TotOD1=0;
- $TotOD2=0;
-
- $ListCount = DB_num_rows($CustomerResult);
- $CurrDecimalPlaces =2; //by default
-
- while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
- if ($k==1){
+ while($AgedAnalysis = DB_fetch_array($CustomerResult,$db)) {
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
$CurrDecimalPlaces = $AgedAnalysis['decimalplaces'];
$DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$CurrDecimalPlaces);
@@ -175,35 +178,21 @@
$DisplayBalance = locale_number_format($AgedAnalysis['balance'],$CurrDecimalPlaces);
$DisplayOverdue1 = locale_number_format($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2'],$CurrDecimalPlaces);
$DisplayOverdue2 = locale_number_format($AgedAnalysis['overdue2'],$CurrDecimalPlaces);
- if ($DisplayDue <> 0 OR $DisplayOverdue1 <> 0 OR $DisplayOverdue2 <> 0) {
+ if($DisplayDue <> 0 OR $DisplayOverdue1 <> 0 OR $DisplayOverdue2 <> 0) {
$TotBal += $AgedAnalysis['balance'];
+ $TotCurr += ($AgedAnalysis['balance']-$AgedAnalysis['due']);
$TotDue += ($AgedAnalysis['due']-$AgedAnalysis['overdue1']);
- $TotCurr += ($AgedAnalysis['balance']-$AgedAnalysis['due']);
$TotOD1 += ($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2']);
$TotOD2 += $AgedAnalysis['overdue2'];
+ echo '<td class="text" colspan="4"><b>', $AgedAnalysis['debtorno'], ' - ', $AgedAnalysis['name'], '</b></td>
+ <td class="number"><b>', $DisplayBalance, '</b></td>
+ <td class="number"><b>', $DisplayCurrent, '</b></td>
+ <td class="number" style="color:orange;"><b>', $DisplayDue, '</b></td>
+ <td class="number" style="color:red;"><b>', $DisplayOverdue1, '</b></td>
+ <td class="number" style="color:red;"><b>', $DisplayOverdue2, '</b></td>
+ </tr>';
-
- printf('<td><b>%s</b></td>
- <td><b>%s</b></td>
- <td><b>%s</b></td>
- <td><b>%s</b></td>
- <td class="number"><b>%s</b></td>
- <td class="number"><b>%s</b></td>
- <td class="number" style="color:orange;"><b>%s</b></td>
- <td class="number" style="color:red;"><b>%s</b></td>
- <td class="number" style="color:red;"><b>%s</b></td>
- </tr>',
- $AgedAnalysis['debtorno'] . ' - ' . $AgedAnalysis['name'],
- '',
- '',
- '',
- $DisplayBalance,
- $DisplayCurrent,
- $DisplayDue,
- $DisplayOverdue1,
- $DisplayOverdue2 );
-
- $sql = "SELECT systypes.typename,
+ $Sql = "SELECT systypes.typename,
debtortrans.transno,
debtortrans.trandate,
daysbeforedue,
@@ -247,33 +236,32 @@
AND debtortrans.debtorno = '" . $AgedAnalysis['debtorno'] . "'
AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004";
- if ($_SESSION['SalesmanLogin'] != '') {
- $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ if($_SESSION['SalesmanLogin'] != '') {
+ $Sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
- $DetailResult = DB_query($sql,'','',False,False);
- if (DB_error_no() !=0) {
+ $DetailResult = DB_query($Sql,'','',False,False);
+ if(DB_error_no() !=0) {
prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
- echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
+ if($debug==1) {
+ echo '<br />' . _('The SQL that failed was') . '<br />' . $Sql;
}
include('includes/footer.inc');
exit;
}
- while ($DetailTrans = DB_fetch_array($DetailResult)){
-
+ while($DetailTrans = DB_fetch_array($DetailResult)) {
$DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
- $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'],$CurrDecimalPlaces);
- $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'],$CurrDecimalPlaces);
- $DisplayBalance = locale_number_format($DetailTrans['balance'],$CurrDecimalPlaces);
- $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],$CurrDecimalPlaces);
- $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'],$CurrDecimalPlaces);
+ $DisplayBalance = locale_number_format($DetailTrans['balance'], $CurrDecimalPlaces);
+ $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'], $CurrDecimalPlaces);
+ $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'], $CurrDecimalPlaces);
+ $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'], $CurrDecimalPlaces);
+ $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'], $CurrDecimalPlaces);
- if ($DetailTrans['daysbeforedue'] > 0) {
+ if($DetailTrans['daysbeforedue'] > 0) {
$AddDays=$DetailTrans['daysbeforedue'] . ' days';
- if (function_exists(date_add)) {
+ if(function_exists(date_add)) {
$DisplayDueDate = date_add(date_create($DetailTrans['trandate']), date_interval_create_from_date_string($AddDays));
} else {
$DisplayDueDate = strtotime($AddDays,strtotime($DetailTrans['trandate']));
@@ -281,7 +269,7 @@
} else {
$AddDays=(intval($DetailTrans['dayinfollowingmonth']) - 1) . ' days';
- if (function_exists(date_add)){
+ if(function_exists(date_add)) {
$DisplayDueDate = date_create($DetailTrans['trandate']);
$DisplayDueDate->modify('first day of next month');
$DisplayDueDate = date_add($DisplayDueDate, date_interval_create_from_date_string($AddDays));
@@ -291,91 +279,72 @@
}
}
- if (function_exists(date_add)) {
+ if(function_exists(date_add)) {
$DisplayDueDate=date_format($DisplayDueDate,$_SESSION['DefaultDateFormat']);
} else {
$DisplayDueDate = Date($_SESSION['DefaultDateFormat'],$DisplayDueDate);
}
- if ($k==1){
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
- printf('<td style="text-align:center">%s</td>
- <td style="text-align:right">%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number" style="color:orange;">%s</td>
- <td class="number" style="color:red;">%s</td>
- <td class="number" style="color:red;">%s</td>',
- _($DetailTrans['typename']),
- $DetailTrans['transno'],
- $DisplayTranDate,
- $DisplayDueDate,
- $DisplayBalance,
- $DisplayCurrent,
- $DisplayDue,
- $DisplayOverdue1,
- $DisplayOverdue2);
- echo '</tr>';
+ echo '<td style="text-align:center">', _($DetailTrans['typename']), '</td>',// Should it be left (text field) ?
+ '<td class="number">', $DetailTrans['transno'], '</td>
+ <td class="centre">', $DisplayTranDate, '</td>
+ <td class="centre">', $DisplayDueDate, '</td>
+ <td class="number">', $DisplayBalance, '</td>
+ <td class="number">', $DisplayCurrent, '</td>
+ <td class="number" style="color:orange;">', $DisplayDue, '</td>
+ <td class="number" style="color:red;">', $DisplayOverdue1, '</td>
+ <td class="number" style="color:red;">', $DisplayOverdue2, '</td>
+ </tr>';
} //end while there are detail transactions to show
} //has Due now or overdue
} //end customer aged analysis while loop
- $DisplayTotBalance = locale_number_format($TotBal,$CurrDecimalPlaces);
- $DisplayTotDue = locale_number_format($TotDue,$CurrDecimalPlaces);
- $DisplayTotCurrent = locale_number_format($TotCurr,$CurrDecimalPlaces);
- $DisplayTotOverdue1 = locale_number_format($TotOD1,$CurrDecimalPlaces);
- $DisplayTotOverdue2 = locale_number_format($TotOD2,$CurrDecimalPlaces);
- if ($k==1){
+ // Print totals of 'Overdue Customer Balances':
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
- printf('<td style="text-align:left"><b>%s</b></td>
- <td><b>%s</b></td>
- <td><b>%s</b></td>
- <td><b>%s</b></td>
- <td class="number"><b>%s</b></td>
- <td class="number"><b>%s</b></td>
- <td class="number"><b>%s</b></td>
- <td class="number" style="color:red;"><b>%s</b></td>
- <td class="number" style="color:red;"><b>%s</b></td>',
- _('Totals'),
- '',
- '',
- '',
- $DisplayTotBalance,
- $DisplayTotCurrent,
- $DisplayTotDue,
- $DisplayTotOverdue1,
- $DisplayTotOverdue2);
-
- echo '</tr>';
- echo '</tbody>
- </table>';
+ echo '<td class="text"><b>', _('Totals'), '</b></td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td class="number"><b>', locale_number_format($TotBal, $CurrDecimalPlaces), '</b></td>
+ <td class="number"><b>', locale_number_format($TotCurr, $CurrDecimalPlaces), '</b></td>
+ <td class="number"><b>', locale_number_format($TotDue, $CurrDecimalPlaces), '</b></td>
+ <td class="number" style="color:red;"><b>', locale_number_format($TotOD1, $CurrDecimalPlaces), '</b></td>
+ <td class="number" style="color:red;"><b>', locale_number_format($TotOD2, $CurrDecimalPlaces), '</b></td>
+ </tr>
+ </tbody></table>';
} //DebtorSecurity
-if (in_array($PayeeSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PayeeSecurity)) {
+if(in_array($PayeeSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PayeeSecurity)) {
+ echo '<br />
+ <h2>', _('Supplier Invoices Due within 1 Month'), '</h2>
+ <table class="selection">
+ <thead>
+ <tr>
+ <th>', _('Supplier'), '</th>
+ <th>', _('Invoice Date'), '</th>
+ <th>', _('Invoice'), '</th>
+ <th>', _('Amount Due'), '</th>
+ <th>', _('Due Date'), '</th>
+ </tr>
+ </thead><tbody>';
+ $SupplierID = '';
+ $TotalPayments = 0;
+ $TotalAccumDiffOnExch = 0;
+ $AccumBalance = 0;
- echo '<br /><b>' . _('Supplier Invoices Due within 1 Month') . '</b>
- <table class="selection">
- <tbody>
- <tr>
- <th>' . _('Supplier') . '</th>
- <th>' . _('Invoice Date') . '</th>
- <th>' . _('Invoice') . '</th>
- <th>' . _('Amount Due') . '</th>
- <th>' . _('Due Date') . '</th>
- </tr>';
-
- $sql = "SELECT suppliers.supplierid,
+ $Sql = "SELECT suppliers.supplierid,
currencies.decimalplaces AS currdecimalplaces,
SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance
FROM suppliers INNER JOIN paymentterms
@@ -392,19 +361,13 @@
currencies.decimalplaces
HAVING SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <> 0
ORDER BY suppliers.supplierid";
+ $SuppliersResult = DB_query($Sql);
- $SuppliersResult = DB_query($sql);
+ while($SuppliersToPay = DB_fetch_array($SuppliersResult)) {
- $SupplierID ='';
- $TotalPayments = 0;
- $TotalAccumDiffOnExch = 0;
- $AccumBalance =0;
-
- while ($SuppliersToPay = DB_fetch_array($SuppliersResult)){
-
$CurrDecimalPlaces = $SuppliersToPay['currdecimalplaces'];
- $sql = "SELECT suppliers.supplierid,
+ $Sql = "SELECT suppliers.supplierid,
suppliers.suppname,
systypes.typename,
paymentterms.terms,
@@ -418,26 +381,24 @@
(supptrans.ovamount + supptrans.ovgst ) AS trantotal,
supptrans.diffonexch,
supptrans.id
- FROM suppliers INNER JOIN paymentterms
- ON suppliers.paymentterms = paymentterms.termsindicator
- INNER JOIN supptrans
- ON suppliers.supplierid = supptrans.supplierno
- INNER JOIN systypes
- ON systypes.typeid = supptrans.type
+ FROM suppliers
+ INNER JOIN paymentterms ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN supptrans ON suppliers.supplierid = supptrans.supplierno
+ INNER JOIN systypes ON systypes.typeid = supptrans.type
WHERE supptrans.supplierno = '" . $SuppliersToPay['supplierid'] . "'
- AND supptrans.ovamount + supptrans.ovgst - supptrans.alloc !=0
- AND supptrans.duedate <='" . Date('Y-m-d', mktime(0,0,0, Date('n'),Date('j')+30,date('Y'))) . "'
- AND supptrans.hold = 0
+ AND supptrans.ovamount + supptrans.ovgst - supptrans.alloc !=0
+ AND supptrans.duedate <='" . Date('Y-m-d', mktime(0,0,0, Date('n'),Date('j')+30,date('Y'))) . "'
+ AND supptrans.hold = 0
ORDER BY supptrans.supplierno,
supptrans.type,
supptrans.transno";
- $TransResult = DB_query($sql,'','',false,false);
- if (DB_error_no() !=0) {
+ $TransResult = DB_query($Sql,'','',false,false);
+ if(DB_error_no() !=0) {
prnMsg(_('The details of supplier invoices due could not be retrieved because') . ' - ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
- echo '<br />' . _('The SQL that failed was') . ' ' . $sql;
+ if($debug==1) {
+ echo '<br />' . _('The SQL that failed was') . ' ' . $Sql;
}
include('includes/footer.inc');
exit;
@@ -446,95 +407,90 @@
unset($Allocs);
$Allocs = array();
$AllocCounter =0;
- $k=0; //row colour counter
+ $k = 0; //row colour counter
- while ($DetailTrans = DB_fetch_array($TransResult)){
-
- if ($DetailTrans['supplierid'] != $SupplierID){ /*Need to head up for a new suppliers details */
- if ($k==1){
+ while($DetailTrans = DB_fetch_array($TransResult)) {
+ if($DetailTrans['supplierid'] != $SupplierID) { /*Need to head up for a new suppliers details */
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
$SupplierID = $DetailTrans['supplierid'];
$SupplierName = $DetailTrans['suppname'];
-
//$AccumBalance = 0;
$AccumDiffOnExch = 0;
+ echo '<td class="text" colspan="5"><b>', $DetailTrans['supplierid'], ' - ', $DetailTrans['suppname'], ' - ', $DetailTrans['terms'], '</b></td>
+ </tr>';
+ }
- printf('<td style="text-align:left"><b>%s</b></td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>',
- $DetailTrans['supplierid'] . ' - ' . $DetailTrans['suppname'] . ' - ' . $DetailTrans['terms'],
- '',
- '',
- '',
- '');
- echo '</tr>';
- }
- if ($k==1){
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
$DisplayFormat = '';
-
- if ((time()-(60*60*24)) > strtotime($DetailTrans['duedate'])) {
- $DisplayFormat=' style="color:red;" ';
+ if((time()-(60*60*24)) > strtotime($DetailTrans['duedate'])) {
+ $DisplayFormat = ' style="color:red;"';
}
$DislayTranDate = ConvertSQLDate($DetailTrans['trandate']);
$AccumBalance += $DetailTrans['balance'];
- $PayNow='<a href="' . $RootPath . '/Payments.php?&SupplierID=' . $SupplierID. '&Amount=' . $DetailTrans['balance'] . '&BankTransRef=' .$DetailTrans['suppreference'] . '">' .$DetailTrans['suppreference'] . '</a>';
- printf('<td style="text-align:center">%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number"' . $DisplayFormat . '>%s</td>
- <td' . $DisplayFormat . '>%s</td>',
- _($DetailTrans['typename']),
- $DislayTranDate,
- $PayNow,
- locale_number_format($DetailTrans['balance'],$CurrDecimalPlaces),
- ConvertSQLDate($DetailTrans['duedate']));
- echo '</tr>';
+ if(_($DetailTrans['type']) == 20) {// If Purchase Invoice:
+ echo '<td style="text-align:center">', _($DetailTrans['typename']), '</td>
+ <td class="centre">', $DislayTranDate, '</td>
+ <td class="text"><a href="', $RootPath, '/Payments.php?&SupplierID=', $SupplierID, '&Amount=', $DetailTrans['balance'], '&BankTransRef=', $DetailTrans['suppreference'], '">', $DetailTrans['suppreference'], '</a></td>
+ <td class="number"', $DisplayFormat, '>', locale_number_format($DetailTrans['balance'], $CurrDecimalPlaces), '</td>
+ <td class="centre"', $DisplayFormat, '>', ConvertSQLDate($DetailTrans['duedate']), '</td>
+ </tr>';
+ } else {// If NOT Purchase Invoice (Creditors Payment):
+ echo '<td style="text-align:center">', _($DetailTrans['typename']), '</td>
+ <td class="centre">', $DislayTranDate, '</td>
+ <td class="text"><a href="', $RootPath, '/SupplierAllocations.php?AllocTrans=', $DetailTrans['id'], '">', $DetailTrans['suppreference'], '</a></td>
+ <td class="number"', $DisplayFormat, '>', locale_number_format($DetailTrans['balance'], $CurrDecimalPlaces), '</td>
+ <td class="centre"', $DisplayFormat, '>', ConvertSQLDate($DetailTrans['duedate']), '</td>
+ </tr>';
+ }
} /*end while there are detail transactions to show */
} /* end while there are suppliers to retrieve transactions for */
- if ($k==1){
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
- echo '<td style="text-align:left">' . _('Grand Total Payments Due') . '</td>
- <td></td>
- <td></td>
- <td class="number"><b>' . locale_number_format($AccumBalance,$CurrDecimalPlaces) . '</b></td>
- <td></td>
+ echo '<td class="number">', _('Grand Total Payments Due'), '</td>
+ <td> </td>
+ <td> </td>
+ <td class="number"><b>', locale_number_format($AccumBalance, $CurrDecimalPlaces), '</b></td>
+ <td> </td>
</tr>
</tbody>
</table>';
} //PayeeSecurity
-if (in_array($CashSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($CashSecurity)) {
+
+if(in_array($CashSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($CashSecurity)) {
include('includes/GLPostings.inc');
- echo '<br /><b>' . _('Bank and Credit Card Balances') . '</b>
- <table class="selection"><tbody>';
+ echo '<br />
+ <h2>', _('Bank and Credit Card Balances'), '</h2>
+ <table class="selection">',
+/* '<thead>',*/ // Need to update the sorting javascript.
+ '<tr>
+ <th class="ascending">', _('GL Account'), '</th>
+ <th class="ascending">', _('Account Name'), '</th>
+ <th class="ascending">', _('Balance'), '</th>
+ </tr>'
+/*, '</thead><tbody>'*/;// Need to update the sorting javascript.
$FirstPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$LastPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$SelectedPeriod=$LastPeriodSelected;
- echo '<tr>
- <th class="ascending">' . _('GL Account') . '</th>
- <th class="ascending">' . _('Account Name') . '</th>
- <th class="ascending">' . _('Balance') . '</th>
- </tr>';
- $sql = "SELECT bankaccounts.accountcode,
+ $Sql = "SELECT bankaccounts.accountcode,
bankaccounts.bankaccountcode,
chartmaster.accountname,
bankaccountname
@@ -542,18 +498,18 @@
ON bankaccounts.accountcode = chartmaster.accountcode";
$ErrMsg = _('The bank accounts set up could not be retrieved because');
- $DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $sql;
- $result1 = DB_query($sql,$ErrMsg,$DbgMsg);
+ $DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $Sql;
+ $result1 = DB_query($Sql,$ErrMsg,$DbgMsg);
- $k=0; //row colour counter
+ $k = 0; //row colour counter
- while ($myrow = DB_fetch_array($result1)) {
- if ($k==1){
+ while($myrow = DB_fetch_array($result1)) {
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k++;
+ $k = 1;
}
/*Is the account a balance sheet or a profit and loss account */
$result = DB_query("SELECT pandl
@@ -561,13 +517,13 @@
INNER JOIN chartmaster ON accountgroups.groupname=chartmaster.group_
WHERE chartmaster.accountcode='" . $myrow['accountcode'] ."'");
$PandLRow = DB_fetch_row($result);
- if ($PandLRow[0]==1){
+ if($PandLRow[0]==1) {
$PandLAccount = True;
- }else{
+ } else {
$PandLAccount = False; /*its a balance sheet account */
}
- $sql= "SELECT counterindex,
+ $Sql= "SELECT counterindex,
type,
typename,
gltrans.typeno,
@@ -586,12 +542,11 @@
AND periodno>='" . $FirstPeriodSelected . "'
AND periodno<='" . $LastPeriodSelected . "'
ORDER BY periodno, gltrans.trandate, counterindex";
- $TransResult = DB_query($sql,$ErrMsg);
- if ($PandLAccount==True) {
+ $TransResult = DB_query($Sql,$ErrMsg);
+ if($PandLAccount==True) {
$RunningTotal = 0;
- } else {
- // added to fix bug with Brought Forward Balance always being zero
- $sql = "SELECT bfwd,
+ } else {// added to fix bug with Brought Forward Balance always being zero
+ $Sql = "SELECT bfwd,
actual,
period
FROM chartdetails
@@ -599,33 +554,32 @@
AND chartdetails.period='" . $FirstPeriodSelected . "'";
$ErrMsg = _('The chart details for account') . ' ' . $myrow['accountcode'] . ' ' . _('could not be retrieved');
- $ChartDetailsResult = DB_query($sql,$ErrMsg);
+ $ChartDetailsResult = DB_query($Sql,$ErrMsg);
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
- $RunningTotal =$ChartDetailRow['bfwd'];
+ $RunningTotal = $ChartDetailRow['bfwd'];
}
$PeriodTotal = 0;
$PeriodNo = -9999;
- while ($myrow2=DB_fetch_array($TransResult)) {
- if ($myrow2['periodno']!=$PeriodNo){
- if ($PeriodNo!=-9999){ //ie its not the first time around
+ while($myrow2=DB_fetch_array($TransResult)) {
+ if($myrow2['periodno']!=$PeriodNo) {
+ if($PeriodNo!=-9999) { //ie its not the first time around
/*Get the ChartDetails balance b/fwd and the actual movement in the account for the period as recorded in the chart details - need to ensure integrity of transactions to the chart detail movements. Also, for a balance sheet account it is the balance carried forward that is important, not just the transactions*/
- $sql = "SELECT bfwd,
+ $Sql = "SELECT bfwd,
actual,
period
FROM chartdetails
WHERE chartdetails.accountcode='" . $myrow['accountcode'] . "'
AND chartdetails.period='" . $PeriodNo . "'";
-
$ErrMsg = _('The chart details for account') . ' ' . $myrow['accountcode'] . ' ' . _('could not be retrieved');
- $ChartDetailsResult = DB_query($sql,$ErrMsg);
+ $ChartDetailsResult = DB_query($Sql,$ErrMsg);
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
- if ($PeriodTotal < 0 ){ //its a credit balance b/fwd
- if ($PandLAccount==True) {
+ if($PeriodTotal < 0 ) { //its a credit balance b/fwd
+ if($PandLAccount==True) {
$RunningTotal = 0;
}
} else { //its a debit balance b/fwd
- if ($PandLAccount==True) {
+ if($PandLAccount==True) {
$RunningTotal = 0;
}
}
@@ -637,33 +591,33 @@
$PeriodTotal += $myrow2['amount'];
}
$DisplayBalance=locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']);
- printf('<td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- </tr>',
- $myrow['accountcode'] . ' - ' . $myrow['accountname'],
- $myrow['bankaccountname'],
- $DisplayBalance);
+ echo '<td class="text">', $myrow['accountcode'], ' - ', $myrow['accountname'], '</td>
+ <td class="text">', $myrow['bankaccountname'], '</td>
+ <td class="number">', $DisplayBalance, '</td>
+ </tr>';
} //each bank account
- echo '</tbody>
- </table>';
+ echo /*'</tbody>',*/// Need to update the sorting javascript.
+ '</table>';
} //CashSecurity
-if (in_array($OrderSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($OrderSecurity)) {
- echo '<br /><b>' . _('Outstanding Orders') . '</b>
- <table cellpadding="2" width="95%" class="selection">
- <tr>
- <th>' . _('View Order') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Cust Order') . ' #</th>
- <th>' . _('Order Date') . '</th>
- <th>' . _('Req...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-06 18:46:54
|
Revision: 7662
http://sourceforge.net/p/web-erp/reponame/7662
Author: rchacon
Date: 2016-11-06 18:46:52 +0000 (Sun, 06 Nov 2016)
Log Message:
-----------
Fix to show price in user's locale format, add supplier's id and name to title, replace printf() with plain list echo, and regroup and document code.
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/SupplierPriceList.php
trunk/doc/Change.log
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2016-11-03 20:33:07 UTC (rev 7661)
+++ trunk/SelectSupplier.php 2016-11-06 18:46:52 UTC (rev 7662)
@@ -1,15 +1,15 @@
<?php
/* $Id$*/
+/* Selects a supplier. A supplier is required to be selected before any AP transactions and before any maintenance or inquiry of the supplier */
-include ('includes/session.inc');
+include('includes/session.inc');
$Title = _('Search Suppliers');
-
-/* webERP manual links before header.inc */
-$ViewTopic= 'AccountsPayable';
+$ViewTopic = 'AccountsPayable';
$BookMark = 'SelectSupplier';
+include('includes/header.inc');
-include ('includes/header.inc');
-include ('includes/SQL_CommonFunctions.inc');
+include('includes/SQL_CommonFunctions.inc');
+
if (!isset($_SESSION['SupplierID'])) {
echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
}
Modified: trunk/SupplierPriceList.php
===================================================================
--- trunk/SupplierPriceList.php 2016-11-03 20:33:07 UTC (rev 7661)
+++ trunk/SupplierPriceList.php 2016-11-06 18:46:52 UTC (rev 7662)
@@ -8,19 +8,22 @@
$BookMark = 'SupplierPriceList';
include('includes/header.inc');
-if (isset($_POST['StockSearch'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />
- <p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>
+if(isset($_POST['StockSearch'])) {
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/magnifier.png" title="', // Icon image.
+ _('Search'), '" /> ', // Icon title.
+ _('Search for Inventory Items'), '</p>';// Page title.
+
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />
+ <input name="SupplierID" type="hidden" value="', $_POST['SupplierID'], '" />
<table class="selection">
<tr>
<td>' . _('In Stock Category') . ':<select name="StockCat">';
- if (!isset($_POST['StockCat'])) {
+ if(!isset($_POST['StockCat'])) {
$_POST['StockCat'] = '';
}
- if ($_POST['StockCat'] == 'All') {
+ if($_POST['StockCat'] == 'All') {
echo '<option selected="True" value="All">' . _('All') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>';
@@ -30,16 +33,16 @@
FROM stockcategory
ORDER BY categorydescription";
$result1 = DB_query($SQL);
- while ($myrow1 = DB_fetch_array($result1)) {
- if ($myrow1['categoryid'] == $_POST['StockCat']) {
- echo '<option selected="True" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ while($MyRow1 = DB_fetch_array($result1)) {
+ if($MyRow1['categoryid'] == $_POST['StockCat']) {
+ echo '<option selected="True" value="' . $MyRow1['categoryid'] . '">' . $MyRow1['categorydescription'] . '</option>';
} else {
- echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ echo '<option value="' . $MyRow1['categoryid'] . '">' . $MyRow1['categorydescription'] . '</option>';
}
}
echo '</select></td>';
echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>';
- if (isset($_POST['Keywords'])) {
+ if(isset($_POST['Keywords'])) {
echo '<input type="search" name="Keywords" value="' . $_POST['Keywords'] . '" autofocus="autofocus" size="34" maxlength="25" />';
} else {
echo '<input type="search" name="Keywords" size="34" maxlength="25" autofocus="autofocus" placeholder="Enter part of the item description" />';
@@ -50,7 +53,7 @@
<td></td>
<td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>
<td>';
- if (isset($_POST['StockCode'])) {
+ if(isset($_POST['StockCode'])) {
echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />';
} else {
echo '<input type="text" name="StockCode" size="15" maxlength="18" />';
@@ -69,19 +72,19 @@
exit;
}
-if (isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
- if (!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) {
+if(isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+ if(!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) {
// if Search then set to first page
$_POST['PageOffset'] = 1;
}
- if ($_POST['Keywords'] AND $_POST['StockCode']) {
+ if($_POST['Keywords'] AND $_POST['StockCode']) {
prnMsg (_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info');
}
- if ($_POST['Keywords']) {
+ if($_POST['Keywords']) {
//insert wildcard characters in spaces
$_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
- if ($_POST['StockCat'] == 'All') {
+ if($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) AS qoh,
@@ -124,9 +127,9 @@
stockmaster.decimalplaces
ORDER BY stockmaster.stockid";
}
- } elseif (isset($_POST['StockCode'])) {
+ } elseif(isset($_POST['StockCode'])) {
$_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
- if ($_POST['StockCat'] == 'All') {
+ if($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -169,8 +172,8 @@
stockmaster.decimalplaces
ORDER BY stockmaster.stockid";
}
- } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
- if ($_POST['StockCat'] == 'All') {
+ } elseif(!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
+ if($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -215,42 +218,42 @@
$ErrMsg = _('No stock items were returned by the SQL because');
$DbgMsg = _('The SQL that returned an error was');
$searchresult = DB_query($SQL, $ErrMsg, $DbgMsg);
- if (DB_num_rows($searchresult) == 0) {
+ if(DB_num_rows($searchresult) == 0) {
prnMsg(_('No stock items were returned by this search please re-enter alternative criteria to try again'), 'info');
}
unset($_POST['Search']);
}
/* end query for list of records */
/* display list if there is more than one record */
-if (isset($searchresult) AND !isset($_POST['Select'])) {
+if(isset($searchresult) AND !isset($_POST['Select'])) {
echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
$ListCount = DB_num_rows($searchresult);
- if ($ListCount > 0) {
+ if($ListCount > 0) {
// If the user hit the search button and there is more than one item to show
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
- if (isset($_POST['Next'])) {
- if ($_POST['PageOffset'] < $ListPageMax) {
+ if(isset($_POST['Next'])) {
+ if($_POST['PageOffset'] < $ListPageMax) {
$_POST['PageOffset'] = $_POST['PageOffset'] + 1;
}
}
- if (isset($_POST['Previous'])) {
- if ($_POST['PageOffset'] > 1) {
+ if(isset($_POST['Previous'])) {
+ if($_POST['PageOffset'] > 1) {
$_POST['PageOffset'] = $_POST['PageOffset'] - 1;
}
}
- if ($_POST['PageOffset'] > $ListPageMax) {
+ if($_POST['PageOffset'] > $ListPageMax) {
$_POST['PageOffset'] = $ListPageMax;
}
- if ($ListPageMax > 1) {
+ if($ListPageMax > 1) {
echo '<div class="centre"><br /> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset">';
$ListPage = 1;
- while ($ListPage <= $ListPageMax) {
- if ($ListPage == $_POST['PageOffset']) {
+ while($ListPage <= $ListPageMax) {
+ if($ListPage == $_POST['PageOffset']) {
echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
} else {
echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
@@ -276,11 +279,11 @@
$j = 1;
$k = 0; //row counter to determine background colour
$RowIndex = 0;
- if (DB_num_rows($searchresult) <> 0) {
+ if(DB_num_rows($searchresult) <> 0) {
DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
}
- while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
- if ($k == 1) {
+ while(($MyRow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
} else {
@@ -288,9 +291,9 @@
$k++;
}
- echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>' . $myrow['description'] . '</td>
- <td>' . $myrow['units'] . '</td>
+ echo '<td><input type="submit" name="Select" value="' . $MyRow['stockid'] . '" /></td>
+ <td>' . $MyRow['description'] . '</td>
+ <td>' . $MyRow['units'] . '</td>
</tr>';
$RowIndex = $RowIndex + 1;
//end of page full new headings if
@@ -306,21 +309,21 @@
}
foreach ($_POST as $key=>$value) {
- if (mb_substr($key,0,6)=='Update') {
+ if(mb_substr($key,0,6)=='Update') {
$Index = mb_substr($key,6,mb_strlen($key)-6);
- $StockID=$_POST['StockID'.$Index];
- $Price=$_POST['Price'.$Index];
- $SuppUOM=$_POST['SuppUOM'.$Index];
- $ConversionFactor=$_POST['ConversionFactor'.$Index];
- $SupplierDescription=$_POST['SupplierDescription'.$Index];
- $LeadTime=$_POST['LeadTime'.$Index];
- if (isset($_POST['Preferred'.$Index])) {
- $Preferred=1;
- $PreferredSQL="UPDATE purchdata SET preferred=0
+ $StockID = $_POST['StockID'.$Index];
+ $Price = filter_number_format($_POST['Price'.$Index]);// Convert data from user format to database number format.
+ $SuppUOM = $_POST['SuppUOM'.$Index];
+ $ConversionFactor = $_POST['ConversionFactor'.$Index];
+ $SupplierDescription = $_POST['SupplierDescription'.$Index];
+ $LeadTime = $_POST['LeadTime'.$Index];
+ if(isset($_POST['Preferred'.$Index])) {
+ $Preferred = 1;
+ $PreferredSQL = "UPDATE purchdata SET preferred=0
WHERE stockid='" . $StockID . "'";
$PreferredResult=DB_query($PreferredSQL);
} else {
- $Preferred=0;
+ $Preferred = 0;
}
$EffectiveFrom=$_POST['EffectiveFrom'.$Index];
$SupplierPartNo=$_POST['SupplierPartNo'.$Index];
@@ -338,8 +341,8 @@
AND stockid='" . $StockID . "'";
$result=DB_query($sql);
}
- if (mb_substr($key,0,6)=='Insert') {
- if (isset($_POST['Preferred0'])) {
+ if(mb_substr($key,0,6)=='Insert') {
+ if(isset($_POST['Preferred0'])) {
$Preferred=1;
} else {
$Preferred=0;
@@ -372,56 +375,58 @@
}
}
-if (isset($_GET['SupplierID'])) {
+if(isset($_GET['SupplierID'])) {
$SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
-} elseif (isset($_POST['SupplierID'])) {
+} elseif(isset($_POST['SupplierID'])) {
$SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
}
-if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
+if(isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
$sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers WHERE supplierid='".$SupplierID."'";
$ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
$DbgMsg = _('The SQL that failed was');
$SuppSelResult = DB_query($sql, $ErrMsg, $DbgMsg);
- if (DB_num_rows($SuppSelResult) == 1) {
- $myrow = DB_fetch_array($SuppSelResult);
- $SuppName = $myrow['suppname'];
- $CurrCode = $myrow['currcode'];
+ if(DB_num_rows($SuppSelResult) == 1) {
+ $MyRow = DB_fetch_array($SuppSelResult);
+ $SuppName = $MyRow['suppname'];
+ $CurrCode = $MyRow['currcode'];
} else {
prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
unset($SupplierID);
}
} else {
- if ($NoPurchasingData=0) {
+ if($NoPurchasingData=0) {
echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' .
$Title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
}
- if (!isset($_POST['SearchSupplier'])) {
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Search for a supplier') . '</p><br />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ if(!isset($_POST['SearchSupplier'])) {
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Search for a supplier'), '" /> ', // Icon title.
+ _('Search for a supplier'), '</p>';// Page title.
+ echo '<br />
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />';
echo '<table cellpadding="3" class="selection"><tr>';
echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
- echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
+ echo '<td><input maxlength="25" name="Keywords" size="20" type="text" /></td>';
echo '<td><b>' . _('OR') . '</b></td>';
echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
- echo '<td><input type="text" name="SupplierCode" size="15" maxlength="18" /></td>';
+ echo '<td><input maxlength="18" name="SupplierCode" size="15" type="text" /></td>';
echo '</tr></table><br />';
- echo '<div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" /></div>';
- echo '</div>
- </form>';
+ echo '<div class="centre"><input name="SearchSupplier" type="submit" value="' . _('Find Suppliers Now') . '" /></div>';
+ echo '</form>';
include ('includes/footer.inc');
exit;
};
}
-if (isset($_POST['SearchSupplier'])) {
- if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+if(isset($_POST['SearchSupplier'])) {
+ if($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
$_POST['Keywords'] = ' ';
}
- if (mb_strlen($_POST['Keywords']) > 0) {
+ if(mb_strlen($_POST['Keywords']) > 0) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -432,7 +437,7 @@
suppliers.address2,
suppliers.address3
FROM suppliers WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
- } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+ } elseif(mb_strlen($_POST['SupplierCode']) > 0) {
$SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.currcode,
@@ -447,61 +452,58 @@
$SuppliersResult = DB_query($SQL, $ErrMsg, $DbgMsg);
} //end of if search
-if (isset($SuppliersResult)) {
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Select a supplier') . '</p><br />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+if(isset($SuppliersResult)) {
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Search'), '" /> ', // Icon title.
+ _('Select a supplier'), '</p>';// Page title.
+ echo '<br />
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
+ echo '<table cellpadding="2" class="selection">
+ <tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Address 1') . '</th>
<th>' . _('Address 2') . '</th>
<th>' . _('Address 3') . '</th>
</tr>';
- echo $TableHeader;
+
$k = 0;
- while ($myrow = DB_fetch_array($SuppliersResult)) {
- if ($k==1){
+ while($MyRow = DB_fetch_array($SuppliersResult)) {
+ if($k == 1){
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k++;
+ $k = 1;
}
- printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- </tr>',
- $myrow['supplierid'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['address1'],
- $myrow['address2'],
- $myrow['address3']
- );
-
- }
- //end of while loop
+ echo '<td><input name="SupplierID" type="submit" value="', $MyRow['supplierid'], '" /></td>
+ <td>', $MyRow['suppname'], '</td>
+ <td>', $MyRow['currcode'], '</td>
+ <td>', $MyRow['address1'], '</td>
+ <td>', $MyRow['address2'], '</td>
+ <td>', $MyRow['address3'], '</td>
+ </tr>';
+ }// END while($MyRow = DB_fetch_array($SuppliersResult)).
echo '</table>
- <br/>
- </div>
- </form>';
+ </form>
+ <br />';
include('includes/footer.inc');
exit;
-}
-//end if results to show
+}// END if(isset($SuppliersResult)).
-if (isset($_POST['SupplierID'])) {
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Supplier Purchasing Data') . '</p><br />';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+if(isset($_POST['SupplierID'])) {
+ $MyRow = DB_fetch_array(DB_query("SELECT suppname FROM `suppliers` WHERE `supplierid`='" . $_POST['SupplierID'] . "'"));// Retrieve supplier's name from database.
+ $SuppName = $MyRow['suppname'];
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/supplier.png" title="', // Icon image.
+ _('Search'), '" /> ', // Icon title.
+ _('Supplier Purchasing Data'), '<br />',
+ $_POST['SupplierID'], ' - ', $SuppName, '</p>';// Page title.
+
$SQL="SELECT purchdata.stockid,
stockmaster.description,
price,
@@ -518,18 +520,23 @@
ON purchdata.stockid=stockmaster.stockid
WHERE supplierno='".$_POST['SupplierID']."'
ORDER BY purchdata.stockid, effectivefrom DESC";
-
$result=DB_query($SQL);
$UOMSQL = "SELECT unitid,
unitname
FROM unitsofmeasure";
$UOMResult = DB_query($UOMSQL);
- echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
- echo '<table class="selection">';
- echo '<tr><th colspan="8" style="text-align: left"><h3>' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</h3></th>';
- echo '<th colspan="5" style="text-align: right">' . _('Find new Item Code') . '
- <button type="submit" name="StockSearch"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" alt="" /></button></th></tr>';
+
+ echo '<br />
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />
+ <input name="SupplierID" type="hidden" value="', $_POST['SupplierID'], '" />';
+
+ echo '<table class="selection">
+ <tr>
+ <th colspan="12" style="text-align: right">' . _('Find new Item Code') .
+ '<button type="submit" name="StockSearch"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" alt="" /></button></th>
+ </tr>';
echo '<tr>
<th>' . _('StockID') . '</th>
<th>' . _('Description') . '</th>
@@ -543,73 +550,74 @@
<th>' . _('Suppliers Item Code') . '</th>
<th>' . _('Min Order Qty') . '</th>
<th>', _('Save'), '</th>
- </tr>';
+ </tr>';// RChacon: Sortable by StockID, Description, Suppliers_Description, Suppliers_Description ?
- if (isset($_POST['Select'])) {
- $StockSQL="SELECT description, units FROM stockmaster WHERE stockid='" . $_POST['Select'] . "'";
- $StockResult=DB_query($StockSQL);
- $StockRow=DB_fetch_array($StockResult);
+ if(isset($_POST['Select'])) {
+ $StockSQL = "SELECT description, units FROM stockmaster WHERE stockid='" . $_POST['Select'] . "'";
+ $StockResult = DB_query($StockSQL);
+ $StockRow = DB_fetch_array($StockResult);
+ // RChacon: if exist, retrieve data, not a blank line?
echo '<tr bgcolor="#847F7F">
<td><input type="hidden" value="' . $_POST['Select'] . '" name="StockID0" />' . $_POST['Select'] . '</td>
<td>' . $StockRow['description'] . '</td>
<td><input type="text" class="number" size="11" value="0.0000" name="Price0" /></td>
<td><select name="SuppUOM0">';
- while ($UOMRow=DB_fetch_array($UOMResult)) {
- if ($UOMRow['unitname']==$StRowoc['units']) {
- echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
- } else {
- echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
- }
- }
- DB_data_seek($UOMResult, 0);
- echo '</select></td>
- <td><input type="text" class="number" size="11" value="1" name="ConversionFactor0" /></td>
- <td><input type="text" size="30" maxlength="50" value="" name="SupplierDescription0" /></td>
- <td><input type="text" class="number" size="11" value="1" name="LeadTime0" /></td>';
- echo '<td><input type="checkbox" name="Preferred0" /></td>';
- echo '<td><input type="text" class="date" size="11" value="' . date( $_SESSION['DefaultDateFormat']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom0" /></td>
- <td><input type="text" size="20" maxlength="50" value="" name="SupplierPartNo0" /></td>
- <td><input type="text" class="number" size="11" value="1" name="MinOrderQty0" /></td>
- <td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" alt="" /></button></td>
+ while($UOMRow=DB_fetch_array($UOMResult)) {
+ if($UOMRow['unitname']==$StRowoc['units']) {
+ echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
+ } else {
+ echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
+ }
+ }
+ DB_data_seek($UOMResult, 0);
+ echo '</select></td>
+ <td><input class="number" name="ConversionFactor0" size="11" type="text" value="1" /></td>
+ <td><input maxlength="50" name="SupplierDescription0" size="30" type="text" value="" /></td>
+ <td><input class="number" name="LeadTime0" size="11" type="text" value="1" /></td>
+ <td><input name="Preferred0" type="checkbox" /></td>
+ <td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" name="EffectiveFrom0" size="11" type="text" value="', date( $_SESSION['DefaultDateFormat']), '" /></td>
+ <td><input maxlength="50" name="SupplierPartNo0" size="20" type="text" value="" /></td>
+ <td><input class="number" name="MinOrderQty0" size="11" type="text" value="1" /></td>
+ <td><button name="Insert" type="submit" style="width:100%;text-align:left"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" width="15" /></button></td>
</tr>';
}
- $RowCounter=1;
- while ($myrow=DB_fetch_array($result)) {
+ $RowCounter = 1;
+ while($MyRow = DB_fetch_array($result)) {
echo '<tr>
- <td><input type="hidden" value="' . $myrow['stockid'] . '" name="StockID'.$RowCounter.'" />' . $myrow['stockid'] . '</td>
- <td>' . $myrow['description'] . '</td>
- <td><input type="text" class="number" size="11" value="' . $myrow['price'] . '" name="Price'.$RowCounter.'" /></td>
+ <td class="text"><input name="StockID'. $RowCounter. '" type="hidden" value="' . $MyRow['stockid'] . '" />' . $MyRow['stockid'] . '</td>
+ <td class="text">' . $MyRow['description'], '</td>
+ <td><input class="number" size="11" type="text" value="', locale_number_format($MyRow['price'], 4), // Show price in locale user format. RChacon: Decimals from parameters ?
+ '" name="Price'.$RowCounter.'" /></td>
<td><select name="SuppUOM'.$RowCounter.'">';
- DB_data_seek($UOMResult, 0);
- while ($UOMRow=DB_fetch_array($UOMResult)) {
- if ($UOMRow['unitname']==$myrow['suppliersuom']) {
- echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
- } else {
- echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
- }
- }
- echo '</select></td>
- <td><input type="text" class="number" size="11" value="' . $myrow['conversionfactor'] . '" name="ConversionFactor'.$RowCounter.'" /></td>
- <td><input type="text" size="30" maxlength="50" value="' . $myrow['supplierdescription'] . '" name="SupplierDescription'.$RowCounter.'" /></td>
- <td><input type="text" class="number" size="11" value="' . $myrow['leadtime'] . '" name="LeadTime'.$RowCounter.'" /></td>';
- if ($myrow['preferred']==1) {
- echo '<td><input type="checkbox" checked="checked" name="Preferred'.$RowCounter.'" /></td>';
- } else {
- echo '<td><input type="checkbox" name="Preferred'.$RowCounter.'" /></td>';
- }
- echo '<td><input type="text" class="date" size="11" value="' . ConvertSQLDate($myrow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom'.$RowCounter.'" /></td>
- <td><input type="text" size="20" maxlength="50" value="' . $myrow['suppliers_partno'] . '" name="SupplierPartNo'.$RowCounter.'" /></td>
- <td><input type="text" class="number" size="11" value="' . $myrow['minorderqty'] . '" name="MinOrderQty'.$RowCounter.'" /></td>
- <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" alt="" /></button></td>
+ DB_data_seek($UOMResult, 0);
+ while($UOMRow=DB_fetch_array($UOMResult)) {
+ if($UOMRow['unitname']==$MyRow['suppliersuom']) {
+ echo '<option selected="selected" value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
+ } else {
+ echo '<option value="'.$UOMRow['unitname'].'">' . $UOMRow['unitname'] . '</option>';
+ }
+ }
+ echo '</select></td>
+ <td><input class="number" name="ConversionFactor'. $RowCounter. '" size="11" type="text" value="' . $MyRow['conversionfactor'] . '" /></td>
+ <td><input maxlength="50" name="SupplierDescription'. $RowCounter. '" size="30" type="text" value="' . $MyRow['supplierdescription'] . '" /></td>
+ <td><input class="number" name="LeadTime'. $RowCounter. '" size="11" type="text" value="' . $MyRow['leadtime'] . '" /></td>';
+ if($MyRow['preferred'] == 1) {
+ echo '<td><input checked="checked" name="Preferred'. $RowCounter. '" type="checkbox" /></td>';
+ } else {
+ echo '<td><input name="Preferred'. $RowCounter. '" type="checkbox" /></td>';
+ }
+ echo '<td><input class="date" size="11" name="EffectiveFrom'. $RowCounter. '" type="text" value="' . ConvertSQLDate($MyRow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" /></td>
+ <td><input maxlength="50" name="SupplierPartNo'. $RowCounter. '" size="20" type="text" value="' . $MyRow['suppliers_partno'] . '" /></td>
+ <td><input class="number" name="MinOrderQty'. $RowCounter. '" size="11" type="text" value="' . $MyRow['minorderqty'] . '" /></td>
+ <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/tick.png" width="15" /></button></td>
</tr>';
$RowCounter++;
}
echo '</table>';
- echo '</div>
- </form>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-03 20:33:07 UTC (rev 7661)
+++ trunk/doc/Change.log 2016-11-06 18:46:52 UTC (rev 7662)
@@ -1,5 +1,6 @@
webERP Change Log
+06/11/16 RChacon: On SupplierPriceList.php, fix to show...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-07 03:25:51
|
Revision: 7663
http://sourceforge.net/p/web-erp/reponame/7663
Author: rchacon
Date: 2016-11-07 03:25:49 +0000 (Mon, 07 Nov 2016)
Log Message:
-----------
Standardise Return button.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/DailyBankTransactions.php
trunk/GLAccountUsers.php
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/GLTrialBalance.php
trunk/UserGLAccounts.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/AnalysisHorizontalIncome.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -117,8 +117,8 @@
'<div class="centre noprint">',
'<button name="ShowPL" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
// Now do the posting while the user is thinking about the period to select:
@@ -518,8 +518,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</form>';
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/AnalysisHorizontalPosition.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -75,8 +75,8 @@
'<div class="centre noprint">',
'<button name="ShowBalanceSheet" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
// Now do the posting while the user is thinking about the period to select:
@@ -358,8 +358,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</form>';
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/DailyBankTransactions.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -92,7 +92,7 @@
$BankResult = DB_query($SQL,_('Could not retrieve the bank account details'));
- $sql="SELECT (SELECT sum(banktrans.amount) FROM banktrans
+ $sql="SELECT (SELECT sum(banktrans.amount) FROM banktrans
WHERE transdate < '" . FormatDateForSQL($_POST['FromTransDate']) . "'
AND bankact='" . $_POST['BankAccount'] ."') AS prebalance,
banktrans.currcode,
@@ -125,7 +125,7 @@
_('Bank Transactions Inquiry') . '" /> ' .// Icon title.
_('Bank Transactions Inquiry') . '</p>';// Page title.
prnMsg(_('There are no transactions for this account in the date range selected'), 'info');
-
+
$sql = "SELECT sum(banktrans.amount) FROM banktrans WHERE bankact='" . $_POST['BankAccount'] . "'";
$ErrMsg = _('Failed to retrive balance data');
$balresult = DB_query($sql,$ErrMsg);
@@ -136,7 +136,7 @@
echo '<p class="page_title_text">' . _('The Bank Account Balance Is in') . ' ' . $BankDetailRow['currcode'] . ' <span style="font-weight:bold">' . locale_number_format($Balance,$BankDetailRow['decimalplaces']) . '</span></p>';
}
}
-
+
} else {
echo '<div id="Report">';// Division to identify the report block.
echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
@@ -168,7 +168,7 @@
$j = 0;
$k = 0;
while ($myrow = DB_fetch_array($result)){
-
+
if ($j == 0) {
if (ABS($myrow['prebalance'])>0.0001) {
if ($k == 0) {
@@ -184,7 +184,7 @@
<td colspan="5"></td></tr>';
$j++;
- }
+ }
}
if ($k == 0) {
echo '<tr class="OddTableRows">';
@@ -210,7 +210,7 @@
$Balance += $myrow['amount']/$myrow['exrate'];
$AccountCurrTotal += $myrow['amount']/$myrow['exrate'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
-
+
if ($myrow['amount']==$myrow['amountcleared']) {
$Matched=_('Yes');
} else {
@@ -253,9 +253,8 @@
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' .
_('Select Another Date') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' .
- _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
}
Modified: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLAccountUsers.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -249,8 +249,8 @@
'<button formaction="GLAccountUsers.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different GL account'), '</button>'; // "Select A Different GL account" button.
}
-echo '<button formaction="index.php?Application=GL" type="submit" value="Submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+echo '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLBalanceSheet.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -130,8 +130,8 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
@@ -373,8 +373,8 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
@@ -716,8 +716,8 @@
'/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Balance Date') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
echo '</div>';// div class=?
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLProfit_Loss.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -166,8 +166,8 @@
Sum(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
@@ -595,8 +595,8 @@
SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
- INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
@@ -1313,8 +1313,8 @@
'/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
- '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</div>';// div class=?
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/GLTrialBalance.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -147,7 +147,7 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
+ FROM chartmaster
INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
@@ -419,7 +419,7 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster
+ FROM chartmaster
INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
@@ -736,8 +736,8 @@
'/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Period') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
}
echo '</div>
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/UserGLAccounts.php 2016-11-07 03:25:49 UTC (rev 7663)
@@ -255,8 +255,8 @@
'<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
}
-echo '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+echo '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>
</form>';
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-06 18:46:52 UTC (rev 7662)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-07 03:25:49 UTC (rev 7663)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-31 20:01-0600\n"
-"PO-Revision-Date: 2016-11-06 11:51-0600\n"
+"PO-Revision-Date: 2016-11-06 21:23-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -14616,7 +14616,7 @@
#: GLAccountInquiry.php:272
msgid "Period difference"
-msgstr "Diferencia del Período"
+msgstr "Diferencia del período"
#: GLAccountInquiry.php:295
msgid "Failed to retrieve bank data"
@@ -15360,7 +15360,7 @@
#: includes/PDFTagProfitAndLossPageHeader.inc:36
#: includes/PDFTrialBalancePageHeader.inc:33
msgid "Period Budget"
-msgstr "Presupuesto del Período"
+msgstr "Presupuesto del período"
#: GLProfit_Loss.php:912
#, php-format
@@ -15524,7 +15524,7 @@
#: GLTrialBalance.php:455 includes/PDFTrialBalancePageHeader.inc:31
msgid "Month Budget"
-msgstr "Presupuesto Mensual"
+msgstr "Presupuesto mensual"
#: GoodsReceivedControlled.php:9
msgid "Receive Controlled Items"
@@ -22399,7 +22399,7 @@
#: PeriodsInquiry.php:7
msgid "Periods Inquiry"
-msgstr "Consultar Períodos"
+msgstr "Consultar períodos"
#: PeriodsInquiry.php:16
msgid "No periods were returned by the SQL because"
@@ -24667,7 +24667,7 @@
#: PrintCustStatements.php:103
msgid "Account #"
-msgstr ""
+msgstr "Cuenta #"
#: PrintCustStatements.php:105
msgid "Recipients"
@@ -30461,7 +30461,7 @@
#: ShopParameters.php:344
msgid "Add surcharges for different payment methods."
-msgstr ""
+msgstr "Añadir recargos para diferentes métodos de pago."
#: ShopParameters.php:349
msgid "Surcharges Stock Item"
@@ -39671,7 +39671,7 @@
#: WorkOrderEntry.php:1055
msgid "Add To Work Order"
-msgstr ""
+msgstr "Añadir a la orden de trabajo"
#: WorkOrderIssue.php:5
msgid "Issue Materials To Work Order"
@@ -51451,7 +51451,7 @@
#: reportwriter/languages/en_US/reports.php:55
msgid "Align"
-msgstr ""
+msgstr "Alinear"
#: reportwriter/languages/en_US/reports.php:57
msgid "Bottom"
@@ -51624,7 +51624,7 @@
#: reportwriter/languages/en_US/reports.php:135
msgid "Change"
-msgstr ""
+msgstr "Cambiar"
#: reportwriter/languages/en_US/reports.php:136
msgid "Continue"
|
|
From: <rc...@us...> - 2016-11-08 15:51:14
|
Revision: 7665
http://sourceforge.net/p/web-erp/reponame/7665
Author: rchacon
Date: 2016-11-08 15:51:11 +0000 (Tue, 08 Nov 2016)
Log Message:
-----------
Fix table html code.
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/css/default/default.css
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2016-11-08 07:59:07 UTC (rev 7664)
+++ trunk/SelectSupplier.php 2016-11-08 15:51:11 UTC (rev 7665)
@@ -348,14 +348,22 @@
echo '<br />';
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Supplier.') . '</div>';
} else {
- echo '<div class="centre"><br />';
- echo '<tr><td colspan="2">';
- echo '<table width="45%" class="selection">';
- echo '<tr><th style="width:33%">' . _('Supplier Mapping') . '</th></tr>';
- echo '</td><td valign="top">'; /* Mapping */
- echo '<div class="centre">' . _('Mapping is enabled, Map will display below.') . '</div>';
- echo '<div class="centre" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px"></div></div><br />';
- echo '</th></tr></table>';
+
+ echo '<br />
+ <table class="selection">
+ <thead>
+ <tr>
+ <th>', _('Supplier Mapping'), '</th>
+ </tr>
+ </thead><tbody>
+ <tr>
+ <td class="centre">', _('Mapping is enabled, Map will display below.'), '</td>
+ </tr><tr>
+ <td class="centre">', // Mapping:
+ '<div class="centre" id="map" style="width: ', $map_width, 'px; height: ', $map_height, 'px"></div>
+ </td>
+ </tr>
+ <tbody></table>';
}
}
// Extended Info only if selected in Configuration
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-11-08 07:59:07 UTC (rev 7664)
+++ trunk/css/default/default.css 2016-11-08 15:51:11 UTC (rev 7665)
@@ -1,16 +1,6 @@
/* $Id$*/
-/***
+/* Default theme for WebERP by . */
-New Default Theme for WebERP
-
-***/
-
-button img {
- /* Describes how button image should be displayed. */
- height:16px;
- width:16px;
-}
-
body {
background-color:#ccd;
font-family:Arial, Verdana, Helvetica, sans-serif;
@@ -19,6 +9,12 @@
padding:0;
}
+button img {
+ height:16px;
+ width:16px;
+ /* Describes how button image should be displayed. Related with body font-size in px. */
+}
+
a {
color:blue;
text-decoration:none;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-08 07:59:07 UTC (rev 7664)
+++ trunk/doc/Change.log 2016-11-08 15:51:11 UTC (rev 7665)
@@ -1,5 +1,6 @@
webERP Change Log
+08/11/16 RChacon: On SelectSupplier.php, fix table html code.
06/11/16 RChacon: On SupplierPriceList.php, fix to show price in user's locale format, add supplier's id and name to title, replace printf() with plain list echo, and regroup and document code.
03/11/16 RChacon: On Dashboard.php, fix creditors payment to point to allocation instead to payment, replace printf() with plain list echo, regroup code, and complete column styles.
01/11/16 RChacon: On SupplierInquiry.php, replace the printf() statements with echo statements to fix bug caused by a supplier invoice with a comment that includes a % character (reported by R2-G, solution by Tim).
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-08 07:59:07 UTC (rev 7664)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-08 15:51:11 UTC (rev 7665)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-31 20:01-0600\n"
-"PO-Revision-Date: 2016-11-06 21:23-0600\n"
+"PO-Revision-Date: 2016-11-07 08:06-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -25514,7 +25514,7 @@
#: PurchData.php:277 PurchData.php:702 SellThroughSupport.php:266
#: SupplierPriceList.php:542
msgid "Effective From"
-msgstr "Vigente Desde"
+msgstr "Vigente desde"
#: PurchData.php:278 SelectProduct.php:328 SupplierPriceList.php:544
msgid "Min Order Qty"
@@ -35259,7 +35259,7 @@
#: SupplierPriceList.php:543
msgid "Suppliers Item Code"
-msgstr "Código de Artículo de proveedor"
+msgstr "Código de artículo del proveedor"
#: SupplierPriceList.php:545 reportwriter/languages/en_US/reports.php:155
msgid "Save"
|
|
From: <rc...@us...> - 2016-11-18 00:22:29
|
Revision: 7668
http://sourceforge.net/p/web-erp/reponame/7668
Author: rchacon
Date: 2016-11-18 00:22:26 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Add scripts to shows a statement of cash flows for the period using the indirect method.
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/doc/Change.log
trunk/doc/Manual/ManualGeneralLedger.html
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Added Paths:
-----------
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2016-11-17 04:17:16 UTC (rev 7667)
+++ trunk/GLAccounts.php 2016-11-18 00:22:26 UTC (rev 7668)
@@ -2,6 +2,22 @@
/* $Id$*/
/* Defines the general ledger accounts */
+// BEGIN: Functions division ---------------------------------------------------
+function CashFlowsActivityName($Activity) {
+ // Converts the cash flow activity number to an activity text.
+ switch($Activity) {
+ case -1: return '<b>' . _('Without setting up') . '</b>';
+ case 0: return _('No effect on cash flow');
+ case 1: return _('Operating activity');
+ case 2: return _('Investing activity');
+ case 3: return _('Financing activity');
+ case 4: return _('Cash or cash equivalent');
+ default: return '<b>' . _('Unknown') . '</b>';
+ }
+}
+// END: Functions division -----------------------------------------------------
+
+// BEGIN: Procedure division ---------------------------------------------------
include('includes/session.inc');
$Title = _('General Ledger Accounts');
$ViewTopic= 'GeneralLedger';
@@ -13,6 +29,11 @@
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
+// Merges gets into posts:
+if(isset($_GET['CashFlowsActivity'])) {// Select period from.
+ $_POST['CashFlowsActivity'] = $_GET['CashFlowsActivity'];
+}
+
if(isset($_POST['SelectedAccount'])) {
$SelectedAccount = $_POST['SelectedAccount'];
} elseif(isset($_GET['SelectedAccount'])) {
@@ -36,8 +57,10 @@
if(isset($SelectedAccount) AND $InputError != 1) {
- $Sql = "UPDATE chartmaster SET accountname='" . $_POST['AccountName'] . "',
- group_='" . $_POST['Group'] . "'
+ $Sql = "UPDATE
+ chartmaster SET accountname='" . $_POST['AccountName'] . "',
+ group_='" . $_POST['Group'] . "',
+ cashflowsactivity='" . $_POST['CashFlowsActivity'] . "'
WHERE accountcode ='" . $SelectedAccount . "'";
$ErrMsg = _('Could not update the account because');
$Result = DB_query($Sql, $ErrMsg);
@@ -47,12 +70,16 @@
/*SelectedAccount is null cos no item selected on first time round so must be adding a record must be submitting new entries */
- $Sql = "INSERT INTO chartmaster (accountcode,
- accountname,
- group_)
- VALUES ('" . $_POST['AccountCode'] . "',
- '" . $_POST['AccountName'] . "',
- '" . $_POST['Group'] . "')";
+ $Sql = "INSERT INTO chartmaster (
+ accountcode,
+ accountname,
+ group_,
+ cashflowsactivity)
+ VALUES ('" .
+ $_POST['AccountCode'] . "', '" .
+ $_POST['AccountName'] . "', '" .
+ $_POST['Group'] . "', '" .
+ $_POST['CashFlowsActivity'] . "')";
$ErrMsg = _('Could not add the new account code');
$Result = DB_query($Sql, $ErrMsg);
@@ -62,6 +89,7 @@
unset($_POST['Group']);
unset($_POST['AccountCode']);
unset($_POST['AccountName']);
+ unset($_POST['CashFlowsActivity']);
unset($SelectedAccount);
} elseif(isset($_GET['delete'])) {
@@ -196,20 +224,19 @@
if(!isset($_GET['delete'])) {
echo '<form method="post" id="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if(isset($SelectedAccount)) {
//editing an existing account
- $Sql = "SELECT accountcode, accountname, group_ FROM chartmaster WHERE accountcode='" . $SelectedAccount ."'";
-
+ $Sql = "SELECT accountcode, accountname, group_, cashflowsactivity FROM chartmaster WHERE accountcode='" . $SelectedAccount ."'";
$Result = DB_query($Sql);
$MyRow = DB_fetch_array($Result);
$_POST['AccountCode'] = $MyRow['accountcode'];
$_POST['AccountName'] = $MyRow['accountname'];
$_POST['Group'] = $MyRow['group_'];
+ $_POST['CashFlowsActivity'] = $MyRow['cashflowsactivity'];
echo '<input type="hidden" name="SelectedAccount" value="' . $SelectedAccount . '" />';
echo '<input type="hidden" name="AccountCode" value="' . $_POST['AccountCode'] .'" />';
@@ -248,12 +275,27 @@
}
echo '</select></td>
</tr>
- </table>
+
+ <tr>
+ <td><label for="CashFlowsActivity">', _('Cash Flows Activity'), ':</label></td>
+ <td><select id="CashFlowsActivity" name="CashFlowsActivity" required="required">
+ <option value="0"', ($_POST['CashFlowsActivity'] == 0 ? ' selected="selected"' : ''), '>', _('No effect on cash flow'), '</option>
+ <option value="1"', ($_POST['CashFlowsActivity'] == 1 ? ' selected="selected"' : ''), '>', _('Operating activity'), '</option>
+ <option value="2"', ($_POST['CashFlowsActivity'] == 2 ? ' selected="selected"' : ''), '>', _('Investing activity'), '</option>
+ <option value="3"', ($_POST['CashFlowsActivity'] == 3 ? ' selected="selected"' : ''), '>', _('Financing activity'), '</option>
+ <option value="4"', ($_POST['CashFlowsActivity'] == 4 ? ' selected="selected"' : ''), '>', _('Cash or cash equivalent'), '</option>
+ </select>
+ </td>
+ </tr>
+
+
+ </table>';
+
+ echo '
<br />
<div class="centre">
<input type="submit" name="submit" value="'. _('Enter Information') . '" />
</div>
- </div>
</form>';
} //end if record deleted no point displaying form to add record
@@ -268,41 +310,45 @@
echo '<br />
<table class="selection">
<tr>
- <th class="ascending">' . _('Account Code') . '</th>
- <th class="ascending">' . _('Account Name') . '</th>
- <th class="ascending">' . _('Account Group') . '</th>
- <th class="ascending">' . _('P/L or B/S') . '</th>
- <th colspan="2"> </th>
+ <th class="ascending">', _('Account Code'), '</th>
+ <th class="ascending">', _('Account Name'), '</th>
+ <th class="ascending">', _('Account Group'), '</th>
+ <th class="ascending">', _('P/L or B/S'), '</th>
+ <th class="ascending">', _('Cash Flows Activity'), '</th>
+ <th class="noprint" colspan="2"> </th>
</tr>';
- $Sql = "SELECT accountcode,
- accountname,
- group_,
- CASE WHEN pandl=0 THEN '" . _('Balance Sheet') . "' ELSE '" . _('Profit/Loss') . "' END AS acttype
- FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
- ORDER BY chartmaster.accountcode";
+ $Sql = "SELECT
+ accountcode,
+ accountname,
+ group_,
+ CASE WHEN pandl=0 THEN '" . _('Balance Sheet') . "' ELSE '" . _('Profit/Loss') . "' END AS acttype,
+ cashflowsactivity
+ FROM chartmaster, accountgroups
+ WHERE chartmaster.group_=accountgroups.groupname
+ ORDER BY chartmaster.accountcode";
$ErrMsg = _('The chart accounts could not be retrieved because');
$Result = DB_query($Sql, $ErrMsg);
- $k = 0;// Row colour counter.
- while($MyRow = DB_fetch_row($Result)) {
+ $k = 1;// Row colour counter.
+ foreach($Result as $MyRow) {
if($k == 1) {
- echo '<tr class="EvenTableRows">';
+ echo '<tr class="OddTableRows">';
$k = 0;
} else {
- echo '<tr class="OddTableRows">';
+ echo '<tr class="EvenTableRows">';
$k = 1;
}
- echo '<td>', $MyRow[0], '</td>
- <td>', htmlspecialchars($MyRow[1], ENT_QUOTES, 'UTF-8'), '</td>
- <td>', $MyRow[2], '</td>
- <td>', $MyRow[3], '</td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedAccount=', $MyRow[0], '">', _('Edit'), '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedAccount=', $MyRow[0], '&delete=1" onclick="return confirm(\'', _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.'), '\');">', _('Delete'), '</a></td>
+ echo '<td class="text">', $MyRow['accountcode'], '</td>
+ <td class="text">', htmlspecialchars($MyRow['accountname'], ENT_QUOTES, 'UTF-8'), '</td>
+ <td class="text">', $MyRow['group_'], '</td>
+ <td class="text">', $MyRow['acttype'], '</td>
+ <td class="text">', CashFlowsActivityName($MyRow['cashflowsactivity']), '</td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedAccount=', $MyRow['accountcode'], '">', _('Edit'), '</a></td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedAccount=', $MyRow['accountcode'], '&delete=1" onclick="return confirm(\'', _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.'), '\');">', _('Delete'), '</a></td>
</tr>';
- }// END WHILE LIST LOOP.
+ }// END foreach($Result as $MyRow).
+
echo '</table>';
} //END IF selected ACCOUNT
Added: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php (rev 0)
+++ trunk/GLCashFlowsIndirect.php 2016-11-18 00:22:26 UTC (rev 7668)
@@ -0,0 +1,840 @@
+<?php
+/* $Id: GLCashFlowsIndirect.php 1 2014-03-12 10:42:50Z rchacon $ */
+/* Shows a statement of cash flows for the period using the indirect method. */
+/* This program is under the GNU General Public License, last version. Rafael E. Chacón, 2016-10-08. */
+/* This creative work is under the CC BY-NC-SA, later version. Rafael E. Chacón, 2016-10-08. */
+
+// Notes:
+// Coding Conventions/Style: http://www.weberp.org/CodingConventions.html
+// Info about a statement of cash flows using the indirect method: IAS 7 - Statement of Cash Flows.
+
+// BEGIN: Functions division ---------------------------------------------------
+function CashFlowsActivityName($Activity) {
+ // Converts the cash flow activity number to an activity text.
+ switch($Activity) {
+ case -1: return _('Without setting up');
+ case 0: return _('No effect on cash flow');
+ case 1: return _('Operating activities');
+ case 2: return _('Investing activities');
+ case 3: return _('Financing activities');
+ case 4: return _('Cash or cash equivalent');
+ default: return _('Unknown');
+ }
+}
+function colDebitCredit($Amount) {
+ // Function to display in debit or Credit columns in a HTML table.
+ if($Amount < 0) {
+ return '<td class="number">' . locale_number_format($Amount, $_SESSION['CompanyRecord']['decimalplaces']) . '</td><td> </td>';// Outflow.
+ } else {
+ return '<td> </td><td class="number">' . locale_number_format($Amount, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>';// Inflow.
+ }
+}
+// END: Functions division -----------------------------------------------------
+
+// BEGIN: Procedure division ---------------------------------------------------
+include('includes/session.inc');
+$Title = _('Statement of Cash Flows, Indirect Method');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLCashFlowsIndirect';
+include('includes/header.inc');
+
+// Merges gets into posts:
+if(isset($_GET['PeriodFrom'])) {// Select period from.
+ $_POST['PeriodFrom'] = $_GET['PeriodFrom'];
+}
+if(isset($_GET['PeriodTo'])) {// Select period to.
+ $_POST['PeriodTo'] = $_GET['PeriodTo'];
+}
+if(isset($_GET['ShowBudget'])) {// Show the budget for the period.
+ $_POST['ShowBudget'] = $_GET['ShowBudget'];
+}
+if(isset($_GET['ShowZeroBalance'])) {// Show accounts with zero balance.
+ $_POST['ShowZeroBalance'] = $_GET['ShowZeroBalance'];
+}
+if(isset($_GET['ShowCash'])) {// Show cash and cash equivalents accounts.
+ $_POST['ShowCash'] = $_GET['ShowCash'];
+}
+
+// Validates the data submitted in the form:
+if($_POST['PeriodFrom'] > $_POST['PeriodTo']) {
+ // The beginning is after the end.
+ unset($_POST['PeriodFrom']);
+ unset($_POST['PeriodTo']);
+ prnMsg(_('The beginning of the period should be before or equal to the end of the period. Please reselect the reporting period.'), 'error');
+}
+if($_POST['PeriodTo']-$_POST['PeriodFrom']+1 > 12) {
+ // The reporting period is greater then 12 months.
+ unset($_POST['PeriodFrom']);
+ unset($_POST['PeriodTo']);
+ prnMsg(_('The period should be 12 months or less in duration. Please select an alternative period range.'), 'error');
+}
+
+// Main code:
+if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo']) AND !isset($_POST['SelectADifferentPeriod'])) {// If all parameters are set and valid, generates the report:
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/reports.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '<br />', // Page title, reporting statement.
+ stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />'; // Page title, reporting entity.
+ $PeriodFromName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodFrom']));
+ $PeriodToName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodTo']));
+ echo _('From'), ' ', MonthAndYearFromSQLDate($PeriodFromName['lastdate_in_period']), ' ', _('to'), ' ', MonthAndYearFromSQLDate($PeriodToName['lastdate_in_period']), '<br />'; // Page title, reporting period.
+ include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
+ echo '<table class="selection">',
+ // Content of the header and footer of the output table:
+ '<thead>
+ <tr>
+ <th>', _('Account'), '</th>
+ <th>', _('Account Name'), '</th>
+ <th colspan="2">', _('Period Actual'), '</th>';
+ // Initialise section accumulators:
+ $ActualSection = 0;
+ $ActualTotal = 0;
+ $LastSection = 0;
+ $LastTotal = 0;
+ $k = 1;// Lines counter.
+ // Gets the net profit for the period GL account:
+ if(!isset($_SESSION['PeriodProfitAccount'])) {
+ $_SESSION['PeriodProfitAccount'] = '';
+ $MyRow = DB_fetch_array(DB_query("SELECT confvalue FROM `config` WHERE confname ='PeriodProfitAccount'"));
+ if($MyRow) {
+ $_SESSION['PeriodProfitAccount'] = $MyRow['confvalue'];
+ }
+ }
+ // Gets the retained earnings GL account:
+ if(!isset($_SESSION['RetainedEarningsAccount'])) {
+ $_SESSION['RetainedEarningsAccount'] = '';
+/* $MyRow = DB_fetch_array(DB_query("SELECT confvalue FROM `config` WHERE confname ='RetainedEarningsAccount'"));*/
+ $MyRow = DB_fetch_array(DB_query("SELECT retainedearnings FROM companies WHERE coycode = 1"));
+ if($MyRow) {
+ $_SESSION['RetainedEarningsAccount'] = $MyRow['confvalue'];
+ }
+ }
+ include('includes/GLPostings.inc');// Posts pending GL transactions.
+ // Outputs the table:
+ if($_POST['ShowBudget']) {// Parameters: PeriodFrom, PeriodTo, ShowBudget=on, ShowZeroBalance=on/off, ShowCash=on/off.
+ // BEGIN Outputs the table with budget.
+ // Code maintenance note: To update 'Outputs the table withOUT budget', copy 'Outputs the table with budget' and remove lines with 'budget'.
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>>
+ echo '<th colspan="2">', _('Period Budget'), '</th>',
+ '<th colspan="2">', _('Last Year'), '</th>
+ </tr>
+ </thead><tfoot>
+ <tr>',
+ '<td class="text" colspan="8">',// Prints an explanation of signs in actual and relative changes:
+ '<br /><b>', _('Notes'), ':</b><br />',
+ _('Cash flows signs: a negative number indicates a cash flow used in activities; a positive number indicates a cash flow provided by activities.'), '<br />';
+ if($_POST['ShowCash']) {
+ echo _('Cash and cash equivalents signs: a negative number indicates a cash outflow; a positive number indicates a cash inflow.'), '<br />';
+ }
+ echo '</td>
+ </tr>
+ </tfoot><tbody>';
+ // Net profit − dividends = Retained earnings:
+ echo '<tr>
+ <td class="text" colspan="8"><br /><h2>', _('Net profit and dividends'), '</h2></td>
+ </tr>
+ <tr class="OddTableRows">
+ <td> </td>
+ <td class="text">', _('Net profit for the period'), '</td>';
+ // Net profit for the period:
+ $Sql = "SELECT
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN -chartdetails.actual ELSE 0 END) AS ActualProfit,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN -chartdetails.budget ELSE 0 END) AS BudgetProfit,
+ Sum(CASE WHEN (chartdetails.period >= '" . ($_POST['PeriodFrom']-12) . "' AND chartdetails.period <= '" . ($_POST['PeriodTo']-12) . "') THEN -chartdetails.actual ELSE 0 END) AS LastProfit
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=1";
+ $MyRow1 = DB_fetch_array(DB_query($Sql));
+ echo colDebitCredit($MyRow1['ActualProfit']),
+ colDebitCredit($MyRow1['BudgetProfit']),
+ colDebitCredit($MyRow1['LastProfit']),
+ '</tr>
+ <tr class="EvenTableRows">
+ <td> </td>
+ <td class="text">', _('Dividends'), '</td>';
+ // Dividends:
+ $Sql = "SELECT
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN chartdetails.actual ELSE 0 END) AS ActualRetained,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN chartdetails.budget ELSE 0 END) AS BudgetRetained,
+ Sum(CASE WHEN (chartdetails.period >= '" . ($_POST['PeriodFrom']-12) . "' AND chartdetails.period <= '" . ($_POST['PeriodTo']-12) . "') THEN chartdetails.actual ELSE 0 END) AS LastRetained
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0
+ AND chartdetails.accountcode!='" . $_SESSION['PeriodProfitAccount'] . "'
+ AND chartdetails.accountcode!='" . $_SESSION['RetainedEarningsAccount'] . "'";// Gets retained earnings by the complement method to include differences. The complement method: Changes(retained earnings) = -Changes(other accounts).
+ $MyRow2 = DB_fetch_array(DB_query($Sql));
+ echo colDebitCredit($MyRow2['ActualRetained'] - $MyRow1['ActualProfit']),
+ colDebitCredit($MyRow2['BudgetRetained'] - $MyRow1['BudgetProfit']),
+ colDebitCredit($MyRow2['LastRetained'] - $MyRow1['LastProfit']),
+ '</tr><tr>',
+ '<td class="text" colspan="2">', _('Retained earnings'), '</td>',
+ // Retained earnings changes:
+ colDebitCredit($MyRow2['ActualRetained']),
+ colDebitCredit($MyRow2['BudgetRetained']),
+ colDebitCredit($MyRow2['LastRetained']),
+ '</tr>';
+ $ActualTotal += $MyRow2['ActualRetained'];
+ $BudgetTotal += $MyRow2['BudgetRetained'];
+ $LastTotal += $MyRow2['LastRetained'];
+ // Cash flows sections:
+ $BudgetSection = 0;
+ $BudgetTotal = 0;
+ $Sql = "SELECT
+ chartmaster.cashflowsactivity,
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN -chartdetails.actual ELSE 0 END) AS ActualAmount,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN -chartdetails.budget ELSE 0 END) AS BudgetAmount,
+ Sum(CASE WHEN (chartdetails.period >= '" . ($_POST['PeriodFrom']-12) . "' AND chartdetails.period <= '" . ($_POST['PeriodTo']-12) . "') THEN -chartdetails.actual ELSE 0 END) AS LastAmount
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0 AND chartmaster.cashflowsactivity!=4
+ GROUP BY
+ chartdetails.accountcode
+ ORDER BY
+ chartmaster.cashflowsactivity,
+ chartdetails.accountcode";
+ $Result = DB_query($Sql);
+ $IdSection = -1;
+ // Looks for an account without setting up:
+ $NeedSetup = FALSE;
+ foreach($Result as $MyRow) {
+ if($MyRow['cashflowsactivity'] == -1) {
+ $NeedSetup = TRUE;
+ echo '<tr><td colspan="8"> </td></tr>';
+ break;
+ }
+ }
+ foreach($Result as $MyRow) {
+ if($IdSection <> $MyRow['cashflowsactivity']) {
+ // Prints section total:
+ echo '<tr>
+ <td class="text" colspan="2">', CashFlowsActivityName($IdSection), '</td>',
+ colDebitCredit($ActualSection),
+ colDebitCredit($BudgetSection),
+ colDebitCredit($LastSection),
+ '</tr>';
+ // Resets section totals:
+ $ActualSection = 0;
+ $BudgetSection = 0;
+ $LastSection = 0;
+ $IdSection = $MyRow['cashflowsactivity'];
+ // Prints next section title:
+ echo '<tr>
+ <td class="text" colspan="8"><br /><h2>', CashFlowsActivityName($IdSection), '</h2></td>
+ </tr>';
+ }
+ if($MyRow['ActualAmount']<>0
+ OR $MyRow['BudgetAmount']<>0
+ OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k = 1;
+ }
+ echo '<td class="text"><a href="', $RootPath, '/GLAccountInquiry.php?FromPeriod=', $_POST['PeriodFrom'], '&ToPeriod=', $_POST['PeriodTo'], '&Account=', $MyRow['accountcode'], '">', $MyRow['accountcode'], '</a></td>',
+ '<td class="text">', $MyRow['accountname'], '</td>',
+ colDebitCredit($MyRow['ActualAmount']),
+ colDebitCredit($MyRow['BudgetAmount']),
+ colDebitCredit($MyRow['LastAmount']),
+ '</tr>';
+ $ActualSection += $MyRow['ActualAmount'];
+ $ActualTotal += $MyRow['ActualAmount'];
+ $BudgetSection += $MyRow['BudgetAmount'];
+ $BudgetTotal += $MyRow['BudgetAmount'];
+ $LastSection += $MyRow['LastAmount'];
+ $LastTotal += $MyRow['LastAmount'];
+ }
+ }
+ // Prints the last section total:
+ echo '<tr>
+ <td class="text" colspan="2">', CashFlowsActivityName($IdSection), '</td>',
+ colDebitCredit($ActualSection),
+ colDebitCredit($BudgetSection),
+ colDebitCredit($LastSection),
+ '</tr>
+ <tr><td colspan="8"> </td></tr>',
+ // Prints Net increase in cash and cash equivalents:
+ '<tr>
+ <td class="text" colspan="2"><b>', _('Net increase in cash and cash equivalents'), '</b></td>',
+ colDebitCredit($ActualTotal),
+ colDebitCredit($BudgetTotal),
+ colDebitCredit($LastTotal),
+ '</tr>';
+ // Prints Cash and cash equivalents at beginning of period:
+ if($_POST['ShowCash']) {
+ // Prints a detail of Cash and cash equivalents at beginning of period (Parameters: PeriodFrom, PeriodTo, ShowBudget=on, ShowZeroBalance=on/off, ShowCash=ON):
+ echo '<tr><td colspan="8"> </td></tr>';
+ $ActualBeginning = 0;
+ $BudgetBeginning = 0;
+ $LastBeginning = 0;
+ $Sql = "SELECT
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ Sum(CASE WHEN (chartdetails.period = '" . $_POST['PeriodFrom'] . "') THEN chartdetails.bfwd ELSE 0 END) AS ActualAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . $_POST['PeriodFrom'] . "') THEN chartdetails.bfwdbudget ELSE 0 END) AS BudgetAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . ($_POST['PeriodFrom']-12) . "') THEN chartdetails.bfwd ELSE 0 END) AS LastAmount
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0 AND chartmaster.cashflowsactivity=4
+ GROUP BY chartdetails.accountcode
+ ORDER BY chartdetails.accountcode";
+ $Result = DB_query($Sql);
+ foreach($Result as $MyRow) {
+ if($MyRow['ActualAmount']<>0
+ OR $MyRow['BudgetAmount']<>0
+ OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k = 1;
+ }
+ echo '<td class="text"><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['PeriodFrom'], '&Account=', $MyRow['accountcode'], '">', $MyRow['accountcode'], '</a></td>',
+ '<td class="text">', $MyRow['accountname'], '</td>',
+ colDebitCredit($MyRow['ActualAmount']),
+ colDebitCredit($MyRow['BudgetAmount']),
+ colDebitCredit($MyRow['LastAmount']),
+ '</tr>';
+ $ActualBeginning += $MyRow['ActualAmount'];
+ $BudgetBeginning += $MyRow['BudgetAmount'];
+ $LastBeginning += $MyRow['LastAmount'];
+ }
+ }
+ } else {
+ // Prints a summary of Cash and cash equivalents at beginning of period (Parameters: PeriodFrom, PeriodTo, ShowBudget=on, ShowZeroBalance=on/off, ShowCash=OFF):
+ $Sql = "SELECT
+ Sum(CASE WHEN (chartdetails.period = '" . $_POST['PeriodFrom'] . "') THEN chartdetails.bfwd ELSE 0 END) AS ActualAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . $_POST['PeriodFrom'] . "') THEN chartdetails.bfwdbudget ELSE 0 END) AS BudgetAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . ($_POST['PeriodFrom']-12) . "') THEN chartdetails.bfwd ELSE 0 END) AS LastAmount
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0 AND chartmaster.cashflowsactivity=4";
+ $Result = DB_query($Sql);
+ $MyRow = DB_fetch_array($Result);
+ $ActualBeginning = $MyRow['ActualAmount'];
+ $BudgetBeginning = $MyRow['BudgetAmount'];
+ $LastBeginning = $MyRow['LastAmount'];
+ }
+ echo '<tr>
+ <td class="text" colspan="2"><b>', _('Cash and cash equivalents at beginning of period'), '</b></td>',
+ colDebitCredit($ActualBeginning),
+ colDebitCredit($BudgetBeginning),
+ colDebitCredit($LastBeginning),
+ '</tr>';
+ // Prints Cash and cash equivalents at end of period:
+ if($_POST['ShowCash']) {
+ // Prints a detail of Cash and cash equivalents at end of period (Parameters: PeriodFrom, PeriodTo, ShowBudget=on, ShowZeroBalance=on/off, ShowCash=ON):
+ echo '<tr><td colspan="8"> </td></tr>';
+ $Sql = "SELECT
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ Sum(CASE WHEN (chartdetails.period = '" . ($_POST['PeriodTo']+1) . "') THEN chartdetails.bfwd ELSE 0 END) AS ActualAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . ($_POST['PeriodTo']+1) . "') THEN chartdetails.bfwdbudget ELSE 0 END) AS BudgetAmount,
+ Sum(CASE WHEN (chartdetails.period = '" . ($_POST['PeriodTo']-11) . "') THEN chartdetails.bfwd ELSE 0 END) AS LastAmount
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0 AND chartmaster.cashflowsactivity=4
+ GROUP BY chartdetails.accountcode
+ ORDER BY chartdetails.accountcode";
+ $Result = DB_query($Sql);
+ foreach($Result as $MyRow) {
+ if($MyRow['ActualAmount']<>0
+ OR $MyRow['BudgetAmount']<>0
+ OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k = 1;
+ }
+ echo '<td class="text"><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['PeriodTo'], '&Account=', $MyRow['accountcode'], '">', $MyRow['accountcode'], '</a></td>',
+ '<td class="text">', $MyRow['accountname'], '</td>',
+ colDebitCredit($MyRow['ActualAmount']),
+ colDebitCredit($MyRow['BudgetAmount']),
+ colDebitCredit($MyRow['LastAmount']),
+ '</tr>';
+ }
+ }
+ }
+ // Prints Cash and cash equivalents at end of period total:
+ echo '<tr>
+ <td class="text" colspan="2"><b>', _('Cash and cash equivalents at end of period'), '</b></td>',
+ colDebitCredit($ActualTotal+$ActualBeginning),
+ colDebitCredit($BudgetTotal+$BudgetBeginning),
+ colDebitCredit($LastTotal+$LastBeginning),
+ '</tr>';
+ // Prints 'Cash or cash equivalent' section if selected (Parameters: PeriodFrom, PeriodTo, ShowBudget=on, ShowZeroBalance=on/off, ShowCash=ON):
+ if($_POST['ShowCash']) {
+ // Prints 'Cash or cash equivalent' section title:
+ echo '<tr><td colspan="8"> </td><tr>
+ <tr>
+ <td class="text" colspan="8"><br /><h2>', CashFlowsActivityName(4), '</h2></td>
+ </tr>';
+ // Initialise 'Cash or cash equivalent' section accumulators:
+ $ActualCash = 0;
+ $BudgetCash = 0;
+ $LastCash = 0;
+ $Sql = "SELECT
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN chartdetails.actual ELSE 0 END) AS ActualAmount,
+ Sum(CASE WHEN (chartdetails.period >= '" . $_POST['PeriodFrom'] . "' AND chartdetails.period <= '" . $_POST['PeriodTo'] . "') THEN chartdetails.budget ELSE 0 END) AS BudgetAmount,
+ Sum(CASE WHEN (chartdetails.period >= '" . ($_POST['PeriodFrom']-12) . "' AND chartdetails.period <= '" . ($_POST['PeriodTo']-12) . "') THEN chartdetails.actual ELSE 0 END) AS LastAmount
+ FROM chartmaster
+ INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
+ INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=0 AND chartmaster.cashflowsactivity=4
+ GROUP BY chartdetails.accountcode
+ ORDER BY
+ chartdetails.accountcode";
+ $Result = DB_query($Sql);
+ foreach($Result as $MyRow) {
+ if($MyRow['ActualAmount']<>0
+ OR $MyR...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-18 01:46:14
|
Revision: 7670
http://sourceforge.net/p/web-erp/reponame/7670
Author: rchacon
Date: 2016-11-18 01:46:09 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Updates help text.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/GLCashFlowsIndirect.php 2016-11-18 01:46:09 UTC (rev 7670)
@@ -747,8 +747,8 @@
$Title, '</p>';// Page title.
if(!isset($page_help) OR $page_help) {// If it is not set the $page_help parameter OR it is TRUE, shows the page help text:
echo '<div class="page_help_text">',
- _('The statement of cash flows, also known as cash flow statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
- _('The purpose of the statement of cash flows is to show whether the company generated and used cash during the period being reported.'), '<br />',
+ _('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
+ _('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
_('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, 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>';
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-11-18 01:46:09 UTC (rev 7670)
@@ -348,11 +348,12 @@
<p>The purpose of the statement of changes in equity is to show the changes in a company's retained earnings during the period being reported.</p>
<p>The changes in equity report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all profit and loss accounts grouped by account group.</p>
</li>
-
+<!-- ----------------------------------------------------------------------- -->
<li>
<h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
- <p>The purpose of the statement of cash flows, also known as the successor of the old source and application of funds statement, is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
- <p>The statement of cash flows reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
+
+ <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
+ <p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
ViewTopic=GeneralLedger#GLCashFlowsSetup">GLCashFlowsSetup</a>).</p>
<p>It can be generated using either direct method or indirect method. The main difference between them is the cash flows from operating activities, the first section of the statement of cash flows; there is no difference in the investing and financing activities sections.</p>
<h4><a id="GLCashFlowsDirect">Statement of Cash Flows using Direct Method</a></h4>
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -14189,16 +14189,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2015-11-12 20:40+0200\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -14207,16 +14207,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2013-06-01 11:20-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -14584,16 +14584,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2015-02-24 18:41-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -15050,16 +15050,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2013-06-01 11:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -15039,16 +15039,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2016-11-18 01:46:09 UTC (rev 7670)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -13436,11 +13436,11 @@
msgstr ""
#: GLCashFlowsIndirect.php:750
-msgid "The statement of cash flows, also known as cash flow statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities."
+msgid "The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
-msgid "The purpose of the statement of cash flows is to show whether the company generated and used cash during the period being reported."
+msgid "The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
"PO-Revision-Date: 2016-05-28 12:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
@@ -14208,16 +14208,17 @@
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
#: GLCashFlowsIndirect.php:752
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 18:42-0600\n"
-"PO-Revision-Date: 2016-11-07 08:06-0600\n"
+"POT-Creation-Date: 2016-11-17 19:39-0600\n"
+"PO-Revision-Date: 2016-11-17 19:44-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -14567,31 +14567,31 @@
#: GLAccounts.php:9 GLCashFlowsIndirect.php:15
msgid "Without setting up"
-msgstr ""
+msgstr "Sin configurar"
#: GLAccounts.php:10 GLAccounts.php:282 GLCashFlowsIndirect.php:16
msgid "No effect on cash flow"
-msgstr ""
+msgstr "Sin efecto sobre el flujo de caja"
#: GLAccounts.php:11 GLAccounts.php:283
msgid "Operating activity"
-msgstr ""
+msgstr "Actividad operativa"
#: GLAccounts.php:12 GLAccounts.php:284
msgid "Investing activity"
-msgstr ""
+msgstr "Actividad de inversión"
#: GLAccounts.php:13 GLAccounts.php:285
msgid "Financing activity"
-msgstr ""
+msgstr "Actividad de financiamiento"
#: GLAccounts.php:14 GLAccounts.php:286 GLCashFlowsIndirect.php:20
msgid "Cash or cash equivalent"
-msgstr ""
+msgstr "Efectivo o equivalente en efectivo"
#: GLAccounts.php:15 GLCashFlowsIndirect.php:21
msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
#: GLAccounts.php:22
msgid "General Ledger Accounts"
@@ -14755,7 +14755,7 @@
#: GLAccounts.php:280 GLAccounts.php:317
msgid "Cash Flows Activity"
-msgstr ""
+msgstr "Actividad de flujos de efectivo"
#: GLAccounts.php:316
msgid "P/L or B/S"
@@ -14941,31 +14941,35 @@
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
-msgstr ""
+msgstr "Actividades de explotación"
#: GLCashFlowsIndirect.php:18
msgid "Investing activities"
-msgstr ""
+msgstr "Actividades de inversión"
#: GLCashFlowsIndirect.php:19
msgid "Financing activities"
-msgstr ""
+msgstr "Actividades de financiamiento"
#: GLCashFlowsIndirect.php:36
msgid "Statement of Cash Flows, Indirect Method"
-msgstr ""
+msgstr "Estado de flujos de efectivo, método indirecto"
#: GLCashFlowsIndirect.php:63
msgid ""
"The beginning of the period should be before or equal to the end of the "
"period. Please reselect the reporting period."
msgstr ""
+"El inicio del período debe ser anterior o igual al final del período. "
+"Seleccione nuevamente el período del informe."
#: GLCashFlowsIndirect.php:69
msgid ""
"The period should be 12 months or less in duration. Please select an "
"alternative period range."
msgstr ""
+"El período debe ser de 12 meses o menos de duración. Seleccione un intervalo "
+"alternativo de período."
#: GLCashFlowsIndirect.php:90 GLProfit_Loss.php:637 GLProfit_Loss.php:644
#: GLTagProfit_Loss.php:539 GLTagProfit_Loss.php:544 GLTrialBalance.php:456
@@ -14987,58 +14991,72 @@
"Cash flows signs: a negative number indicates a cash flow used in "
"activities; a positive number indicates a cash flow provided by activities."
msgstr ""
+"Signos de flujos de efectivo: un número negativo indica un flujo de efectivo "
+"usado en actividades; un número positivo indica un flujo de efectivo "
+"proporcionado por las actividades."
#: GLCashFlowsIndirect.php:129 GLCashFlowsIndirect.php:448
msgid ""
"Cash and cash equivalents signs: a negative number indicates a cash outflow; "
"a positive number indicates a cash inflow."
msgstr ""
+"Signos de efectivo y equivalentes de efectivo: un número negativo indica una "
+"salida de efectivo; un número positivo indica una entrada de efectivo."
#: GLCashFlowsIndirect.php:136 GLCashFlowsIndirect.php:455
msgid "Net profit and dividends"
-msgstr ""
+msgstr "Utilidad neta y dividendos"
#: GLCashFlowsIndirect.php:140 GLCashFlowsIndirect.php:459
msgid "Net profit for the period"
-msgstr ""
+msgstr "Utilidad neta del período"
#: GLCashFlowsIndirect.php:157 GLCashFlowsIndirect.php:474
msgid "Dividends"
-msgstr ""
+msgstr "Dividendos"
#: GLCashFlowsIndirect.php:174 GLCashFlowsIndirect.php:489
msgid "Retained earnings"
-msgstr ""
+msgstr "Ganancias retenidas"
#: GLCashFlowsIndirect.php:266 GLCashFlowsIndirect.php:569
msgid "Net increase in cash and cash equivalents"
-msgstr ""
+msgstr "Aumento neto en efectivo y equivalentes de efectivo"
#: GLCashFlowsIndirect.php:330 GLCashFlowsIndirect.php:625
msgid "Cash and cash equivalents at beginning of period"
-msgstr ""
+msgstr "Efectivo y equivalentes de efectivo al inicio del período"
#: GLCashFlowsIndirect.php:374 GLCashFlowsIndirect.php:665
msgid "Cash and cash equivalents at end of period"
-msgstr ""
+msgstr "Efectivo y equivalentes de efectivo al final del período"
#: GLCashFlowsIndirect.php:734
msgid "Run Setup"
-msgstr ""
+msgstr "Ejecutar la instalación"
#: GLCashFlowsIndirect.php:750
msgid ""
-"The statement of cash flows, also known as cash flow statement, reports how "
-"changes in balance sheet accounts and income affect cash and cash "
-"equivalents, and breaks the analysis down to operating, investing and "
-"financing activities."
+"The statement of cash flows, also known as the successor of the old source "
+"and application of funds statement, reports how changes in balance sheet "
+"accounts and income affect cash and cash equivalents, and breaks the "
+"analysis down to operating, investing and financing activities."
msgstr ""
+"El estado de flujos de efectivo, también conocido como el sucesor de la "
+"antiguo origen y aplicación de fondos, informa cómo los cambios en las "
+"cuentas del balance y los ingresos afectan el efectivo y equivalentes de "
+"efectivo, y divide el análisis en actividades de explotación, de inversión "
+"yde financiamiento."
#: GLCashFlowsIndirect.php:751
msgid ""
-"The purpose of the statement of cash flows is to show whether the company "
-"generated and used cash during the period being reported."
+"The purpose of the statement of cash flows is to show where the company got "
+"their money from and how it was spent during the period being reported for a "
+"user selectable range of periods."
msgstr ""
+"El propósito del estado de flujos de efectivo es mostrar de dónde la empresa "
+"obtuvo su dinero y cómo se gastó durante el período que se informa para un "
+"rando de períodos seleccionables por el usuario."
#: GLCashFlowsIndirect.php:752
msgid ""
@@ -15056,111 +15074,115 @@
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
-msgstr ""
+msgstr "Seleccione el inicio del periodo del informe"
#: GLCashFlowsIndirect.php:812
msgid "Select the end of the reporting period"
-msgstr ""
+msgstr "Seleccione el final del periodo del informe"
#: GLCashFlowsIndirect.php:817
msgid "Show the budget for the period"
-msgstr ""
+msgstr "Muestrar el presupuesto para el período"
#: GLCashFlowsIndirect.php:819
msgid "Check this box to show the budget for the period"
-msgstr ""
+msgstr "Marcar esta casilla para mostrar el presupuesto del período"
#: GLCashFlowsIndirect.php:824
msgid "Show accounts with zero balance"
-msgstr ""
+msgstr "Mostrar cuentas con saldo cero"
#: GLCashFlowsIndirect.php:826
msgid "Check this box to show all accounts including those with zero balance"
msgstr ""
+"Marcar esta casilla para mostrar todas las cuentas, incluidas aquellas con "
+"saldo cero"
#: GLCashFlowsIndirect.php:831
msgid "Show cash and cash equivalents accounts"
-msgstr ""
+msgstr "Mostrar cuentas de efectivo y equivalentes de efectivo"
#: GLCashFlowsIndirect.php:833
msgid "Check this box to show cash and cash equivalents accounts"
msgstr ""
+"Marcar esta casilla para mostrar las cuentas de efectivo y equivalentes de "
+"efectivo"
#: GLCashFlowsSetup.php:7
msgid "Cash Flows Activities Maintenance"
-msgstr ""
+msgstr "Mantenimiento de las actividades de flujos de efectivo "
#: GLCashFlowsSetup.php:29 GLCashFlowsSetup.php:39 GLCashFlowsSetup.php:48
msgid "Can not update chartmaster.cashflowsactivity because"
-msgstr ""
+msgstr "No se pudo actualizar chartmaster.cashflowsactivity porque"
#: GLCashFlowsSetup.php:32
msgid "The net profit of the period GL account was updated"
-msgstr ""
+msgstr "Se actualizó la cuenta contable de la utilidad neta del período"
#: GLCashFlowsSetup.php:42
msgid "The retained earnings GL account was updated"
-msgstr ""
+msgstr "Se actualizó la cuenta contable de ganancias retenidas"
#: GLCashFlowsSetup.php:51
msgid "The cash flow activity was reset in all accounts"
-msgstr ""
+msgstr "La actividad de flujo de efectivo se restableció en todas las cuentas"
#: GLCashFlowsSetup.php:65
msgid "Cash"
-msgstr ""
+msgstr "Caja"
#: GLCashFlowsSetup.php:71
msgid "Investment"
-msgstr ""
+msgstr "Inversión"
#: GLCashFlowsSetup.php:74
msgid "Commission"
-msgstr ""
+msgstr "Comisión"
#: GLCashFlowsSetup.php:77
msgid "Share"
-msgstr ""
+msgstr "Acción"
#: GLCashFlowsSetup.php:80
msgid "Dividend"
-msgstr ""
+msgstr "Dividendo"
#: GLCashFlowsSetup.php:83
msgid "Interest"
-msgs...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-18 03:24:21
|
Revision: 7671
http://sourceforge.net/p/web-erp/reponame/7671
Author: rchacon
Date: 2016-11-18 03:24:18 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Translates to Spanish and French.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-11-18 01:46:09 UTC (rev 7670)
+++ trunk/GLCashFlowsIndirect.php 2016-11-18 03:24:18 UTC (rev 7671)
@@ -762,7 +762,7 @@
// Content of the header and footer of the input table:
'<thead>
<tr>
- <th colspan="2">',('Report parameters'), '</th>
+ <th colspan="2">', _('Report parameters'), '</th>
</tr>
</thead><tfoot>
<tr>
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-11-18 01:46:09 UTC (rev 7670)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-11-18 03:24:18 UTC (rev 7671)
@@ -350,8 +350,7 @@
</li>
<!-- ----------------------------------------------------------------------- -->
<li>
- <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
-
+ <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
<p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
<p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
ViewTopic=GeneralLedger#GLCashFlowsSetup">GLCashFlowsSetup</a>).</p>
@@ -373,7 +372,7 @@
<p><b>Note 2</b>. The "<i>dividends</i>" are calculated as "<i>net profit for the period</i>" minus "<i>retained earnings</i>". The "<i>retained earnings</i>" are calculated using the complement method; that is: the changes of retained earnings are equal to the opposite of changes in other <i>statement of financial position</i> accounts. This is done to correct the impact of the "<i>net profit for the period</i>" underreporting before the end of that period; so, if you have differences between dividents in this report and the real dividend payments, check retained earnings related accounts.</p>
<p><b>Warning!</b> Although the standard states that "<i>Net profit for the period</i>", "<i>Dividends</i>", and "<i>No effect on cash flow</i>" are part of section "<i>Operating activities</i>", in this report they are shown separately to cover those accountants that use that practice.</p>
</li>
-
+<!-- ----------------------------------------------------------------------- -->
<li>
<h3><a id="AnalysisHorizontal">Horizontal analysis</a></h3>
<p>The horizontal analysis, also known as trend analysis, is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.</p>
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 03:24:18 UTC (rev 7671)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-17 19:39-0600\n"
-"PO-Revision-Date: 2016-11-17 19:44-0600\n"
+"PO-Revision-Date: 2016-11-17 21:19-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15064,6 +15064,9 @@
"the statement of financial position, which represents a single moment in "
"time."
msgstr ""
+"El estado de flujos de efectivo representa un período de tiempo. Esto "
+"contrasta con el estado de situación, que representa un solo momento en el "
+"tiempo."
#: GLCashFlowsIndirect.php:753
msgid ""
@@ -15071,6 +15074,10 @@
"systems include items when they are invoiced to the customer, and when "
"expenses are owed based on the supplier invoice date."
msgstr ""
+"webERP es un sistema basado en \"devengados\" (no un sistema basado en \"caja"
+"\"). Los sistemas en valores devengados incluyen los artículos cuando se "
+"facturan al cliente y cuando los gastos se adeudan en función de la fecha de "
+"factura del proveedor."
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
@@ -15194,7 +15201,7 @@
#: GLCashFlowsSetup.php:130
msgid "Can not update chartmaster.cashflowsactivity. Error code:"
-msgstr ""
+msgstr "No se puede actualizar chartmaster.cashflowsactivity. Código de error:"
#: GLCashFlowsSetup.php:135
msgid "The cash flow activity was updated in some accounts"
@@ -15206,20 +15213,26 @@
"partitioned into three sections: operating activities, investing activities "
"and financing activities."
msgstr ""
+"El estado de flujos de efectivo, utilizando métodos directos e indirectos, "
+"se divide en tres secciones: actividades de explotación, actividades de "
+"inversión y actividades de financiamiento."
#: GLCashFlowsSetup.php:154
msgid ""
"You must classify all accounts in any of those three sections of the cash "
"flow statement, or as no effect on cash flow, or as cash or cash equivalent."
msgstr ""
+"Debe clasificar todas las cuentas en cualquiera de esas tres secciones del "
+"estado de flujo de efectivo, o como sin efecto en el flujo de efectivo, o "
+"como efectivo o equivalente en efectivo."
#: GLCashFlowsSetup.php:166
msgid "Action to do"
-msgstr ""
+msgstr "Acción a hacer"
#: GLCashFlowsSetup.php:175
msgid "Reset values"
-msgstr ""
+msgstr "Restablecer valores"
#: GLCashFlowsSetup.php:176 SupplierCredit.php:530 SupplierCredit.php:533
#: SupplierInvoice.php:882 SupplierInvoice.php:885 SystemParameters.php:552
@@ -15230,7 +15243,7 @@
#: GLCashFlowsSetup.php:177
msgid "Automatic setup"
-msgstr ""
+msgstr "Configuración automática"
#: GLCashFlowsSetup.php:178 includes/header.inc:77 includes/header.inc:81
msgid "Manual"
@@ -15238,23 +15251,23 @@
#: GLCashFlowsSetup.php:179
msgid "Manual setup"
-msgstr ""
+msgstr "Configuración manual"
#: GLCashFlowsSetup.php:194
msgid "Net profit for the period GL account"
-msgstr ""
+msgstr "Cuenta contable para la utilidad neta del período"
#: GLCashFlowsSetup.php:209
msgid "GL account to post the net profit for the period"
-msgstr ""
+msgstr "Cuenta contable para registrar la utilidad neta del período"
#: GLCashFlowsSetup.php:214
msgid "Retained earnings GL account"
-msgstr ""
+msgstr "Cuenta contable de utlidades retenidas"
#: GLCashFlowsSetup.php:230
msgid "GL account to post the retained earnings"
-msgstr ""
+msgstr "Cuenta contable para registrar las utilidades retenidas"
#: GLCodesInquiry.php:7
msgid "GL Codes Inquiry"
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-18 03:24:18 UTC (rev 7671)
@@ -9,15 +9,15 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-17 19:39-0600\n"
-"PO-Revision-Date: 2015-09-14 09:56-0600\n"
-"Last-Translator: Rafael Chacon <raf...@gm...>\n"
+"PO-Revision-Date: 2016-11-17 20:29-0600\n"
+"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: s;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
"X-Launchpad-Export-Date: 2011-03-31 06:25+0000\n"
"X-Poedit-SourceCharset: UTF-8\n"
@@ -14674,27 +14674,27 @@
#: GLAccounts.php:10 GLAccounts.php:282 GLCashFlowsIndirect.php:16
msgid "No effect on cash flow"
-msgstr ""
+msgstr "Sans effet sur les flux de trésorerie"
#: GLAccounts.php:11 GLAccounts.php:283
msgid "Operating activity"
-msgstr ""
+msgstr "Activité d’exploitation"
#: GLAccounts.php:12 GLAccounts.php:284
msgid "Investing activity"
-msgstr ""
+msgstr "Activité d’investissement"
#: GLAccounts.php:13 GLAccounts.php:285
msgid "Financing activity"
-msgstr ""
+msgstr "Activité de financement"
#: GLAccounts.php:14 GLAccounts.php:286 GLCashFlowsIndirect.php:20
msgid "Cash or cash equivalent"
-msgstr ""
+msgstr "Trésorerie et des équivalents de trésorerie"
#: GLAccounts.php:15 GLCashFlowsIndirect.php:21
msgid "Unknown"
-msgstr ""
+msgstr "Inconnu"
#: GLAccounts.php:22
msgid "General Ledger Accounts"
@@ -14848,7 +14848,7 @@
#: GLAccounts.php:280 GLAccounts.php:317
msgid "Cash Flows Activity"
-msgstr ""
+msgstr "Activité de flux de trésorerie"
#: GLAccounts.php:316
msgid "P/L or B/S"
@@ -14940,7 +14940,7 @@
#: GLBalanceSheet.php:399
msgid "Statement of Financial Position"
-msgstr ""
+msgstr "Etat de la situation financière"
#: GLBalanceSheet.php:413 GLBalanceSheet.php:419 GLCashFlowsIndirect.php:121
#: GLCashFlowsIndirect.php:440 GLProfit_Loss.php:639 GLProfit_Loss.php:646
@@ -15031,31 +15031,34 @@
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
-msgstr ""
+msgstr "Activités opérationnelles"
#: GLCashFlowsIndirect.php:18
msgid "Investing activities"
-msgstr ""
+msgstr "Activités d'investissement"
#: GLCashFlowsIndirect.php:19
msgid "Financing activities"
-msgstr ""
+msgstr "activités de financement"
#: GLCashFlowsIndirect.php:36
msgid "Statement of Cash Flows, Indirect Method"
-msgstr ""
+msgstr "Etat des flux de trésorerie, méthode indirecte"
#: GLCashFlowsIndirect.php:63
msgid ""
"The beginning of the period should be before or equal to the end of the "
"period. Please reselect the reporting period."
msgstr ""
+"Le début de la période doit être antérieur ou égal à la fin de la période. "
+"Veuillez resélectionner la période de déclaration."
#: GLCashFlowsIndirect.php:69
msgid ""
"The period should be 12 months or less in duration. Please select an "
"alternative period range."
msgstr ""
+"La période doit être de 12 mois ou moins. Veuillez choisir une autre période."
#: GLCashFlowsIndirect.php:90 GLProfit_Loss.php:637 GLProfit_Loss.php:644
#: GLTagProfit_Loss.php:539 GLTagProfit_Loss.php:544 GLTrialBalance.php:456
@@ -15077,40 +15080,45 @@
"Cash flows signs: a negative number indicates a cash flow used in "
"activities; a positive number indicates a cash flow provided by activities."
msgstr ""
+"Signes des flux de trésorerie: un nombre négatif indique un flux de "
+"trésorerie utilisé dans les activités; un nombre positif indique un flux de "
+"trésorerie fourni par les activités."
#: GLCashFlowsIndirect.php:129 GLCashFlowsIndirect.php:448
msgid ""
"Cash and cash equivalents signs: a negative number indicates a cash outflow; "
"a positive number indicates a cash inflow."
msgstr ""
+"Signes de trésorerie et équivalents de trésorerie: un nombre négatif indique "
+"une sortie de trésorerie; Un nombre positif indique une entrée de trésorerie."
#: GLCashFlowsIndirect.php:136 GLCashFlowsIndirect.php:455
msgid "Net profit and dividends"
-msgstr ""
+msgstr "Résultat net et dividendes"
#: GLCashFlowsIndirect.php:140 GLCashFlowsIndirect.php:459
msgid "Net profit for the period"
-msgstr ""
+msgstr "Résultat net de la période"
#: GLCashFlowsIndirect.php:157 GLCashFlowsIndirect.php:474
msgid "Dividends"
-msgstr ""
+msgstr "Dividendes"
#: GLCashFlowsIndirect.php:174 GLCashFlowsIndirect.php:489
msgid "Retained earnings"
-msgstr ""
+msgstr "Réserves comptables"
#: GLCashFlowsIndirect.php:266 GLCashFlowsIndirect.php:569
msgid "Net increase in cash and cash equivalents"
-msgstr ""
+msgstr "Augmentation nette de la trésorerie et des équivalents de trésorerie"
#: GLCashFlowsIndirect.php:330 GLCashFlowsIndirect.php:625
msgid "Cash and cash equivalents at beginning of period"
-msgstr ""
+msgstr "Trésorerie et équivalents de trésorerie au début de la période"
#: GLCashFlowsIndirect.php:374 GLCashFlowsIndirect.php:665
msgid "Cash and cash equivalents at end of period"
-msgstr ""
+msgstr "Trésorerie et équivalents de trésorerie à la fin de la période"
#: GLCashFlowsIndirect.php:734
msgid "Run Setup"
@@ -15130,6 +15138,9 @@
"their money from and how it was spent during the period being reported for a "
"user selectable range of periods."
msgstr ""
+"L'objet de l'état des flux de trésorerie est de montrer d'où l'entreprise a "
+"obtenu de l'argent et comment il a été dépensé au cours de la période qui "
+"est signalé pour une gamme de périodes sélectionnables par l'utilisateur."
#: GLCashFlowsIndirect.php:752
msgid ""
@@ -15147,35 +15158,39 @@
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
-msgstr ""
+msgstr "Sélectionner le début de la période de rapport"
#: GLCashFlowsIndirect.php:812
msgid "Select the end of the reporting period"
-msgstr ""
+msgstr "Sélectionner la fin de la période de rapport"
#: GLCashFlowsIndirect.php:817
msgid "Show the budget for the period"
-msgstr ""
+msgstr "Montrer le budget de la période"
#: GLCashFlowsIndirect.php:819
msgid "Check this box to show the budget for the period"
-msgstr ""
+msgstr "Cocher cette case pour afficher le budget de la période"
#: GLCashFlowsIndirect.php:824
msgid "Show accounts with zero balance"
-msgstr ""
+msgstr "Afficher les comptes avec solde nul"
#: GLCashFlowsIndirect.php:826
msgid "Check this box to show all accounts including those with zero balance"
msgstr ""
+"Cocher cette case pour afficher tous les comptes, y compris ceux dont le "
+"solde est nul"
#: GLCashFlowsIndirect.php:831
msgid "Show cash and cash equivalents accounts"
-msgstr ""
+msgstr "Afficher les comptes de trésorerie et d'équivalents de trésorerie"
#: GLCashFlowsIndirect.php:833
msgid "Check this box to show cash and cash equivalents accounts"
msgstr ""
+"Cocher cette case pour afficher les comptes de trésorerie et d'équivalents "
+"de trésorerie"
#: GLCashFlowsSetup.php:7
msgid "Cash Flows Activities Maintenance"
@@ -15215,11 +15230,11 @@
#: GLCashFlowsSetup.php:80
msgid "Dividend"
-msgstr ""
+msgstr "Dividende"
#: GLCashFlowsSetup.php:83
msgid "Interest"
-msgstr ""
+msgstr "Intérêt"
#: GLCashFlowsSetup.php:86
msgid "Loan"
@@ -15227,23 +15242,23 @@
#: GLCashFlowsSetup.php:89
msgid "Building"
-msgstr ""
+msgstr "Bâtiment"
#: GLCashFlowsSetup.php:92
msgid "Equipment"
-msgstr ""
+msgstr "Équipement"
#: GLCashFlowsSetup.php:95
msgid "Land"
-msgstr ""
+msgstr "Terrain"
#: GLCashFlowsSetup.php:98
msgid "Vehicle"
-msgstr ""
+msgstr "Véhicule"
#: GLCashFlowsSetup.php:101
msgid "Sale"
-msgstr ""
+msgstr "Vente"
#: GLCashFlowsSetup.php:107
msgid "Receivable"
@@ -15259,7 +15274,7 @@
#: GLCashFlowsSetup.php:119
msgid "Amortisation"
-msgstr ""
+msgstr "Amortissement"
#: GLCashFlowsSetup.php:130
msgid "Can not update chartmaster.cashflowsactivity. Error code:"
@@ -15284,11 +15299,11 @@
#: GLCashFlowsSetup.php:166
msgid "Action to do"
-msgstr ""
+msgstr "Action à faire"
#: GLCashFlowsSetup.php:175
msgid "Reset values"
-msgstr ""
+msgstr "Réinitialiser les valeurs"
#: GLCashFlowsSetup.php:176 SupplierCredit.php:530 SupplierCredit.php:533
#: SupplierInvoice.php:882 SupplierInvoice.php:885 SystemParameters.php:552
@@ -15299,7 +15314,7 @@
#: GLCashFlowsSetup.php:177
msgid "Automatic setup"
-msgstr ""
+msgstr "Configuration automatique"
# JDN pb: même terme utilisé à différents endroits sans avoir le mm sens.
# rapport de bug en cours
@@ -15309,7 +15324,7 @@
#: GLCashFlowsSetup.php:179
msgid "Manual setup"
-msgstr ""
+msgstr "Configuration manuelle"
#: GLCashFlowsSetup.php:194
msgid "Net profit for the period GL account"
|
|
From: <rc...@us...> - 2016-11-18 04:44:02
|
Revision: 7672
http://sourceforge.net/p/web-erp/reponame/7672
Author: rchacon
Date: 2016-11-18 04:43:59 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Update translation.
Modified Paths:
--------------
trunk/GLCashFlowsSetup.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php 2016-11-18 03:24:18 UTC (rev 7671)
+++ trunk/GLCashFlowsSetup.php 2016-11-18 04:43:59 UTC (rev 7672)
@@ -125,7 +125,7 @@
foreach ($Criterion as $Criteria) {
$Sql = "UPDATE `chartmaster`
SET `cashflowsactivity`=". $Criteria['CashFlowsActivity'] . "
- WHERE `accountname` LIKE '%". _($Criteria['AccountLike']) . "%'
+ WHERE `accountname` LIKE '%". addslashes(_($Criteria['AccountLike'])) . "%'
AND `cashflowsactivity`=-1";// Uses cashflowsactivity=-1 to NOT overwrite.
$ErrMsg = _('Can not update chartmaster.cashflowsactivity. Error code:');
$Result = DB_query($Sql, $ErrMsg);
@@ -169,13 +169,13 @@
<tr>
<td colspan="2">',
'<div class="centre">',
- '<button name="Action" type="submit" value="', _('Update'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="Action" type="submit" value="Update"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/tick.svg" /> ', _('Update'), '</button>', // "Update" button.
- '<button name="Action" type="submit" value="', _('Reset'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="Action" type="submit" value="Reset"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/cross.svg" /> ', _('Reset values'), '</button>', // "Reset values" button.
- '<button name="Action" type="submit" value="', _('Automatic'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="Action" type="submit" value="Automatic"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/next.svg" /> ', _('Automatic setup'), '</button>', // "Automatic setup" button.
- '<button name="Action" type="submit" value="', _('Manual'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="Action" type="submit" value="Manual"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/previous.svg" /> ', _('Manual setup'), '</button>', // "Manual setup" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 03:24:18 UTC (rev 7671)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-18 04:43:59 UTC (rev 7672)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-17 19:39-0600\n"
-"PO-Revision-Date: 2016-11-17 21:19-0600\n"
+"PO-Revision-Date: 2016-11-17 21:34-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -14575,7 +14575,7 @@
#: GLAccounts.php:11 GLAccounts.php:283
msgid "Operating activity"
-msgstr "Actividad operativa"
+msgstr "Actividad de explotación"
#: GLAccounts.php:12 GLAccounts.php:284
msgid "Investing activity"
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-18 03:24:18 UTC (rev 7671)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-18 04:43:59 UTC (rev 7672)
@@ -9,7 +9,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-17 19:39-0600\n"
-"PO-Revision-Date: 2016-11-17 20:29-0600\n"
+"PO-Revision-Date: 2016-11-17 22:24-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -1504,11 +1504,11 @@
#: AnalysisHorizontalIncome.php:43 GLCashFlowsIndirect.php:782
msgid "Select period from"
-msgstr ""
+msgstr "Sélectionner la période de"
#: AnalysisHorizontalIncome.php:79 GLCashFlowsIndirect.php:803
msgid "Select period to"
-msgstr ""
+msgstr "Sélectionner la période à"
#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:63
msgid "Detail or summary"
@@ -1558,7 +1558,7 @@
#: SecurityTokens.php:156 UserGLAccounts.php:259
#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
-msgstr ""
+msgstr "Retour"
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147 GLProfit_Loss.php:577
#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
@@ -1684,7 +1684,6 @@
msgid "total"
msgstr "Total"
-# JDN
#: AnalysisHorizontalIncome.php:312 AnalysisHorizontalIncome.php:481
#: Contracts.php:949 GLProfit_Loss.php:324 GLProfit_Loss.php:517
#: GLProfit_Loss.php:831 GLProfit_Loss.php:1188 GLTagProfit_Loss.php:310
@@ -1703,7 +1702,7 @@
#: AnalysisHorizontalIncome.php:501
msgid "Net Profit"
-msgstr ""
+msgstr "Résultat net"
#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:358
#: BOMs.php:919 CustWhereAlloc.php:199 DailyBankTransactions.php:252
@@ -1711,7 +1710,7 @@
#: GLProfit_Loss.php:1313 GLTrialBalance.php:736 SuppWhereAlloc.php:197
#: UserGLAccounts.php:254
msgid "Print This"
-msgstr ""
+msgstr "Imprimer ceci"
#: AnalysisHorizontalIncome.php:519 AnalysisHorizontalIncome.php:520
#: AnalysisHorizontalPosition.php:359 AnalysisHorizontalPosition.php:360
@@ -14690,7 +14689,7 @@
#: GLAccounts.php:14 GLAccounts.php:286 GLCashFlowsIndirect.php:20
msgid "Cash or cash equivalent"
-msgstr "Trésorerie et des équivalents de trésorerie"
+msgstr "Trésorerie et équivalents de trésorerie"
#: GLAccounts.php:15 GLCashFlowsIndirect.php:21
msgid "Unknown"
@@ -15031,7 +15030,7 @@
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
-msgstr "Activités opérationnelles"
+msgstr "Activités d'exploitation"
#: GLCashFlowsIndirect.php:18
msgid "Investing activities"
@@ -15039,11 +15038,11 @@
#: GLCashFlowsIndirect.php:19
msgid "Financing activities"
-msgstr "activités de financement"
+msgstr "Activités de financement"
#: GLCashFlowsIndirect.php:36
msgid "Statement of Cash Flows, Indirect Method"
-msgstr "Etat des flux de trésorerie, méthode indirecte"
+msgstr "État des flux de trésorerie, méthode indirecte"
#: GLCashFlowsIndirect.php:63
msgid ""
@@ -15073,7 +15072,7 @@
#: includes/PDFTagProfitAndLossPageHeader.inc:36
#: includes/PDFTrialBalancePageHeader.inc:33
msgid "Period Budget"
-msgstr "Budget pour la Période"
+msgstr "Budget pour la période"
#: GLCashFlowsIndirect.php:127 GLCashFlowsIndirect.php:446
msgid ""
@@ -15090,7 +15089,7 @@
"a positive number indicates a cash inflow."
msgstr ""
"Signes de trésorerie et équivalents de trésorerie: un nombre négatif indique "
-"une sortie de trésorerie; Un nombre positif indique une entrée de trésorerie."
+"une sortie de trésorerie; un nombre positif indique une entrée de trésorerie."
#: GLCashFlowsIndirect.php:136 GLCashFlowsIndirect.php:455
msgid "Net profit and dividends"
@@ -15110,7 +15109,7 @@
#: GLCashFlowsIndirect.php:266 GLCashFlowsIndirect.php:569
msgid "Net increase in cash and cash equivalents"
-msgstr "Augmentation nette de la trésorerie et des équivalents de trésorerie"
+msgstr "Augmentation nette de trésorerie et équivalents de trésorerie"
#: GLCashFlowsIndirect.php:330 GLCashFlowsIndirect.php:625
msgid "Cash and cash equivalents at beginning of period"
@@ -15122,7 +15121,7 @@
#: GLCashFlowsIndirect.php:734
msgid "Run Setup"
-msgstr ""
+msgstr "Lancer l'installation"
#: GLCashFlowsIndirect.php:750
msgid ""
@@ -15148,6 +15147,9 @@
"the statement of financial position, which represents a single moment in "
"time."
msgstr ""
+"L'état des flux de trésorerie représente une période de temps. Cela "
+"contraste avec l'état de la situation financière, qui représente un moment "
+"unique dans le temps."
#: GLCashFlowsIndirect.php:753
msgid ""
@@ -15194,7 +15196,7 @@
#: GLCashFlowsSetup.php:7
msgid "Cash Flows Activities Maintenance"
-msgstr ""
+msgstr "Gestion des activités de flux de trésorerie"
#: GLCashFlowsSetup.php:29 GLCashFlowsSetup.php:39 GLCashFlowsSetup.php:48
msgid "Can not update chartmaster.cashflowsactivity because"
@@ -15290,12 +15292,18 @@
"partitioned into three sections: operating activities, investing activities "
"and financing activities."
msgstr ""
+"L'état des flux de trésorerie, en utilisant des méthodes directes et "
+"indirectes, est divisé en trois sections: activités d'exploitation, "
+"activités d'investissement et activités de financement."
#: GLCashFlowsSetup.php:154
msgid ""
"You must classify all accounts in any of those three sections of the cash "
"flow statement, or as no effect on cash flow, or as cash or cash equivalent."
msgstr ""
+"Vous devez classer tous les comptes dans l'une de ces trois sections de "
+"l'état des flux de trésorerie, ou comme sans effet sur le flux de "
+"trésorerie, ou en trésorerie et équivalents de trésorerie."
#: GLCashFlowsSetup.php:166
msgid "Action to do"
@@ -15328,19 +15336,19 @@
#: GLCashFlowsSetup.php:194
msgid "Net profit for the period GL account"
-msgstr ""
+msgstr "Compte GL pour le résultat net de la période"
#: GLCashFlowsSetup.php:209
msgid "GL account to post the net profit for the period"
-msgstr ""
+msgstr "Compte GL pour comptabiliser le résultat net de la période"
#: GLCashFlowsSetup.php:214
msgid "Retained earnings GL account"
-msgstr ""
+msgstr "Compte GL pour les réserves comptables"
#: GLCashFlowsSetup.php:230
msgid "GL account to post the retained earnings"
-msgstr ""
+msgstr "Compte GL pour comptabiliser les réserves comptables"
#: GLCodesInquiry.php:7
msgid "GL Codes Inquiry"
@@ -15590,11 +15598,11 @@
#: GLProfit_Loss.php:620
msgid "Statement of Comprehensive Income"
-msgstr ""
+msgstr "État du résultat global"
#: GLProfit_Loss.php:621 includes/MainMenuLinksArray.php:377
msgid "Profit and Loss Statement"
-msgstr ""
+msgstr "État du résultat global"
#: GLProfit_Loss.php:912
#, php-format
@@ -51177,7 +51185,7 @@
#: includes/MainMenuLinksArray.php:378
msgid "Statement of Cash Flows"
-msgstr ""
+msgstr "État des flux de trésorerie"
#: includes/MainMenuLinksArray.php:381
msgid "Tag Reports"
|
|
From: <rc...@us...> - 2016-11-20 22:56:21
|
Revision: 7673
http://sourceforge.net/p/web-erp/reponame/7673
Author: rchacon
Date: 2016-11-20 22:56:18 +0000 (Sun, 20 Nov 2016)
Log Message:
-----------
Fix hardcoded label (difficult to translate for languages with a different structure to English), do sortable the users list, replace printf() with plain list echo, and add format class.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
trunk/WWW_Users.php
trunk/doc/Change.log
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-11-18 04:43:59 UTC (rev 7672)
+++ trunk/GLCashFlowsIndirect.php 2016-11-20 22:56:18 UTC (rev 7673)
@@ -1,5 +1,5 @@
<?php
-/* $Id: GLCashFlowsIndirect.php 1 2014-03-12 10:42:50Z rchacon $ */
+/* $Id: GLCashFlowsIndirect.php 7672 2016-11-17 10:42:50Z rchacon $ */
/* Shows a statement of cash flows for the period using the indirect method. */
/* This program is under the GNU General Public License, last version. Rafael E. Chacón, 2016-10-08. */
/* This creative work is under the CC BY-NC-SA, later version. Rafael E. Chacón, 2016-10-08. */
@@ -783,7 +783,7 @@
<td><select id="PeriodFrom" name="PeriodFrom" required="required">';
$Periods = DB_query('SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno ASC');
if(!isset($_POST['PeriodFrom'])) {
- $BeginMonth =($_SESSION['YearEnd']==12 ? 1 : $_SESSION['YearEnd']+1);// Sets January as the month that follows December.
+ $BeginMonth = ($_SESSION['YearEnd']==12 ? 1 : $_SESSION['YearEnd']+1);// Sets January as the month that follows December.
if($BeginMonth <= date('n')) {// It is a month in the current year.
$BeginDate = mktime(0, 0, 0, $BeginMonth, 1, date('Y'));
} else {// It is a month in the previous year.
Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php 2016-11-18 04:43:59 UTC (rev 7672)
+++ trunk/GLCashFlowsSetup.php 2016-11-20 22:56:18 UTC (rev 7673)
@@ -1,5 +1,5 @@
<?php
-/* $Id: GLCashFlowsSetup.php 7332 2015-08-14 03:27:51Z rchacon $*/
+/* $Id: GLCashFlowsSetup.php 7672 2016-11-17 03:27:51Z rchacon $ */
/* Classifies accounts in any of the three sections of statement of cash flows to assign each account to an activity */
// BEGIN: Procedure division ---------------------------------------------------
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2016-11-18 04:43:59 UTC (rev 7672)
+++ trunk/WWW_Users.php 2016-11-20 22:56:18 UTC (rev 7673)
@@ -1,43 +1,58 @@
<?php
/* $Id$*/
+/* Entry of users and security settings of users */
-if (isset($_POST['UserID']) AND isset($_POST['ID'])){
- if ($_POST['UserID'] == $_POST['ID']) {
+if(isset($_POST['UserID']) AND isset($_POST['ID'])) {
+ if($_POST['UserID'] == $_POST['ID']) {
$_POST['Language'] = $_POST['UserLanguage'];
}
}
+
include('includes/session.inc');
+$Title = _('Users Maintenance');
+$ViewTopic = 'GettingStarted';
+$BookMark = 'UserMaintenance';
+include('includes/header.inc');
-$ModuleList = array(_('Orders'),
- _('Receivables'),
- _('Purchasing'),
- _('Payables'),
- _('Inventory'),
- _('Manufacturing'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'),
- _('Utilities'));
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/group_add.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+echo '<br />';// Extra line after page_title_text.
+$ModuleList = array(
+ _('Sales'),
+ _('Receivables'),
+ _('Purchases'),
+ _('Payables'),
+ _('Inventory'),
+ _('Manufacturing'),
+ _('General Ledger'),
+ _('Asset Manager'),
+ _('Petty Cash'),
+ _('Setup'),
+ _('Utilities'));
+
+$ModuleListLabel = array(
+ _('Display Sales module'),
+ _('Display Receivables module'),
+ _('Display Purchases module'),
+ _('Display Payables module'),
+ _('Display Inventory module'),
+ _('Display Manufacturing module'),
+ _('Display General Ledger module'),
+ _('Display Asset Manager module'),
+ _('Display Petty Cash module'),
+ _('Display Setup module'),
+ _('Display Utilities module'));
+
$PDFLanguages = array(_('Latin Western Languages'),
_('Eastern European Russian Japanese Korean Vietnamese Hebrew Arabic Thai'),
_('Chinese'),
_('Free Serif'));
-$Title = _('Users Maintenance');// Screen identificator.
-$ViewTopic= 'GettingStarted';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'UserMaintenance';// Anchor's id in the manual's html document.
-include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/group_add.png" title="' .// Title icon.
- _('Search') . '" />' .// Icon title.
- $Title . '</p>';// Page title.
-
include('includes/SQL_CommonFunctions.inc');
-echo '<br />';// Extra line after page_title_text.
-
// Make an array of the security roles
$sql = "SELECT secroleid,
secrolename
@@ -52,13 +67,13 @@
}
DB_free_result($Sec_Result);
-if (isset($_GET['SelectedUser'])){
+if(isset($_GET['SelectedUser'])) {
$SelectedUser = $_GET['SelectedUser'];
-} elseif (isset($_POST['SelectedUser'])){
+} elseif(isset($_POST['SelectedUser'])) {
$SelectedUser = $_POST['SelectedUser'];
}
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
$InputError = 0;
@@ -67,39 +82,39 @@
ie the page has called itself with some user input */
//first off validate inputs sensible
- if (mb_strlen($_POST['UserID'])<4){
+ if(mb_strlen($_POST['UserID'])<4) {
$InputError = 1;
prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
- } elseif (ContainsIlLegalCharacters($_POST['UserID'])) {
+ } elseif(ContainsIlLegalCharacters($_POST['UserID'])) {
$InputError = 1;
prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
- } elseif (mb_strlen($_POST['Password'])<5){
- if (!$SelectedUser){
+ } elseif(mb_strlen($_POST['Password'])<5) {
+ if(!$SelectedUser) {
$InputError = 1;
prnMsg(_('The password entered must be at least 5 characters long'),'error');
}
- } elseif (mb_strstr($_POST['Password'],$_POST['UserID'])!= False){
+ } elseif(mb_strstr($_POST['Password'],$_POST['UserID'])!= False) {
$InputError = 1;
prnMsg(_('The password cannot contain the user id'),'error');
- } elseif ((mb_strlen($_POST['Cust'])>0)
+ } elseif((mb_strlen($_POST['Cust'])>0)
AND (mb_strlen($_POST['BranchCode'])==0)) {
$InputError = 1;
prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
- } elseif ($AllowDemoMode AND $_POST['UserID'] == 'admin') {
+ } elseif($AllowDemoMode AND $_POST['UserID'] == 'admin') {
prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
$InputError = 1;
}
- if (!isset($SelectedUser)){
+ if(!isset($SelectedUser)) {
/* check to ensure the user id is not already entered */
$result = DB_query("SELECT userid FROM www_users WHERE userid='" . $_POST['UserID'] . "'");
- if (DB_num_rows($result)==1){
+ if(DB_num_rows($result)==1) {
$InputError =1;
prnMsg(_('The user ID') . ' ' . $_POST['UserID'] . ' ' . _('already exists and cannot be used again'),'error');
}
}
- if ((mb_strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
+ if((mb_strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
// check that the entered branch is valid for the customer code
$sql = "SELECT custbranch.debtorno
FROM custbranch
@@ -110,7 +125,7 @@
$DbgMsg = _('The SQL that was used to check the customer code and branch was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
prnMsg(_('The entered Branch Code is not valid for the entered Customer Code'),'error');
$InputError = 1;
}
@@ -119,26 +134,26 @@
/* Make a comma separated list of modules allowed ready to update the database*/
$i=0;
$ModulesAllowed = '';
- while ($i < count($ModuleList)){
+ while($i < count($ModuleList)) {
$FormVbl = 'Module_' . $i;
$ModulesAllowed .= $_POST[($FormVbl)] . ',';
$i++;
}
$_POST['ModulesAllowed']= $ModulesAllowed;
- if (isset($SelectedUser) AND $InputError !=1) {
+ if(isset($SelectedUser) AND $InputError !=1) {
/*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- if (!isset($_POST['Cust'])
+ if(!isset($_POST['Cust'])
OR $_POST['Cust']==NULL
- OR $_POST['Cust']==''){
+ OR $_POST['Cust']=='') {
$_POST['Cust']='';
$_POST['BranchCode']='';
}
$UpdatePassword = '';
- if ($_POST['Password'] != ''){
+ if($_POST['Password'] != '') {
$UpdatePassword = "password='" . CryptPass($_POST['Password']) . "',";
}
@@ -164,7 +179,7 @@
WHERE userid = '". $SelectedUser . "'";
prnMsg( _('The selected user record has been updated'), 'success' );
- } elseif ($InputError !=1) {
+ } elseif($InputError !=1) {
$sql = "INSERT INTO www_users (userid,
realname,
@@ -205,7 +220,7 @@
'" . $_POST['PDFLanguage'] . "',
'" . $_POST['Department'] . "')";
prnMsg( _('A new user record has been inserted'), 'success' );
-
+
$LocationSql = "INSERT INTO locationusers (loccode,
userid,
canview,
@@ -220,18 +235,18 @@
$DbgMsg = _('The SQL that was used to create the user locations and failed was');
$Result = DB_query($LocationSql, $ErrMsg, $DbgMsg);
prnMsg( _('User has been authorized to use and update only his / her default location'), 'success' );
-
+
$GLAccountsSql = "INSERT INTO glaccountusers (userid, accountcode, canview, canupd)
SELECT '" . $_POST['UserID'] . "', chartmaster.accountcode,1,1
FROM chartmaster; ";
-
+
$ErrMsg = _('The default user GL Accounts could not be processed because');
$DbgMsg = _('The SQL that was used to create the user GL Accounts and failed was');
$Result = DB_query($GLAccountsSql, $ErrMsg, $DbgMsg);
prnMsg( _('User has been authorized to use and update all GL accounts'), 'success' );
}
- if ($InputError!=1){
+ if($InputError!=1) {
//run the SQL from either of the above possibilites
$ErrMsg = _('The user alterations could not be processed because');
$DbgMsg = _('The SQL that was used to update the user and failed was');
@@ -260,16 +275,16 @@
unset($SelectedUser);
}
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
- if ($AllowDemoMode AND $SelectedUser == 'admin') {
+ if($AllowDemoMode AND $SelectedUser == 'admin') {
prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
} else {
$sql="SELECT userid FROM audittrail where userid='" . $SelectedUser ."'";
$result=DB_query($sql);
- if (DB_num_rows($result)!=0) {
+ if(DB_num_rows($result)!=0) {
prnMsg(_('Cannot delete user as entries already exist in the audit trail'), 'warn');
} else {
$sql="DELETE FROM locationusers WHERE userid='" . $SelectedUser . "'";
@@ -294,11 +309,29 @@
}
-if (!isset($SelectedUser)) {
+if(!isset($SelectedUser)) {
/* If its the first time the page has been displayed with no parameters then none of the above are true and the list of Users will be displayed with links to delete or edit each. These will call the same page again and allow update/input or deletion of the records*/
- $sql = "SELECT userid,
+ echo '<table class="selection">
+ <tr>
+ <th class="ascending">', _('User Login'), '</th>
+ <th class="ascending">', _('Full Name'), '</th>
+ <th class="ascending">', _('Telephone'), '</th>
+ <th class="ascending">', _('Email'), '</th>
+ <th class="ascending">', _('Customer Code'), '</th>
+ <th class="ascending">', _('Branch Code'), '</th>
+ <th class="ascending">', _('Supplier Code'), '</th>
+ <th class="ascending">', _('Salesperson'), '</th>
+ <th class="ascending">', _('Last Visit'), '</th>
+ <th class="ascending">', _('Security Role'), '</th>
+ <th class="ascending">', _('Report Size'), '</th>
+ <th class="ascending">', _('Theme'), '</th>
+ <th class="ascending">', _('Language'), '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>';
+
+ $Sql = "SELECT userid,
realname,
phone,
email,
@@ -313,85 +346,46 @@
theme,
language
FROM www_users";
- $result = DB_query($sql);
+ $Result = DB_query($Sql);
- echo '<table class="selection">';
- echo '<tr><th>' . _('User Login') . '</th>
- <th>' . _('Full Name') . '</th>
- <th>' . _('Telephone') . '</th>
- <th>' . _('Email') . '</th>
- <th>' . _('Customer Code') . '</th>
- <th>' . _('Branch Code') . '</th>
- <th>' . _('Supplier Code') . '</th>
- <th>' . _('Salesperson') . '</th>
- <th>' . _('Last Visit') . '</th>
- <th>' . _('Security Role') . '</th>
- <th>' . _('Report Size') . '</th>
- <th>' . _('Theme') . '</th>
- <th>' . _('Language') . '</th>
- <th> </th>
- <th> </th>
- </tr>';
-
- $k=0; //row colour counter
-
- while ($myrow = DB_fetch_array($result)) {
- if ($k==1){
+ $k = 1;// Row colour counter.
+ foreach($Result as $MyRow) {
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 1;
+ }
+ if($MyRow[8] == '') {
+ $LastVisitDate = _('No login record');
} else {
- echo '<tr class="OddTableRows">';
- $k=1;
+ $LastVisitDate = ConvertSQLDate($MyRow[8]);
}
-
- if ($myrow[8]=='') {
- $LastVisitDate = _('No login record');
- } else {
- $LastVisitDate = ConvertSQLDate($myrow[8]);
- }
-
/*The SecurityHeadings array is defined in config.php */
-
- printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href="%s&SelectedUser=%s">' . _('Edit') . '</a></td>
- <td><a href="%s&SelectedUser=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this user?') . '\');">' . _('Delete') . '</a></td>
- </tr>',
- $myrow['userid'],
- $myrow['realname'],
- $myrow['phone'],
- $myrow['email'],
- $myrow['customerid'],
- $myrow['branchcode'],
- $myrow['supplierid'],
- $myrow['salesman'],
- $LastVisitDate,
- $SecurityRoles[($myrow['fullaccess'])],
- $myrow['pagesize'],
- $myrow['theme'],
- $LanguagesArray[$myrow['language']]['LanguageName'],
- htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
- $myrow['userid'],
- htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
- $myrow['userid']);
-
- } //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '<td class="text">', $MyRow['userid'], '</td>
+ <td class="text">', $MyRow['realname'], '</td>
+ <td class="text">', $MyRow['phone'], ' </td>
+ <td class="text">', $MyRow['email'], '</td>
+ <td class="text">', $MyRow['customerid'], '</td>
+ <td class="text">', $MyRow['branchcode'], '</td>
+ <td class="text">', $MyRow['supplierid'], '</td>
+ <td class="text">', $MyRow['salesman'], '</td>
+ <td class="centre">', $LastVisitDate, '</td>
+ <td class="text">', $SecurityRoles[($MyRow['fullaccess'])], '</td>
+ <td class="text">', $MyRow['pagesize'], '</td>
+ <td class="text">', $MyRow['theme'], '</td>
+ <td class="text">', $LanguagesArray[$MyRow['language']]['LanguageName'], '</td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedUser=', $MyRow['userid'], '">', _('Edit'), '</a></td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?', '&SelectedUser=', $MyRow['userid'], '&delete=1" onclick="return confirm(\'', _('Are you sure you wish to delete this user?'), '\');">', _('Delete'), '</a></td>
+ </tr>';
+ }// END foreach($Result as $MyRow).
+ echo '</table>
+ <br />';
} //end of ifs and buts!
-if (isset($SelectedUser)) {
+if(isset($SelectedUser)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Review Existing Users') . '</a></div><br />';
}
@@ -399,7 +393,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (isset($SelectedUser)) {
+if(isset($SelectedUser)) {
//editing an existing User
$sql = "SELECT userid,
@@ -469,11 +463,11 @@
/*set the default modules to show to all
this had trapped a few people previously*/
$i=0;
- if (!isset($_POST['ModulesAllowed'])) {
+ if(!isset($_POST['ModulesAllowed'])) {
$_POST['ModulesAllowed']='';
}
- foreach($ModuleList as $ModuleName){
- if ($i>0){
+ foreach($ModuleList as $ModuleName) {
+ if($i>0) {
$_POST['ModulesAllowed'] .=',';
}
$_POST['ModulesAllowed'] .= '1';
@@ -481,16 +475,16 @@
}
}
-if (!isset($_POST['Password'])) {
+if(!isset($_POST['Password'])) {
$_POST['Password']='';
}
-if (!isset($_POST['RealName'])) {
+if(!isset($_POST['RealName'])) {
$_POST['RealName']='';
}
-if (!isset($_POST['Phone'])) {
+if(!isset($_POST['Phone'])) {
$_POST['Phone']='';
}
-if (!isset($_POST['Email'])) {
+if(!isset($_POST['Email'])) {
$_POST['Email']='';
}
echo '<tr>
@@ -513,8 +507,8 @@
<td>' . _('Security Role') . ':</td>
<td><select name="Access">';
-foreach ($SecurityRoles as $SecKey => $SecVal) {
- if (isset($_POST['Access']) and $SecKey == $_POST['Access']){
+foreach($SecurityRoles as $SecKey => $SecVal) {
+ if(isset($_POST['Access']) and $SecKey == $_POST['Access']) {
echo '<option selected="selected" value="' . $SecKey . '">' . $SecVal . '</option>';
} else {
echo '<option value="' . $SecKey . '">' . $SecVal . '</option>';
@@ -529,7 +523,7 @@
<td>' . _('User Can Create Tenders') . ':</td>
<td><select name="CanCreateTender">';
-if ($_POST['CanCreateTender']==0){
+if($_POST['CanCreateTender']==0) {
echo '<option selected="selected" value="0">' . _('No') . '</option>';
echo '<option value="1">' . _('Yes') . '</option>';
} else {
@@ -545,8 +539,8 @@
$sql = "SELECT loccode, locationname FROM locations";
$result = DB_query($sql);
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['DefaultLocation']) AND $myrow['loccode'] == $_POST['DefaultLocation']){
+while($myrow=DB_fetch_array($result)) {
+ if(isset($_POST['DefaultLocation']) AND $myrow['loccode'] == $_POST['DefaultLocation']) {
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
@@ -556,13 +550,13 @@
echo '</select></td>
</tr>';
-if (!isset($_POST['Cust'])) {
+if(!isset($_POST['Cust'])) {
$_POST['Cust']='';
}
-if (!isset($_POST['BranchCode'])) {
+if(!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
-if (!isset($_POST['SupplierID'])) {
+if(!isset($_POST['SupplierID'])) {
$_POST['SupplierID']='';
}
echo '<tr>
@@ -586,14 +580,14 @@
$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1 ORDER BY salesmanname";
$result = DB_query($sql);
-if ((isset($_POST['Salesman']) AND $_POST['Salesman']=='') OR !isset($_POST['Salesman'])){
+if((isset($_POST['Salesman']) AND $_POST['Salesman']=='') OR !isset($_POST['Salesman'])) {
echo '<option selected="selected" value="">' . _('Not a salesperson only login') . '</option>';
} else {
echo '<option value="">' . _('Not a salesperson only login') . '</option>';
}
-while ($myrow=DB_fetch_array($result)){
+while($myrow=DB_fetch_array($result)) {
- if (isset($_POST['Salesman']) AND $myrow['salesmancode'] == $_POST['Salesman']){
+ if(isset($_POST['Salesman']) AND $myrow['salesmancode'] == $_POST['Salesman']) {
echo '<option selected="selected" value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
} else {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
@@ -608,42 +602,42 @@
<td>' . _('Reports Page Size') .':</td>
<td><select name="PageSize">';
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A4'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A4') {
echo '<option selected="selected" value="A4">' . _('A4') . '</option>';
} else {
echo '<option value="A4">' . _('A4') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3') {
echo '<option selected="selected" value="A3">' . _('A3') . '</option>';
} else {
echo '<option value="A3">' . _('A3') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3_Landscape'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3_Landscape') {
echo '<option selected="selected" value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
} else {
echo '<option value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter') {
echo '<option selected="selected" value="Letter">' . _('Letter') . '</option>';
} else {
echo '<option value="Letter">' . _('Letter') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter_Landscape'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter_Landscape') {
echo '<option selected="selected" value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
} else {
echo '<option value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal') {
echo '<option selected="selected" value="Legal">' . _('Legal') . '</option>';
} else {
echo '<option value="Legal">' . _('Legal') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal_Landscape'){
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal_Landscape') {
echo '<option selected="selected" value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
} else {
echo '<option value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
@@ -659,13 +653,13 @@
$ThemeDirectories = scandir('css/');
-foreach ($ThemeDirectories as $ThemeName) {
+foreach($ThemeDirectories as $ThemeName) {
- if (is_dir('css/' . $ThemeName) AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn'){
+ if(is_dir('css/' . $ThemeName) AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn') {
- if (isset($_POST['Theme']) AND $_POST['Theme'] == $ThemeName){
+ if(isset($_POST['Theme']) AND $_POST['Theme'] == $ThemeName) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) AND ($Theme==$ThemeName)) {
+ } else if(!isset($_POST['Theme']) AND ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
@@ -681,10 +675,10 @@
<td>' . _('Language') . ':</td>
<td><select required="required" name="UserLanguage">';
-foreach ($LanguagesArray as $LanguageEntry => $LanguageName){
- if (isset($_POST['UserLanguage']) AND $_POST['UserLanguage'] == $LanguageEntry){
+foreach($LanguagesArray as $LanguageEntry => $LanguageName) {
+ if(isset($_POST['UserLanguage']) AND $_POST['UserLanguage'] == $LanguageEntry) {
echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
- } elseif (!isset($_POST['UserLanguage']) AND $LanguageEntry == $DefaultLanguage) {
+ } elseif(!isset($_POST['UserLanguage']) AND $LanguageEntry == $DefaultLanguage) {
echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
} else {
echo '<option value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
@@ -695,47 +689,44 @@
/*Make an array out of the comma separated list of modules allowed*/
$ModulesAllowed = explode(',',$_POST['ModulesAllowed']);
-
-$i=0;
-foreach($ModuleList as $ModuleName){
-
+$i = 0;
+foreach($ModuleList as $ModuleName) {
echo '<tr>
- <td>' . _('Display') . ' ' . $ModuleName . ' ' . _('module') . ': </td>
- <td><select name="Module_' . $i . '">';
- if ($ModulesAllowed[$i]==0){
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- echo '<option value="1">' . _('Yes') . '</option>';
+ <td><label for="Module_', $i, '">', $ModuleListLabel[$i], ':</label></td>
+ <td><select id="Module_', $i, '" name="Module_', $i, '">';
+ if($ModulesAllowed[$i] == 0) {
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
+ '<option value="1">', _('Yes'), '</option>';
} else {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
- echo '<option value="0">' . _('No') . '</option>';
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
}
echo '</select></td>
</tr>';
$i++;
-}
+}// END foreach($ModuleList as $ModuleName).
echo '<tr>
- <td>' . _('Display Dashboard after Login') . ': </td>
- <td><select name="ShowDashboard">';
+ <td><label for="ShowDashboard">', _('Display Dashboard after Login'), ':</label></td>
+ <td><select id="ShowDashboard" name="ShowDashboard">';
if($_POST['ShowDashboard']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ '<option value="1">', _('Yes'), '</option>';
} else {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
- echo '<option value="0">' . _('No') . '</option>';
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">' . _('Yes') . '</option>';
}
echo '</select></td>
</tr>';
-if (!isset($_POST['PDFLanguage'])){
+if(!isset($_POST['PDFLanguage'])) {
$_POST['PDFLanguage']=0;
}
-
echo '<tr>
- <td>' . _('PDF Language Support') . ': </td>
- <td><select name="PDFLanguage">';
-for($i=0;$i<count($PDFLanguages);$i++){
- if ($_POST['PDFLanguage']==$i){
+ <td><label for="PDFLanguage">', _('PDF Language Support'), ':</label></td>
+ <td><select id="PDFLanguage" name="PDFLanguage">';
+for($i=0;$i<count($PDFLanguages);$i++) {
+ if($_POST['PDFLanguage']==$i) {
echo '<option selected="selected" value="' . $i .'">' . $PDFLanguages[$i] . '</option>';
} else {
echo '<option value="' . $i .'">' . $PDFLanguages[$i]. '</option>';
@@ -756,13 +747,13 @@
$result=DB_query($sql);
echo '<td><select name="Department">';
-if ((isset($_POST['Department']) AND $_POST['Department']=='0') OR !isset($_POST['Department'])){
+if((isset($_POST['Department']) AND $_POST['Department']=='0') OR !isset($_POST['Department'])) {
echo '<option selected="selected" value="0">' . _('Any Internal Department') . '</option>';
} else {
echo '<option value="">' . _('Any Internal Department') . '</option>';
}
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['Department']) AND $myrow['departmentid'] == $_POST['Department']){
+while($myrow=DB_fetch_array($result)) {
+ if(isset($_POST['Department']) AND $myrow['departmentid'] == $_POST['Department']) {
echo '<option selected="selected" value="' . $myrow['departmentid'] . '">' . $myrow['description'] . '</option>';
} else {
echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['description'] . '</option>';
@@ -776,7 +767,7 @@
echo '<tr>
<td>' . _('Account Status') . ':</td>
<td><select required="required" name="Blocked">';
-if ($_POST['Blocked']==0){
+if($_POST['Blocked']==0) {
echo '<option selected="selected" value="0">' . _('Open') . '</option>';
echo '<option value="1">' . _('Blocked') . '</option>';
} else {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-18 04:43:59 UTC (rev 7672)
+++ trunk/doc/Change.log 2016-11-20 22:56:18 UTC (rev 7673)
@@ -1,6 +1,7 @@
webERP Change Log
-08/11/16 RChacon: Add scripts to shows a statement of cash flows for the period using the indirect method.
+08/11/16 RChacon: On WWW_Users.php, fix hardcoded label (difficult to translate for languages with a different structure to English), do sortable the users list, replace printf() with plain list echo, and add format class.
+08/11/16 RChacon: Add scripts to show a statement of cash flows for the period using the indirect method.
08/11/16 RChacon: On SelectSupplier.php, fix table html code.
06/11/16 RChacon: On SupplierPriceList.php, fix to show price in user's locale format, add supplier's id and name to title, replace printf() with plain list echo, and regroup and document code.
03/11/16 RChacon: On Dashboard.php, fix creditors payment to point to allocation instead to payment, replace printf() with plain list echo, regroup code, and complete column styles.
|
|
From: <rc...@us...> - 2016-11-21 00:08:22
|
Revision: 7674
http://sourceforge.net/p/web-erp/reponame/7674
Author: rchacon
Date: 2016-11-21 00:08:18 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
Update translation files.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-11-20 22:56:18 UTC (rev 7673)
+++ trunk/GLCashFlowsIndirect.php 2016-11-21 00:08:18 UTC (rev 7674)
@@ -63,7 +63,7 @@
prnMsg(_('The beginning of the period should be before or equal to the end of the period. Please reselect the reporting period.'), 'error');
}
if($_POST['PeriodTo']-$_POST['PeriodFrom']+1 > 12) {
- // The reporting period is greater then 12 months.
+ // The reporting period is greater than 12 months.
unset($_POST['PeriodFrom']);
unset($_POST['PeriodTo']);
prnMsg(_('The period should be 12 months or less in duration. Please select an alternative period range.'), 'error');
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-20 22:56:18 UTC (rev 7673)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-21 00:08:18 UTC (rev 7674)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-17 19:39-0600\n"
+"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -268,10 +268,10 @@
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
-#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
-#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113
+#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:34 WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -355,8 +355,8 @@
#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
-#: WWW_Users.php:534 WWW_Users.php:536 WWW_Users.php:707 WWW_Users.php:709
-#: WWW_Users.php:722 WWW_Users.php:724
+#: WWW_Users.php:528 WWW_Users.php:530 WWW_Users.php:699 WWW_Users.php:702
+#: WWW_Users.php:714 WWW_Users.php:717
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -424,8 +424,8 @@
#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
-#: WWW_Users.php:533 WWW_Users.php:537 WWW_Users.php:706 WWW_Users.php:710
-#: WWW_Users.php:721 WWW_Users.php:725 includes/PDFLowGPPageHeader.inc:44
+#: WWW_Users.php:527 WWW_Users.php:531 WWW_Users.php:698 WWW_Users.php:701
+#: WWW_Users.php:713 WWW_Users.php:716 includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
@@ -456,7 +456,7 @@
#: StockCategories.php:296 SuppTransGLAnalysis.php:126 SupplierContacts.php:165
#: SupplierTenderCreate.php:157 SupplierTypes.php:170 TaxAuthorities.php:172
#: TaxCategories.php:184 TaxGroups.php:191 TaxProvinces.php:179
-#: UnitsOfMeasure.php:185 WWW_Access.php:132 WWW_Users.php:368
+#: UnitsOfMeasure.php:185 WWW_Access.php:132 WWW_Users.php:379
#: WorkCentres.php:145 includes/InputSerialItems.php:110
#: includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
@@ -503,7 +503,7 @@
#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173
#: TaxCategories.php:186 TaxGroups.php:192 TaxProvinces.php:180
#: TestPlanResults.php:920 UnitsOfMeasure.php:186 WOSerialNos.php:335
-#: WWW_Access.php:133 WWW_Users.php:369 WorkCentres.php:146
+#: WWW_Access.php:133 WWW_Users.php:380 WorkCentres.php:146
#: WorkOrderEntry.php:864 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
@@ -549,7 +549,7 @@
#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:289
+#: UnitsOfMeasure.php:241 WWW_Users.php:783 WorkCentres.php:289
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -745,7 +745,7 @@
#: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090
#: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290
#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:186
-#: WWW_Users.php:322 includes/PDFPickingListHeader.inc:25
+#: WWW_Users.php:321 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19
#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
@@ -983,7 +983,7 @@
#: StockDispatch.php:321 StockMovements.php:22 StockQties_csv.php:8
#: StockQuantityByDate.php:10 StockReorderLevel.php:20
#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45
-#: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:15
+#: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28
#: includes/MainMenuLinksArray.php:24
#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
@@ -4227,7 +4227,7 @@
#: CompanyPreferences.php:226 CustLoginSetup.php:162 SuppLoginSetup.php:145
#: SupplierTenderCreate.php:415 Suppliers.php:744 Suppliers.php:988
-#: WWW_Users.php:509 ../webSHOP/Checkout.php:430
+#: WWW_Users.php:503 ../webSHOP/Checkout.php:430
msgid "Email Address"
msgstr ""
@@ -4374,9 +4374,9 @@
#: CompanyPreferences.php:466 ConfirmDispatch_Invoice.php:656
#: ConfirmDispatch_Invoice.php:1707 Credit_Invoice.php:1634 CustItem.php:452
#: FixedAssetItems.php:132 FixedAssetItems.php:683 GLAccountUsers.php:153
-#: GLBudgets.php:240 GLCashFlowsSetup.php:172 GLCashFlowsSetup.php:173
-#: GLTags.php:68 GoodsReceived.php:298 GoodsReceived.php:304
-#: GoodsReceived.php:311 GoodsReceived.php:819 ImportBankTransAnalysis.php:154
+#: GLBudgets.php:240 GLCashFlowsSetup.php:173 GLTags.php:68
+#: GoodsReceived.php:298 GoodsReceived.php:304 GoodsReceived.php:311
+#: GoodsReceived.php:819 ImportBankTransAnalysis.php:154
#: ImportBankTransAnalysis.php:185 InternalStockRequest.php:255
#: InternalStockRequestAuthorisation.php:123
#: InternalStockRequestFulfill.php:364 LocationUsers.php:177
@@ -4546,7 +4546,7 @@
#: OrderDetails.php:85 SalesAnalRepts.php:30 SalesAnalRepts.php:32
#: SalesInquiry.php:771 SalesInquiry.php:781 SalesInquiry.php:803
#: SalesInquiry.php:951 SalesInquiry.php:966 SalesInquiry.php:972
-#: SalesInquiry.php:1231 WWW_Users.php:323 WWW_Users.php:569
+#: SalesInquiry.php:1231 WWW_Users.php:322 WWW_Users.php:563
#: Z_ChangeBranchCode.php:209 includes/PDFStatementPageHeader.inc:121
#: includes/PDFTransPageHeader.inc:49
#: includes/PDFTransPageHeaderPortrait.inc:59
@@ -6451,9 +6451,8 @@
msgid "Part of the Branch Phone Number"
msgstr ""
-#: Contracts.php:777 Customers.php:677 Customers.php:1188
-#: GLCashFlowsSetup.php:174 PO_Header.php:555 SelectGLAccount.php:126
-#: SelectOrderItems.php:581 SelectSalesOrder.php:546
+#: Contracts.php:777 Customers.php:677 Customers.php:1188 PO_Header.php:555
+#: SelectGLAccount.php:126 SelectOrderItems.php:581 SelectSalesOrder.php:546
msgid "Reset"
msgstr ""
@@ -6579,7 +6578,7 @@
msgid "Contract Status"
msgstr ""
-#: Contracts.php:967 SuppLoginSetup.php:29 WWW_Users.php:20
+#: Contracts.php:967 SuppLoginSetup.php:29 WWW_Users.php:33
#: includes/MainMenuLinksArray.php:29
msgid "Setup"
msgstr ""
@@ -8049,7 +8048,7 @@
#: CustEDISetup.php:31 CustLoginSetup.php:51 Customers.php:67
#: InternalStockCategoriesByRole.php:24 StockClone.php:164 Stocks.php:142
-#: SuppLoginSetup.php:51 TaxCategories.php:32 WWW_Users.php:75
+#: SuppLoginSetup.php:51 TaxCategories.php:32 WWW_Users.php:90
#: WorkCentres.php:37 Z_ChangeBranchCode.php:35 Z_ImportDebtors.php:224
#: Z_ImportDebtors.php:298 Z_ImportStocks.php:123
msgid "or a space"
@@ -8417,39 +8416,39 @@
msgid " has been selected"
msgstr ""
-#: CustLoginSetup.php:48 SuppLoginSetup.php:48 WWW_Users.php:72
+#: CustLoginSetup.php:48 SuppLoginSetup.php:48 WWW_Users.php:87
msgid "The user ID entered must be at least 4 characters long"
msgstr ""
-#: CustLoginSetup.php:51 SuppLoginSetup.php:51 WWW_Users.php:75
+#: CustLoginSetup.php:51 SuppLoginSetup.php:51 WWW_Users.php:90
msgid "User names cannot contain any of the following characters"
msgstr ""
#: CustLoginSetup.php:55 SuppLoginSetup.php:54 UserSettings.php:46
-#: WWW_Users.php:79
+#: WWW_Users.php:94
msgid "The password entered must be at least 5 characters long"
msgstr ""
#: CustLoginSetup.php:59 SuppLoginSetup.php:57 UserSettings.php:49
-#: WWW_Users.php:83
+#: WWW_Users.php:98
msgid "The password cannot contain the user id"
msgstr ""
-#: CustLoginSetup.php:62 WWW_Users.php:87
+#: CustLoginSetup.php:62 WWW_Users.php:102
msgid ""
"If you enter a Customer Code you must also enter a Branch Code valid for "
"this Customer"
msgstr ""
-#: CustLoginSetup.php:72 WWW_Users.php:109
+#: CustLoginSetup.php:72 WWW_Users.php:124
msgid "The check on validity of the customer code and branch failed because"
msgstr ""
-#: CustLoginSetup.php:73 WWW_Users.php:110
+#: CustLoginSetup.php:73 WWW_Users.php:125
msgid "The SQL that was used to check the customer code and branch was"
msgstr ""
-#: CustLoginSetup.php:77 WWW_Users.php:114
+#: CustLoginSetup.php:77 WWW_Users.php:129
msgid "The entered Branch Code is not valid for the entered Customer Code"
msgstr ""
@@ -8465,8 +8464,8 @@
msgid "A new customer login has been created"
msgstr ""
-#: CustLoginSetup.php:132 SuppLoginSetup.php:115 WWW_Users.php:319
-#: WWW_Users.php:465
+#: CustLoginSetup.php:132 SuppLoginSetup.php:115 WWW_Users.php:318
+#: WWW_Users.php:459
msgid "User Login"
msgstr ""
@@ -8475,7 +8474,7 @@
msgstr ""
#: CustLoginSetup.php:150 SMTPServer.php:118 SuppLoginSetup.php:133
-#: WWW_Users.php:497 includes/Login.php:100 includes/Login.php:101
+#: WWW_Users.php:491 includes/Login.php:100 includes/Login.php:101
#: install/index.php:932 ../webSHOP/Checkout.php:302
#: ../webSHOP/Register.php:600 ../webSHOP/includes/header.php:239
msgid "Password"
@@ -8485,8 +8484,8 @@
msgid "Enter a password for this customer login"
msgstr ""
-#: CustLoginSetup.php:154 SuppLoginSetup.php:137 WWW_Users.php:320
-#: WWW_Users.php:501
+#: CustLoginSetup.php:154 SuppLoginSetup.php:137 WWW_Users.php:319
+#: WWW_Users.php:495
msgid "Full Name"
msgstr ""
@@ -8495,7 +8494,7 @@
msgstr ""
#: CustLoginSetup.php:158 Locations.php:630 SalesPeople.php:340
-#: SuppLoginSetup.php:141 SupplierContacts.php:265 WWW_Users.php:505
+#: SuppLoginSetup.php:141 SupplierContacts.php:265 WWW_Users.php:499
msgid "Telephone No"
msgstr ""
@@ -8504,27 +8503,27 @@
msgstr ""
#: CustLoginSetup.php:167 CustomerBranches.php:600 CustomerBranches.php:637
-#: CustomerPurchases.php:85 WWW_Users.php:324 WWW_Users.php:574
+#: CustomerPurchases.php:85 WWW_Users.php:323 WWW_Users.php:568
#: Z_ImportCustbranch.php:519 api/api_xml-rpc.php:241
#: includes/PDFCustomerListPageHeader.inc:84
msgid "Branch Code"
msgstr ""
-#: CustLoginSetup.php:187 SuppLoginSetup.php:203 WWW_Users.php:608
+#: CustLoginSetup.php:187 SuppLoginSetup.php:203 WWW_Users.php:602
msgid "Reports Page Size"
msgstr ""
#: CustLoginSetup.php:191 CustLoginSetup.php:193 EmailConfirmation.php:121
#: PrintCustOrder.php:108 PrintCustOrder_generic.php:118 SuppLoginSetup.php:207
-#: SuppLoginSetup.php:209 WWW_Users.php:612 WWW_Users.php:614
+#: SuppLoginSetup.php:209 WWW_Users.php:606 WWW_Users.php:608
#: reportwriter/languages/en_US/reports.php:295
msgid "A4"
msgstr ""
#: CustLoginSetup.php:197 CustLoginSetup.php:199 CustLoginSetup.php:203
#: CustLoginSetup.php:205 SuppLoginSetup.php:213 SuppLoginSetup.php:215
-#: SuppLoginSetup.php:219 SuppLoginSetup.php:221 WWW_Users.php:618
-#: WWW_Users.php:620 WWW_Users.php:624 WWW_Users.php:626
+#: SuppLoginSetup.php:219 SuppLoginSetup.php:221 WWW_Users.php:612
+#: WWW_Users.php:614 WWW_Users.php:618 WWW_Users.php:620
#: reportwriter/languages/en_US/reports.php:294
msgid "A3"
msgstr ""
@@ -8534,35 +8533,35 @@
#: EmailConfirmation.php:121 PrintCustOrder.php:108
#: PrintCustOrder_generic.php:118 SuppLoginSetup.php:219 SuppLoginSetup.php:221
#: SuppLoginSetup.php:231 SuppLoginSetup.php:233 SuppLoginSetup.php:242
-#: SuppLoginSetup.php:244 WWW_Users.php:624 WWW_Users.php:626 WWW_Users.php:636
-#: WWW_Users.php:638 WWW_Users.php:647 WWW_Users.php:649
+#: SuppLoginSetup.php:244 WWW_Users.php:618 WWW_Users.php:620 WWW_Users.php:630
+#: WWW_Users.php:632 WWW_Users.php:641 WWW_Users.php:643
msgid "landscape"
msgstr ""
#: CustLoginSetup.php:209 CustLoginSetup.php:211 CustLoginSetup.php:215
#: CustLoginSetup.php:217 SuppLoginSetup.php:225 SuppLoginSetup.php:227
-#: SuppLoginSetup.php:231 SuppLoginSetup.php:233 WWW_Users.php:630
-#: WWW_Users.php:632 WWW_Users.php:636 WWW_Users.php:638
+#: SuppLoginSetup.php:231 SuppLoginSetup.php:233 WWW_Users.php:624
+#: WWW_Users.php:626 WWW_Users.php:630 WWW_Users.php:632
#: reportwriter/languages/en_US/reports.php:298
msgid "Letter"
msgstr ""
#: CustLoginSetup.php:221 CustLoginSetup.php:223 CustLoginSetup.php:226
#: CustLoginSetup.php:228 SuppLoginSetup.php:237 SuppLoginSetup.php:239
-#: SuppLoginSetup.php:242 SuppLoginSetup.php:244 WWW_Users.php:642
-#: WWW_Users.php:644 WWW_Users.php:647 WWW_Users.php:649
+#: SuppLoginSetup.php:242 SuppLoginSetup.php:244 WWW_Users.php:636
+#: WWW_Users.php:638 WWW_Users.php:641 WWW_Users.php:643
#: reportwriter/languages/en_US/reports.php:297
msgid "Legal"
msgstr ""
#: CustLoginSetup.php:234 SuppLoginSetup.php:250 UserSettings.php:149
-#: WWW_Users.php:330 WWW_Users.php:656
+#: WWW_Users.php:329 WWW_Users.php:650
msgid "Theme"
msgstr ""
#: CustLoginSetup.php:256 Customers.php:638 Customers.php:1021
#: Customers.php:1031 RevisionTranslations.php:60 SuppLoginSetup.php:274
-#: UserSettings.php:132 WWW_Users.php:331 WWW_Users.php:681
+#: UserSettings.php:132 WWW_Users.php:330 WWW_Users.php:675
msgid "Language"
msgstr ""
@@ -9414,7 +9413,7 @@
msgstr ""
#: CustomerBranches.php:734 CustomerBranches.php:758 DailySalesInquiry.php:40
-#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:326
+#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:325
msgid "Salesperson"
msgstr ""
@@ -12372,7 +12371,7 @@
#: PrintCustTransPortrait.php:786 PrintCustTransPortrait.php:1032
#: PrintCustTransPortrait.php:1088 SalesPeople.php:209 SelectSupplier.php:289
#: SupplierTenderCreate.php:144 Suppliers.php:736 Suppliers.php:980
-#: WWW_Users.php:321
+#: WWW_Users.php:320
msgid "Telephone"
msgstr ""
@@ -14216,6 +14215,10 @@
"expenses are owed based on the supplier invoice date."
msgstr ""
+#: GLCashFlowsIndirect.php:765
+msgid "Report parameters"
+msgstr ""
+
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
msgstr ""
@@ -14361,21 +14364,10 @@
msgid "Reset values"
msgstr ""
-#: GLCashFlowsSetup.php:176 SupplierCredit.php:530 SupplierCredit.php:533
-#: SupplierInvoice.php:882 SupplierInvoice.php:885 SystemParameters.php:552
-#: SystemParameters.php:689 SystemParameters.php:691 SystemParameters.php:702
-#: SystemParameters.php:704
-msgid "Automatic"
-msgstr ""
-
#: GLCashFlowsSetup.php:177
msgid "Automatic setup"
msgstr ""
-#: GLCashFlowsSetup.php:178 includes/header.inc:77 includes/header.inc:81
-msgid "Manual"
-msgstr ""
-
#: GLCashFlowsSetup.php:179
msgid "Manual setup"
msgstr ""
@@ -19802,7 +19794,7 @@
#: PDFSalesBySalesperson.php:88 PDFWeeklyOrders.php:84 ReverseGRN.php:31
#: SalesByTypePeriodInquiry.php:356 SalesTopCustomersInquiry.php:218
#: SalesTopItemsInquiry.php:225 SelectSalesOrder.php:411 Tax.php:256
-#: includes/MainMenuLinksArray.php:20
+#: WWW_Users.php:24 includes/MainMenuLinksArray.php:20
msgid "Sales"
msgstr ""
@@ -21217,7 +21209,7 @@
msgstr ""
#: PO_OrderDetails.php:96 SelectProduct.php:561 SupplierTenderCreate.php:413
-#: Suppliers.php:693 Suppliers.php:934 WWW_Users.php:325 WWW_Users.php:579
+#: Suppliers.php:693 Suppliers.php:934 WWW_Users.php:324 WWW_Users.php:573
msgid "Supplier Code"
msgstr ""
@@ -21461,7 +21453,7 @@
msgstr ""
#: PO_SelectOSPurchOrder.php:312 PO_SelectPurchOrder.php:216
-#: Shipt_Select.php:193 SuppLoginSetup.php:20 WWW_Users.php:11
+#: Shipt_Select.php:193 SuppLoginSetup.php:20
#: reportwriter/languages/en_US/reports.php:239
msgid "Orders"
msgstr ""
@@ -22230,7 +22222,7 @@
msgstr ""
#: PcAuthorizeExpenses.php:45 PcAuthorizeExpenses.php:48 SuppLoginSetup.php:28
-#: WWW_Users.php:19 includes/MainMenuLinksArray.php:28
+#: WWW_Users.php:32 includes/MainMenuLinksArray.php:28
#: reportwriter/languages/en_US/reports.php:247
msgid "Petty Cash"
msgstr ""
@@ -26483,7 +26475,6 @@
msgstr ""
#: SalesTopCustomersInquiry.php:82 SalesTopItemsInquiry.php:83
-#: WWW_Users.php:703
msgid "Display"
msgstr ""
@@ -32293,33 +32284,33 @@
msgid "A supplier must first be selected before logins can be defined for it"
msgstr ""
-#: SuppLoginSetup.php:21 WWW_Users.php:12 includes/MainMenuLinksArray.php:21
+#: SuppLoginSetup.php:21 WWW_Users.php:25 includes/MainMenuLinksArray.php:21
#: reportwriter/languages/en_US/reports.php:242
msgid "Receivables"
msgstr ""
-#: SuppLoginSetup.php:22 WWW_Users.php:14 includes/MainMenuLinksArray.php:23
+#: SuppLoginSetup.php:22 WWW_Users.php:27 includes/MainMenuLinksArray.php:23
#: reportwriter/languages/en_US/reports.php:240
msgid "Payables"
msgstr ""
-#: SuppLoginSetup.php:23 WWW_Users.php:13
+#: SuppLoginSetup.php:23
msgid "Purchasing"
msgstr ""
-#: SuppLoginSetup.php:25 WWW_Users.php:16 includes/MainMenuLinksArray.php:25
+#: SuppLoginSetup.php:25 WWW_Users.php:29 includes/MainMenuLinksArray.php:25
#: reportwriter/languages/en_US/reports.php:244
msgid "Manufacturing"
msgstr ""
#: SuppLoginSetup.php:26 SuppTransGLAnalysis.php:98 SuppTransGLAnalysis.php:101
#: SupplierCredit.php:227 SupplierCredit.php:302 SupplierInvoice.php:575
-#: SupplierInvoice.php:648 WWW_Users.php:17 includes/MainMenuLinksArray.php:26
+#: SupplierInvoice.php:648 WWW_Users.php:30 includes/MainMenuLinksArray.php:26
#: reportwriter/languages/en_US/reports.php:245
msgid "General Ledger"
msgstr ""
-#: SuppLoginSetup.php:27 WWW_Users.php:18 includes/MainMenuLinksArray.php:27
+#: SuppLoginSetup.php:27 WWW_Users.php:31 includes/MainMenuLinksArray.php:27
#: reportwriter/languages/en_US/reports.php:246
msgid "Asset Manager"
msgstr ""
@@ -32411,7 +32402,7 @@
"up until this role is defined"
msgstr ""
-#: SuppLoginSetup.php:186 WWW_Users.php:542
+#: SuppLoginSetup.php:186 WWW_Users.php:536
msgid "Default Location"
msgstr ""
@@ -33059,6 +33050,12 @@
msgid "Update Tax Calculation"
msgstr ""
+#: SupplierCredit.php:530 SupplierCredit.php:533 SupplierInvoice.php:882
+#: SupplierInvoice.php:885 SystemParameters.php:552 SystemParameters.php:689
+#: SystemParameters.php:691 SystemParameters.php:702 SystemParameters.php:704
+msgid "Automatic"
+msgstr ""
+
#: SupplierCredit.php:531 SupplierCredit.php:534 SystemParameters.php:688
#: SystemParameters.php:692 SystemParameters.php:701 SystemParameters.php:705
msgid "Manual Entry"
@@ -35588,7 +35585,7 @@
msgid "Total Inputs"
msgstr ""
-#: Tax.php:269 includes/MainMenuLinksArray.php:22
+#: Tax.php:269 WWW_Users.php:26 includes/MainMenuLinksArray.php:22
#: reportwriter/languages/en_US/reports.php:241
#: ../webSHOP/CreditCardPayPalPro.php:90
#: ../webSHOP/includes/ProcessPayPalPayment.php:8
@@ -36798,11 +36795,11 @@
msgid "Eastern European Russian Japanese Korean Hebrew Arabic Thai"
msgstr ""
-#: UserSettings.php:18 WWW_Users.php:25
+#: UserSettings.php:18 WWW_Users.php:51
msgid "Chinese"
msgstr ""
-#: UserSettings.php:19 WWW_Users.php:26
+#: UserSettings.php:19 WWW_Users.php:52
msgid "Free Serif"
msgstr ""
@@ -36822,11 +36819,11 @@
msgid "The password and password confirmation fields entered do not match"
msgstr ""
-#: UserSettings.php:71 UserSettings.php:87 WWW_Users.php:236
+#: UserSettings.php:71 UserSettings.php:87 WWW_Users.php:251
msgid "The user alterations could not be processed because"
msgstr ""
-#: UserSettings.php:72 UserSettings.php:88 WWW_Users.php:237
+#: UserSettings.php:72 UserSettings.php:88 WWW_Users.php:252
#: ../webSHOP/Register.php:370
msgid "The SQL that was used to update the user and failed was"
msgstr ""
@@ -36859,7 +36856,7 @@
msgid "If you leave the password boxes empty your password will not change"
msgstr ""
-#: UserSettings.php:203 WWW_Users.php:735
+#: UserSettings.php:203 WWW_Users.php:726
msgid "PDF Language Support"
msgstr ""
@@ -37129,202 +37126,241 @@
msgid "Are you sure you wish to delete this security token from this role?"
msgstr ""
-#: WWW_Users.php:21 includes/MainMenuLinksArray.php:30
+#: WWW_Users.php:12 includes/MainMenuLinksArray.php:478
+msgid "Users Maintenance"
+msgstr ""
+
+#: WWW_Users.php:34 includes/MainMenuLinksArray.php:30
msgid "Utilities"
msgstr ""
-#: WWW_Users.php:23
+#: WWW_Users.php:37
+msgid "Display Sales module"
+msgstr ""
+
+#: WWW_Users.php:38
+msgid "Display Receivables module"
+msgstr ""
+
+#: WWW_Users.php:39
+msgid "Display Purchases module"
+msgstr ""
+
+#: WWW_Users.php:40
+msgid "Display Payables module"
+msgstr ""
+
+#: WWW_Users.php:41
+msgid "Display Inventory module"
+msgstr ""
+
+#: WWW_Users.php:42
+msgid "Display Manufacturing module"
+msgstr ""
+
+#: WWW_Users.php:43
+msgid "Display General Ledger module"
+msgstr ""
+
+#: WWW_Users.php:44
+msgid "Display Asset Manager module"
+msgstr ""
+
+#: WWW_Users.php:45
+msgid "Display Petty Cash module"
+msgstr ""
+
+#: WWW_Users.php:46
+msgid "Display Setup module"
+msgstr ""
+
+#: WWW_Users.php:47
+msgid "Display Utilities module"
+msgstr ""
+
+#: WWW_Users.php:49
msgid "Latin Western Languages"
msgstr ""
-#: WWW_Users.php:24
+#: WWW_Users.php:50
msgid "Eastern European Russian Japanese Korean Vietnamese Hebrew Arabic Thai"
msgstr ""
-#: WWW_Users.php:28 includes/MainMenuLinksArray.php:478
-msgid "Users Maintenance"
-msgstr ""
-
-#: WWW_Users.php:89
+#: WWW_Users.php:104
msgid "The demonstration user called demo cannot be modified."
msgstr ""
-#: WWW_Users.php:98
+#: WWW_Users.php:113
msgid "The user ID"
msgstr ""
-#: WWW_Users.php:98
+#: WWW_Users.php:113
msgid "already exists and cannot be used again"
msgstr ""
-#: WWW_Users.php:166
+#: WWW_Users.php:181
msgid "The selected user record has been updated"
msgstr ""
-#: WWW_Users.php:207
+#: WWW_Users.php:222
msgid "A new user record has been inserted"
msgstr ""
-#: WWW_Users.php:219
+#: WWW_Users.php:234
msgid "The default user locations could not be processed because"
msgstr ""
-#: WWW_Users.php:220
+#: WWW_Users.php:235
msgid "The SQL that was used to create the user locations and failed was"
msgstr ""
-#: WWW_Users.php:222
+#: WWW_Users.php:237
msgid ""
"User has been authorized to use and update only his / her default location"
msgstr ""
-#: WWW_Users.php:228
+#: WWW_Users.php:243
msgid "The default user GL Accounts could not be processed because"
msgstr ""
-#: WWW_Users.php:229
+#: WWW_Users.php:244
msgid "The SQL that was used to create the user GL Accounts and failed was"
msgstr ""
-#: WWW_Users.php:231
+#: WWW_Users.php:246
msgid "User has been authorized to use and update all GL accounts"
msgstr ""
-#: WWW_Users.php:268
+#: WWW_Users.php:283
msgid "The demonstration user called demo cannot be deleted"
msgstr ""
-#: WWW_Users.php:273
+#: WWW_Users.php:288
msgid "Cannot delete user as entries already exist in the audit trail"
msgstr ""
-#: WWW_Users.php:276
+#: WWW_Users.php:291
msgid "The Location - User could not be deleted because"
msgstr ""
-#: WWW_Users.php:280
+#: WWW_Users.php:295
msgid "The GL Account - User could not be deleted because"
msgstr ""
-#: WWW_Users.php:284
+#: WWW_Users.php:299
msgid "The Bank Accounts - User could not be deleted because"
msgstr ""
-#: WWW_Users.php:288
+#: WWW_Users.php:303
msgid "The User could not be deleted because"
msgstr ""
-#: WWW_Users.php:290
+#: WWW_Users.php:305
msgid "User Deleted"
msgstr ""
-#: WWW_Users.php:327
+#: WWW_Users.php:326
msgid "Last Visit"
msgstr ""
-#: WWW_Users.php:328 WWW_Users.php:513
+#: WWW_Users.php:327 WWW_Users.php:507
msgid "Security Role"
msgstr ""
-#: WWW_Users.php:329
+#: WWW_Users.php:328
msgid "Report Size"
msgstr ""
-#: WWW_Users.php:348
+#: WWW_Users.php:361
msgid "No login record"
msgstr ""
-#: WWW_Users.php:369
-#, php-format
+#: WWW_Users.php:380
msgid "Are you sure you wish to delete this user?"
msgstr ""
-#: WWW_Users.php:395
+#: WWW_Users.php:389
msgid "Review Existing Users"
msgstr ""
-#: WWW_Users.php:457
+#: WWW_Users.php:451
msgid "User code"
msgstr ""
-#: WWW_Users.php:466
+#: WWW_Users.php:460
msgid "At least 4 characters"
msgstr ""
-#: WWW_Users.php:466
+#: WWW_Users.php:460
msgid ""
"Please input not less than 4 characters and canot be admin or contains "
"illegal characters"
msgstr ""
-#: WWW_Users.php:498
+#: WWW_Users.php:492
msgid "At least 5 characters"
msgstr ""
-#: WWW_Users.php:498
+#: WWW_Users.php:492
msgid ""
"Passwords must be 5 characters or more and cannot same as the users id. A "
"mix of upper and lower case and some non-alphanumeric characters are "
"recommended."
msgstr ""
-#: WWW_Users.php:510
+#: WWW_Users.php:504
msgid "e.g. us...@do..."
msgstr ""
-#: WWW_Users.php:510
+#: WWW_Users.php:504
msgid "A valid email address is required"
msgstr ""
-#: WWW_Users.php:529
+#: WWW_Users.php...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X