Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rc...@us...> - 2016-11-24 13:11:21
|
Revision: 7680
http://sourceforge.net/p/web-erp/reponame/7680
Author: rchacon
Date: 2016-11-24 13:11:15 +0000 (Thu, 24 Nov 2016)
Log Message:
-----------
Updates Project-Id-Version in *.po files
Modified Paths:
--------------
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_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.mo
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/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: web-erp\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2015-11-12 20:40+0200\n"
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:20-0600\n"
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2015-02-24 18:41-0600\n"
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:22-0600\n"
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2016-05-28 12:08-0600\n"
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2016-11-23 13:05-0600\n"
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:24-0600\n"
Modified: trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:25-0600\n"
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -7,7 +7,7 @@
# msgfmt messages.po
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2015-02-06 10:12-0600\n"
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
# James Dupin <jam...@gm...>, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2016-11-20 17:50-0600\n"
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2016-05-11 01:58+0200\n"
Modified: trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:29-0600\n"
Modified: trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:29-0600\n"
Modified: trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:31-0600\n"
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:32-0600\n"
Modified: trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 11:33-0600\n"
Modified: trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:04-0600\n"
Modified: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -1,11 +1,11 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# webERP - Korean Translation File.
+# Copyright (C) 2004 weberp.org
+# This file is distributed under the same license as the webERP package.
# FIRST AUTHOR Dongbak Cha <hu...@hu...>, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2015-09-18 10:34+0900\n"
Modified: trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:05-0600\n"
Modified: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2014-02-10 22:09+0530\n"
Modified: trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:06-0600\n"
Modified: trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:08-0600\n"
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2014-01-28 14:48-0300\n"
Modified: trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2014-01-28 14:48-0300\n"
Modified: trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:18-0600\n"
Modified: trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -6,7 +6,7 @@
# Olykainen Andrey <and...@gm...>, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:18-0600\n"
Modified: trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 12:19-0600\n"
Modified: trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2014-08-14 18:47-0600\n"
Modified: trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
"PO-Revision-Date: 2013-06-01 16:37-0600\n"
Modified: trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
+++ trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po 2016-11-24 13:11:15 UTC (rev 7680)
@@ -1,14 +1,14 @@
# webERP - Turkish Translation File.
-# Copyright (C) 2006 Logicworks Ltd
+# Copyright (C) 2004 weberp.org
# This file is distributed under the same license as the webERP package.
# For details see http://www.gnu.org/licenses/info/GPLv2.html
# Bora Tür <bo...@bo...>, 2006. <in...@tb...>
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-20 17:14-0600\n"
+"POT-Creation-Date: 2016-11-24 06:21-0600\n"
"PO-Revision-Date: 2013-06-01 16:38-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
@@ -41,52 +41,52 @@
"ana hesap grubunun hesap gruplarına almak için kullanılan ve SQL oldu "
"sürecinde başarısız"
-#: AccountGroups.php:46
+#: AccountGroups.php:45
msgid "An error occurred in moving the account group"
msgstr ""
-#: AccountGroups.php:47
+#: AccountGroups.php:46
msgid "The SQL that was used to move the account group was"
msgstr ""
-#: AccountGroups.php:49 AccountGroups.php:331
+#: AccountGroups.php:48 AccountGroups.php:330
msgid "Review Account Groups"
msgstr "HESAP GRUPLARI"
-#: AccountGroups.php:50
+#: AccountGroups.php:49
msgid "All accounts in the account group:"
msgstr ""
-#: AccountGroups.php:50
+#: AccountGroups.php:49
msgid "have been changed to the account group:"
msgstr ""
-#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:208
-#: AccountGroups.php:243
+#: AccountGroups.php:68 AccountGroups.php:105 AccountGroups.php:207
+#: AccountGroups.php:242
msgid "The SQL that was used to retrieve the information was"
msgstr "bilgi almak için kullanılan SQL oldu"
-#: AccountGroups.php:70
+#: AccountGroups.php:69
msgid "Could not check whether the group exists because"
msgstr "grup çünkü var olup olmadığını kontrol Couldn't"
-#: AccountGroups.php:77
+#: AccountGroups.php:76
msgid "The account group name already exists in the database"
msgstr "Hesap grubu adı zaten veritabanında bulunan"
-#: AccountGroups.php:83
+#: AccountGroups.php:82
msgid "The account group name cannot contain the character"
msgstr "HESAP GRUP ADI SU KARAKTERLERI IÇEREMEZ:"
-#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:32
+#: AccountGroups.php:82 Departments.php:30 TaxCategories.php:32
msgid "or the character"
msgstr "VEYA"
-#: AccountGroups.php:89
+#: AccountGroups.php:88
msgid "The account group name must be at least one character long"
msgstr "Hesap grubu adını en az bir karakter uzunluğunda olmalıdır"
-#: AccountGroups.php:96
+#: AccountGroups.php:95
msgid ""
"The parent account group selected appears to result in a recursive account "
"structure - select an alternative parent account group or make this group a "
@@ -96,11 +96,11 @@
"alternatif ana hesap grubu seçin veya bu gruptan bir üst düzey hesap grubu "
"yapmak"
-#: AccountGroups.php:107
+#: AccountGroups.php:106
msgid "Could not check whether the group is recursive because"
msgstr "grup recursive olup olmadığını kontrol olamazdım çünkü"
-#: AccountGroups.php:115
+#: AccountGroups.php:114
msgid ""
"Since this account group is a child group, the sequence in the trial "
"balance, the section in the accounts and whether or not the account group "
@@ -109,61 +109,61 @@
"will have no effect."
msgstr ""
-#: AccountGroups.php:120
+#: AccountGroups.php:119
msgid "The section in accounts must be an integer"
msgstr "BÖLÜM INTEGER OLMALI"
-#: AccountGroups.php:126
+#: AccountGroups.php:125
msgid "The sequence in the trial balance must be an integer"
msgstr "BÖLÜM INTEGER OLMALI"
-#: AccountGroups.php:132
+#: AccountGroups.php:131
msgid "The sequence in the TB must be numeric and less than"
msgstr "TB sıra sayısal ve daha az olmalıdır"
-#: AccountGroups.php:148
+#: AccountGroups.php:147
msgid "An error occurred in renaming the account group"
msgstr ""
-#: AccountGroups.php:149
+#: AccountGroups.php:148
msgid "The SQL that was used to rename the account group was"
msgstr ""
-#: AccountGroups.php:168
+#: AccountGroups.php:167
msgid "An error occurred in updating the account group"
msgstr "Bir hata hesap grubu güncelleme oluştu"
-#: AccountGroups.php:169
+#: AccountGroups.php:168
msgid "The SQL that was used to update the account group was"
msgstr "hesap grubu güncellemek için kullanılan SQL oldu"
-#: AccountGroups.php:171 AccountSections.php:98 PaymentMethods.php:84
+#: AccountGroups.php:170 AccountSections.php:98 PaymentMethods.php:84
msgid "Record Updated"
msgstr "KAYIT GÜNCELLENDI"
-#: AccountGroups.php:187
+#: AccountGroups.php:186
msgid "An error occurred in inserting the account group"
msgstr "Bir hata hesap grubu ekleyerek oluştu"
-#: AccountGroups.php:188
+#: AccountGroups.php:187
msgid "The SQL that was used to insert the account group was"
msgstr "SQL eklemek için kullanılan bu hesap grubu oldu"
-#: AccountGroups.php:189 AccountSections.php:108
+#: AccountGroups.php:188 AccountSections.php:108
msgid "Record inserted"
msgstr "KAYIT EKLENDI"
-#: AccountGroups.php:207
+#: AccountGroups.php:206
msgid "An error occurred in retrieving the group information from chartmaster"
msgstr "Bir hata chartmaster gelen grup bilgisi alınırken oluştu"
-#: AccountGroups.php:212
+#: AccountGroups.php:211
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
msgstr "HESAP GRUBU SILINEMIYOR, BAGLI MUH.HESAPLARI VAR."
-#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
+#: AccountGroups.php:212 AccountGroups.php:247 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
@@ -187,54 +187,54 @@
msgid "There are"
msgstr "MEVCUT"
-#: AccountGroups.php:213
+#: AccountGroups.php:212
msgid "general ledger accounts that refer to this account group"
msgstr "ILGILI MUH.HESAPLARI:"
-#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:418
+#: AccountGroups.php:219 AccountGroups.php:289 AccountGroups.php:432
msgid "Parent Group"
msgstr "Üst Grup"
-#: AccountGroups.php:236
+#: AccountGroups.php:235
msgid "Move Group"
msgstr ""
-#: AccountGroups.php:242
+#: AccountGroups.php:241
msgid "An error occurred in retrieving the parent group information"
msgstr "Bir hata üst grup bilgisi alınırken oluştu"
-#: AccountGroups.php:247
+#: AccountGroups.php:246
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
msgstr ""
"diğer hesap grup (lar) bir ana hesap grubu, çünkü bu hesap grubu silinemiyor"
-#: AccountGroups.php:248
+#: AccountGroups.php:247
msgid "account groups that have this group as its/there parent account group"
msgstr "onun / orada ana hesap grubu olarak bu grup var hesap grupları"
-#: AccountGroups.php:252
+#: AccountGroups.php:251
msgid "An error occurred in deleting the account group"
msgstr "Bir hata hesap grubu silme oluştu"
-#: AccountGroups.php:253
+#: AccountGroups.php:252
msgid "The SQL that was used to delete the account group was"
msgstr "hesap grubu silmek için kullanılan SQL oldu"
-#: AccountGroups.php:255
+#: AccountGroups.php:254
msgid "group has been deleted"
msgstr "GRUP SILINDI"
-#: AccountGroups.php:279
+#: AccountGroups.php:278
msgid "The sql that was used to retrieve the account group information was "
msgstr "hesap grubu bilgi almak için kullanılan sql oldu "
-#: AccountGroups.php:280
+#: AccountGroups.php:279
msgid "Could not get account groups because"
msgstr "HESAP GRUPLARI GÖSTERILEMIYOR:"
-#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
+#: AccountGroups.php:281 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
@@ -278,32 +278,32 @@
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
#: 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
+#: WorkOrderCosting.php:22 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "Arama"
-#: AccountGroups.php:286
+#: AccountGroups.php:285
msgid "Group Name"
msgstr "GRUP ADI"
-#: AccountGroups.php:287 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+#: AccountGroups.php:286 EDIMessageFormat.php:129 EDIMessageFormat.php:208
msgid "Section"
msgstr "BÖLÜM"
-#: AccountGroups.php:288 AccountGroups.php:474
+#: AccountGroups.php:287 AccountGroups.php:481
msgid "Sequence In TB"
msgstr "Sequence In Trial Balance"
-#: AccountGroups.php:289 AccountGroups.php:457 GLProfit_Loss.php:6
+#: AccountGroups.php:288 AccountGroups.php:469 GLProfit_Loss.php:6
#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:63
msgid "Profit and Loss"
msgstr "KAR/ZARAR"
-#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:461
-#: AccountGroups.php:463 AddCustomerContacts.php:165
+#: AccountGroups.php:306 AccountGroups.php:309 AccountGroups.php:473
+#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
#: CompanyPreferences.php:423 CompanyPreferences.php:425
@@ -325,7 +325,7 @@
#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
+#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:249
#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
@@ -370,7 +370,7 @@
msgid "Yes"
msgstr "EVET"
-#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
+#: AccountGroups.php:312 AccountGroups.php:472 AccountGroups.php:475
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BOMs.php:142
#: BOMs.php:895 BOMs.php:899 BankAccounts.php:218 BankAccounts.php:412
@@ -395,7 +395,7 @@
#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
+#: PcAuthorizeExpenses.php:247 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -439,7 +439,7 @@
msgid "No"
msgstr "HAYIR"
-#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:158
+#: AccountGroups.php:321 AccountSections.php:196 AddCustomerContacts.php:158
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BOMs.php:198 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
@@ -473,11 +473,11 @@
msgid "Edit"
msgstr "DÜZELT"
-#: AccountGroups.php:323
+#: AccountGroups.php:322
msgid "Are you sure you wish to delete this account group?"
msgstr ""
-#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:159
+#: AccountGroups.php:322 AccountSections.php:201 AddCustomerContacts.php:159
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BOMs.php:200 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
@@ -513,86 +513,103 @@
#: 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:380 WorkCentres.php:146
-#: WorkOrderEntry.php:864 includes/InputSerialItemsKeyed.php:60
+#: WorkOrderEntry.php:865 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "SIL"
-#: AccountGroups.php:351
+#: AccountGroups.php:350
msgid "An error occurred in retrieving the account group information"
msgstr "Bir hata hesap grubu bilgisi alınırken oluştu"
-#: AccountGroups.php:352
+#: AccountGroups.php:351
msgid ""
"The SQL that was used to retrieve the account group and that failed in the "
"process was"
msgstr "hesap grubu almak için kullanılan ve SQL oldu sürecinde başarısız"
-#: AccountGroups.php:355
+#: AccountGroups.php:354
msgid "The account group name does not exist in the database"
msgstr "Hesap grubu adı veritabanında yok"
-#: AccountGroups.php:370
+#: AccountGroups.php:369
msgid "Edit Account Group Details"
msgstr ""
-#: AccountGroups.php:400
+#: AccountGroups.php:376 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: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
+#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:981
+#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294 PricesByCost.php:223
+#: PurchData.php:758 ReorderLevelLocation.php:140 RevisionTranslations.php:111
+#: SMTPServer.php:126 SecurityTokens.php:136 SelectCreditItems.php:954
+#: SellThroughSupport.php:476 ShopParameters.php:610 StockCostUpdate.php:196
+#: StockReorderLevel.php:111 Stocks.php:1452 SystemParameters.php:1246
+#: UserGLAccounts.php:159 UserLocations.php:178 WOSerialNos.php:345
+#: WorkOrderEntry.php:887 reportwriter/languages/en_US/reports.php:156
+msgid "Update"
+msgstr "GÜNCELLE"
+
+#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:121
+#: AnalysisHorizontalIncome.php:522 AnalysisHorizontalPosition.php:79
+#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:257
+#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:741
+#: GLCashFlowsIndirect.php:774 GLCashFlowsSetup.php:181 GLProfit_Loss.php:1317
+#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:264
+#: SecurityTokens.php:140 SecurityTokens.php:156 UserGLAccounts.php:259
+#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
+msgid "Return"
+msgstr ""
+
+#: AccountGroups.php:409
msgid "New Account Group Details"
msgstr ""
-#: AccountGroups.php:405 AccountSections.php:285 AddCustomerContacts.php:297
-#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:916 BankAccounts.php:433 COGSGLPostings.php:368
-#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
-#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
-#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:297 GeocodeSetup.php:271 Labels.php:647
-#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:375 OffersReceived.php:57 OffersReceived.php:146
-#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
-#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
-#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
-#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
-#: 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:783 WorkCentres.php:289
-msgid "Enter Information"
-msgstr "GIRIS"
+#: AccountGroups.php:416 GLTags.php:70 SecurityTokens.php:154
+#: Z_ImportDebtors.php:626 Z_ImportDebtors.php:628 Z_ImportSuppliers.php:336
+#: Z_ImportSuppliers.php:338
+msgid "Insert"
+msgstr "Eklemek"
-#: AccountGroups.php:414
+#: AccountGroups.php:428
msgid "Account Group Name"
msgstr "Hesap Grup Adı"
-#: AccountGroups.php:415
+#: AccountGroups.php:429
msgid "Enter the account group name"
msgstr ""
-#: AccountGroups.php:415
+#: AccountGroups.php:429
msgid ""
"A unique name for the account group must be entered - at least 3 characters "
"long and less than 30 characters long. Only alpha numeric characters can be "
"used."
msgstr ""
-#: AccountGroups.php:427
+#: AccountGroups.php:438
msgid "Top Level Group"
msgstr "Üst Düzey Grubu"
-#: AccountGroups.php:440
+#: AccountGroups.php:452
msgid "Section In Accounts"
msgstr "HESAP BÖLÜMLERI"
-#: AccountGroups.php:458
+#: AccountGroups.php:470
msgid ""
"Select YES if this account group will contain accounts that will consist of "
"only profit and loss accounts or NO if the group will contain balance sheet "
"account"
msgstr ""
-#: AccountGroups.php:475
+#: AccountGroups.php:482
msgid ""
"Enter the sequence number that this account group and its child general "
"ledger accounts should display in the trial balance"
@@ -665,6 +682,26 @@
msgid "New Account Section Details"
msgstr ""
+#: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242
+#: AddCustomerTypeNotes.php:221 Areas.php:229 BOMs.php:916 BankAccounts.php:433
+#: COGSGLPostings.php:368 CreditStatus.php:259 Currencies.php:537
+#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
+#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:297
+#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188
+#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57
+#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:302
+#: PaymentTerms.php:310 PriceMatrix.php:236 Prices_Customer.php:369
+#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
+#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
+#: SelectQASamples.php:531 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:783
+#: WorkCentres.php:289
+msgid "Enter Information"
+msgstr "GIRIS"
+
#: AddCustomerContacts.php:6 AddCustomerContacts.php:63 SelectCustomer.php:723
#: SelectCustomer.php:791
msgid "Customer Contacts"
@@ -773,9 +810,9 @@
#: GLCashFlowsIndirect.php:445 PDFQuotation.php:252
#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:242
#: PcAssignCashTabToTab.php:365 PcAssignCashToTab.php:256
-#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
+#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportTab.php:333 SelectCustomer.php:732 ShopParameters.php:198
+#: PcReportTab.php:336 SelectCustomer.php:732 ShopParameters.php:198
#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr "NOTLAR"
@@ -868,7 +905,7 @@
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:238
-#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
+#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
#: SelectCustomer.php:810 SelectCustomer.php:852 ShipmentCosting.php:538
@@ -886,7 +923,7 @@
msgid "Date"
msgstr "TARIH"
-#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
+#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:183
#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
#: Stocks.php:1270 UpgradeDatabase.php:246 UpgradeDatabase.php:249
#: UpgradeDatabase.php:252 UpgradeDatabase.php:255 UpgradeDatabase.php:258
@@ -1031,7 +1068,7 @@
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
-#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
+#: PcExpensesTypeTab.php:171 PcReportTab.php:181 PcTypeTabs.php:164
#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:549
#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
@@ -1043,14 +1080,14 @@
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120
-#: SuppInvGRNs.php:263 SuppPriceList.php:309 SupplierCredit.php:317
+#: SuppInvGRNs.php:263 SuppPriceList.php:306 SupplierCredit.php:317
#: SupplierCredit.php:385 SupplierInvoice.php:668 SupplierInvoice.php:750
#: SupplierPriceList.php:44 SupplierPriceList.php:276 SupplierPriceList.php:542
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421
#: SupplierTenders.php:687 TestPlanResults.php:177 TestPlanResults.php:280
#: TopItems.php:170 WorkCentres.php:130 WorkOrderCosting.php:98
-#: WorkOrderCosting.php:130 WorkOrderEntry.php:972 WorkOrderIssue.php:1009
+#: WorkOrderCosting.php:130 WorkOrderEntry.php:973 WorkOrderIssue.php:1009
#: Z_ItemsWithoutPicture.php:35 api/api_xml-rpc.php:3489
#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
@@ -1319,9 +1356,10 @@
msgid "Only Show Customers Of"
msgstr "Sadece Show Müşteriler Of"
-#: AgedDebtors.php:493
-msgid "All Sales people"
-msgstr ""
+#: AgedDebtors.php:493 PDFCustomerList.php:391 SalesInquiry.php:1188
+#: includes/PDFCustomerListPageHeader.inc:43
+msgid "All Salespeople"
+msgstr "BÜTÜN SATIS PERSONELI"
#: AgedDebtors.php:501
msgid "Only show customers trading in"
@@ -1349,7 +1387,7 @@
#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
#: PrintCustTransPortrait.php:609 ReorderLevel.php:259 StockDispatch.php:449
-#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
+#: SuppPriceList.php:260 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
msgid "Print PDF"
msgstr "( PDF )"
@@ -1523,17 +1561,6 @@
msgid "Show on Screen (HTML)"
msgstr "Ekran (HTML) göster"
-#: AnalysisHorizontalIncome.php:121 AnalysisHorizontalIncome.php:522
-#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
-#: DailyBankTransactions.php:257 GLAccountUsers.php:253 GLBalanceSheet.php:720
-#: GLCashFlowsIndirect.php:741 GLCashFlowsIndirect.php:774
-#: GLCashFlowsSetup.php:181 GLProfit_Loss.php:1317 GLTrialBalance.php:740
-#: InternalStockRequestInquiry.php:264 SecurityTokens.php:140
-#: SecurityTokens.php:156 UserGLAccounts.php:259
-#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
-msgid "Return"
-msgstr ""
-
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147 GLProfit_Loss.php:577
#: GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "A period up to 12 months in duration can be specified"
@@ -1889,8 +1916,8 @@
#: SupplierTransInquiry.php:31 SystemParameters.php:1119
#: SystemParameters.php:1125 SystemParameters.php:1131
#: SystemParameters.php:1137 SystemParameters.php:1143 TopItems.php:32
-#: TopItems.php:49 TopItems.php:71 TopItems.php:73 WorkOrderEntry.php:902
-#: WorkOrderEntry.php:905 WorkOrderIssue.php:964 WorkOrderIssue.php:967
+#: TopItems.php:49 TopItems.php:71 TopItems.php:73 WorkOrderEntry.php:903
+#: WorkOrderEntry.php:906 WorkOrderIssue.php:964 WorkOrderIssue.php:967
#: reportwriter/languages/en_US/reports.php:54
msgid "All"
msgstr "HEPSI"
@@ -1917,7 +1944,7 @@
#: AuditTrail.php:176 BankAccountUsers.php:77 BankAccountUsers.php:90
#: GLAccountUsers.php:117 GLAccountUsers.php:129 GLAccountUsers.php:140
#: LocationUsers.php:77 LocationUsers.php:90 LocationUsers.php:100
-#: PcReportTab.php:266 UserBankAccounts.php:77 UserBankAccounts.php:90
+#: PcReportTab.php:269 UserBankAccounts.php:77 UserBankAccounts.php:90
#: UserGLAccounts.php:118 UserGLAccounts.php:130 UserGLAccounts.php:146
#: UserLocations.php:77 UserLocations.php:90 UserLocations.php:100
#: includes/header.inc:59
@@ -1990,12 +2017,12 @@
#: SelectOrderItems.php:1643 SelectProduct.php:324 SelectProduct.php:829
#: SelectQASamples.php:298 SelectSalesOrder.php:602 SelectSupplier.php:282
#: SelectWorkOrder.php:218 SellThroughSupport.php:159 Shipt_Select.php:190
-#: SpecialOrder.php:148 StockCategories.php:263 SuppPriceList.php:308
+#: SpecialOrder.php:148 StockCategories.php:263 SuppPriceList.php:305
#: SupplierPriceList.php:275 SupplierPriceList.php:466
#: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852
#: SupplierTenders.php:686 TestPlanResults.php:176 TopItems.php:169
#: UserBankAccounts.php:163 UserGLAccounts.php:156 UserLocations.php:175
-#: WorkOrderEntry.php:971 WorkOrderIssue.php:1008
+#: WorkOrderEntry.php:972 WorkOrderIssue.php:1008
#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75
#: ../webSHOP/ItemDetails.php:72
msgid "Code"
@@ -2003,7 +2030,7 @@
#: AutomaticTranslationDescriptions.php:38 CustomerTransInquiry.php:52
#: FixedAssetRegister.php:366 GLJournalInquiry.php:45 GLJournalInquiry.php:62
-#: POReport.php:519 POReport.php:1535 PcReportTab.php:269
+#: POReport.php:519 POReport.php:1535 PcReportTab.php:272
#: PcTabExpensesList.php:211 SalesAnalRepts.php:436 SalesAnalRepts.php:464
#: SalesAnalRepts.php:493 SalesAnalRepts.php:512 SalesInquiry.php:798
#: SalesInquiry.php:1107 StockDispatch.php:515 StockLocTransferReceive.php:106
@@ -2162,7 +2189,7 @@
#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:395
#: PDFReceipt.php:34 PO_Header.php:848 PO_PDFPurchOrder.php:64
#: PO_SelectOSPurchOrder.php:646 PrintWOItemSlip.php:142 ReorderLevel.php:283
-#: StockDispatch.php:479 SuppPriceList.php:292
+#: StockDispatch.php:479 SuppPriceList.php:289
#: includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBOMListingPageHeader.inc:26
@@ -2201,7 +2228,7 @@
#: PrintCustOrder.php:175 PrintCustTransPortrait.php:813
#: PrintCustTransPortrait.php:1035 PrintCustTransPortrait.php:1091
#: PrintWOItemSlip.php:143 ReorderLevel.php:284 StockDispatch.php:480
-#: SuppPriceList.php:293 includes/PDFAgedDebtorsPageHeader.inc:34
+#: SuppPriceList.php:290 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBOMListingPageHeader.inc:26
#: includes/PDFBalanceSheetPageHeader.inc:26
@@ -2336,9 +2363,14 @@
msgid "WC"
msgstr "WC"
-#: BOMIndented.php:326
-msgid "Assembly:"
-msgstr "Montaj:"
+#: BOMIndented.php:326 BOMs.php:499 ConfirmDispatch_Invoice.php:1052
+#: CounterReturns.php:1074 CounterSales.php:1474 Credit_Invoice.php:823
+#: Credit_Invoice.php:853 SelectCreditItems.php:1501 StockClone.php:863
+#: StockClone.php:865 Stocks.php:1191 Stocks.php:1193
+#: api/api_debtortransactions.php:753 api/api_salesorders.php:920
+#: reportwriter/languages/en_US/reports.php:56
+msgid "Assembly"
+msgstr "MONTAJ"
#: BOMIndented.php:331 BOMIndentedReverse.php:307
msgid " 12345678901234567890"
@@ -2398,14 +2430,14 @@
#: BOMInquiry.php:26 BOMs.php:997 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:288 PO_SelectPurchOrder.php:190
#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
-#: WorkOrderEntry.php:932 WorkOrderIssue.php:980
+#: WorkOrderEntry.php:933 WorkOrderIssue.php:980
msgid "Enter text extracts in the"
msgstr "ARANACAK >>"
#: BOMInquiry.php:26 BOMs.php:997 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:288 PO_SelectPurchOrder.php:190
#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
-#: WorkOrderEntry.php:932 WorkOrderIssue.php:980
+#: WorkOrderEntry.php:933 WorkOrderIssue.php:980
msgid "description"
msgstr "AÇIKLAMA"
@@ -2429,7 +2461,7 @@
#: SuppFixedAssetChgs.php:126 SupplierPriceList.php:54
#: SupplierPriceList.php:414 SupplierTenderCreate.php:566
#: SupplierTenderCreate.php:706 SupplierTenders.php:433 TestPlanResults.php:158
-#: WorkOrderEntry.php:937 WorkOrderEntry.php:941 WorkOrderEntry.php:943
+#: WorkOrderEntry.php:938 WorkOrderEntry.php:942 WorkOrderEntry.php:944
#: WorkOrderIssue.php:985
msgid "OR"
msgstr "veya"
@@ -2437,7 +2469,7 @@
#: BOMInquiry.php:29 BOMs.php:1000 MRPDemands.php:339
#: PO_SelectOSPurchOrder.php:292 PO_SelectPurchOrder.php:195
#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158
-#: WorkOrderEntry.php:937 WorkOrderIssue.php:985
+#: WorkOrderEntry.php:938 WorkOrderIssue.php:985
msgid "Enter extract of the"
msgstr "ARANACAK >>"
@@ -2454,7 +2486,7 @@
#: StockMovements.php:36 StockReorderLevel.php:51 StockStatus.php:62
#: StockTransfers.php:49 StockTransfers.php:552 StockUsage.php:64
#: SupplierPriceList.php:54 SupplierTenderCreate.php:706
-#: SupplierTenders.php:433 TestPlanResults.php:158 WorkOrderEntry.php:937
+#: SupplierTenders.php:433 TestPlanResults.php:158 WorkOrderEntry.php:938
#: WorkOrderIssue.php:985 Z_ChangeStockCode.php:200
#: ../webSHOP/includes/PlaceOrder.php:235
msgid "Stock Code"
@@ -2470,7 +2502,7 @@
#: SelectProduct.php:569 SelectSupplier.php:243 SelectSupplier.php:276
#: SupplierPriceList.php:66 SupplierTenderCreate.php:572
#: SupplierTenderCreate.php:611 SupplierTenderCreate.php:717
-#: SupplierTenders.php:445 WorkOrderEntry.php:949 WorkOrderIssue.php:992
+#: SupplierTenders.php:445 WorkOrderEntry.php:950 WorkOrderIssue.php:992
msgid "Search Now"
msgstr "ARA"
@@ -2481,7 +2513,7 @@
#: SelectCreditItems.php:302 SelectProduct.php:582 SelectQASamples.php:176
#: SelectSalesOrder.php:1035 SelectWorkOrder.php:51 Shipt_Select.php:61
#: SupplierPriceList.php:81 SupplierTenderCreate.php:731
-#: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:111
+#: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:112
#: WorkOrderIssue.php:630
msgid ""
"Stock description keywords have been used in preference to the Stock code "
@@ -2518,7 +2550,7 @@
#: Shipt_Select.php:194 StockLocTransferReceive.php:546
#: SupplierPriceList.php:277 SupplierTenderCreate.php:854
#: SupplierTenders.php:688 TestPlanResults.php:179 TestPlanResults.php:510
-#: TopItems.php:172 WorkOrderCosting.php:100 WorkOrderEntry.php:973
+#: TopItems.php:172 WorkOrderCosting.php:100 WorkOrderEntry.php:974
#: WorkOrderIssue.php:1010 WorkOrderIssue.php:1090
#: includes/PDFInventoryValnPageHeader.inc:34 includes/DefineLabelClass.php:21
msgid "Units"
@@ -2666,7 +2698,7 @@
#: SelectOrderItems.php:1653 SelectProduct.php:441 StockClone.php:116
#: StockClone.php:741 StockClone.php:746 StockClone.php:751 StockClone.php:755
#: Stocks.php:1065 Stocks.php:1068 Stocks.php:1081 SupplierTenderCreate.php:884
-#: SupplierTenders.php:720 WorkOrderEntry.php:997 WorkOrderIssue.php:1032
+#: SupplierTenders.php:720 WorkOrderEntry.php:998 WorkOrderIssue.php:1032
#: reportwriter/languages/en_US/reports.php:270
#, php-format
msgid "No Image"
@@ -2687,7 +2719,7 @@
msgstr ""
#: BOMs.php:308 StockAdjustments.php:165 StockTransfers.php:173
-#: WorkOrderEntry.php:493
+#: WorkOrderEntry.php:494
msgid "The quantity entered must be numeric"
msgstr "GIRILEN MIKTAR NÜMERIK OLMALI"
@@ -2815,14 +2847,6 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL KOMUTU:"
-#: BOMs.php:499 ConfirmDispatch_Invoice.php:1052 CounterReturns.php:1074
-#: CounterSales.php:1474 Credit_Invoice.php:823 Credit_Invoice.php:853
-#: SelectCreditItems.php:1501 StockClone.php:863 StockClone.php:865
-#: Stocks.php:1191 Stocks.php:1193 api/api_debtortransactions.php:753
-#: api/api_salesorders.php:920 reportwriter/languages/en_US/reports.php:56
-msgid "Assembly"
-msgstr "MONTAJ"
-
#: BOMs.php:502 FixedAssetRegister.php:390 StockClone.php:883
#: StockClone.php:885 Stocks.php:1211 Stocks.php:1213
msgid "Purchased"
@@ -2981,7 +3005,7 @@
msgid "Auto Issue this Component to Work Orders"
msgstr "Otomatik Sayı Bu Bileşen Siparişler Çalışma"
-#: BOMs.php:909 WorkOrderEntry.php:805
+#: BOMs.php:909 WorkOrderEntry.php:806
msgid "Remark"
msgstr ""
@@ -3098,14 +3122,14 @@
msgstr ""
#: BankAccountUsers.php:129 BankAccountUsers.php:228 CustomerReceipt.php:961
-#: CustomerReceipt.php:1179 CustomerTypes.php:269 ExchangeRateTrend.php:56
+#: CustomerReceipt.php:1179 CustomerTypes.php:269 ExchangeRateTrend.php:55
#: FreightCosts.php:60 GLAccountUsers.php:74 GLJournal.php:139
#: GLJournal.php:378 InternalStockCategoriesByRole.php:136
#: InternalStockCategoriesByRole.php:226 LocationUsers.php:136
#: LocationUsers.php:253 OffersReceived.php:114 Payments.php:1123
#: PcAssignCashTabToTab.php:181 PcAssignCashTabToTab.php:385
#: PcAssignCashToTab.php:195 PcAssignCashToTab.php:412
-#: PcAuthorizeExpenses.php:337 PcClaimExpensesFromTab.php:178
+#: PcAuthorizeExpenses.php:338 PcClaimExpensesFromTab.php:178
#: PcClaimExpensesFromTab.php:426 PcExpenses.php:350 PcExpensesTypeTab.php:139
#: PcExpensesTypeTab.php:229 PcTabs.php:509 PcTypeTabs.php:253
#: SalesTypes.php:282 SupplierTypes.php:236 UserBankAccounts.php:127
@@ -3120,7 +3144,7 @@
#: LocationUsers.php:137 LocationUsers.php:254 Payments.php:1124
#: PcAssignCashTabToTab.php:182 PcAssignCashTabToTab.php:386
#: PcAssignCashToTab.php:196 PcAssignCashToTab.php:413
-#: PcAuthorizeExpenses.php:338 PcClaimExpensesFromTab.php:179
+#: PcAuthorizeExpenses.php:339 PcClaimExpensesFromTab.php:179
#: PcClaimExpensesFromTab.php:427 PcExpenses.php:351 PcExpensesTypeTab.php:140
#: PcExpensesTypeTab.php:230 PcTabs.php:510 PcTypeTabs.php:254
#: SalesTypes.php:282 SecurityTokens.php:138 SelectCreditItems.php:955
@@ -3285,10 +3309,10 @@
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210
#: PO_AuthorisationLevels.php:216 PO_AuthoriseMyOrders.php:115
#: PO_Header.php:564 PO_SelectOSPurchOrder.php:597 PO_SelectPurchOrder.php:434
-#: PcReportTab.php:274 PcTabs.php:228 PcTabs.php:375 PriceMatrix.php:166
+#: PcReportTab.php:277 PcTabs.php:228 PcTabs.php:375 PriceMatrix.php:166
#: PriceMatrix.php:264 Prices.php:220 Prices.php:292 PricesByCost.php:282
#: PurchData.php:276 PurchData.php:471 PurchData.php:612 SelectSupplier.php:284
-#: SellThroughSupport.php:161 SuppPriceList.php:303 SupplierCredit.php:263
+#: SellThroughSupport.php:161 SuppPriceList.php:300 SupplierCredit.php:263
#: SupplierInvoice.php:607 SupplierPriceList.php:468
#: SupplierTenderCreate.php:619 SupplierTenders.php:126 SupplierTenders.php:536
#: SupplierTransInquiry.php:117 Z_ImportPriceList.php:98
@@ -3428,7 +3452,7 @@
#: PDFOrderStatus.php:274 PDFOrdersInvoiced.php:87 PDFOrdersInvoiced.php:261
#: PDFRemittanceAdvice.php:48 PDFSalesBySalesperson.php:65 PDFWOPrint.php:505
#: PDFWeeklyOrders.php:61 PO_PDFPurchOrder.php:358 Payments.php:800
-#: PcAssignCashTabToTab.php:117 PcReportTab.php:110 PricesBasedOnMarkUp.php:219
+#: PcAssignCashTabToTab.php:117 PcReportTab.php:113 PricesBasedOnMarkUp.php:219
#: PricesBasedOnMarkUp.php:358 PrintCustStatements.php:94 PrintCustTrans.php:56
#: PrintCustTrans.php:57 PrintCustTrans.php:60 PrintCustTransPortrait.php:62
#: PrintCustTransPortrait.php:65 SalesGraph.php:222 SalesGraph.php:251
@@ -3546,9 +3570,9 @@
#: ImportBankTransAnalysis.php:281 PaymentAllocations.php:67 Payments.php:1111
#: Payments.php:1116 Payments.php:1132 PcAssignCashTabToTab.php:240
#: PcAssignCashTabToTab.php:356 PcAssignCashToTab.php:254
-#: PcAssignCashToTab.php:385 PcAuthorizeExpenses.php:95
+#: PcAssignCashToTab.php:385 PcAuthorizeExpenses.php:96
#: PcClaimExpensesFromTab.php:240 PcClaimExpensesFromTab.php:400
-#: PcReportTab.php:179 PcReportTab.php:332 PrintCheque.php:83
+#: PcReportTab.php:182 PcReportTab.php:335 PrintCheque.php:83
#: PrintCheque.php:97 SelectCreditItems.php:696 SuppContractChgs.php:79
#: SuppContractChgs.php:164 SuppFixedAssetChgs.php:79
#: SuppFixedAssetChgs.php:153 SuppShiptChgs.php:81 SuppShiptChgs.php:147
@@ -3706,7 +3730,7 @@
#: ShiptsList.php:37 StockCounts.php:144 StockCounts.php:169
#: StockCounts.php:216 StockLocMovements.php:95 StockMovements.php:110
#: SuppWhereAlloc.php:135 SupplierInquiry.php:207 Tax.php:412
-#: WorkOrderEntry.php:798 Z_CheckAllocs.php:64
+#: WorkOrderEntry.php:799 Z_CheckAllocs.php:64
#: includes/PDFBankingSummaryPageHeader.inc:40
#: includes/PDFCustTransListingPageHeader.inc:49
#: includes/PDFPeriodStockTransListingPageHeader.inc:48
@@ -3761,7 +3785,7 @@
#: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:836
#: Customers.php:1194 SelectOrderItems.php:1395 Stocks.php:1458
-#: WorkOrderCosting.php:567 WorkOrderEntry.php:888
+#: WorkOrderCosting.php:567 WorkOrderEntry.php:889
msgid "Are You Sure?"
msgstr "EMIN MISINIZ?"
@@ -3871,7 +3895,7 @@
#: PDFPriceList.php:144 PDFPriceList.php:285 PDFPriceList.php:390
#: PDFPriceList.php:392 PricesBasedOnMarkUp.php:226 PricesByCost.php:268
#: SalesGLPostings.php:365 SelectOrderItems.php:697 SuppPriceList.php:138
-#: SuppPriceList.php:251
+#: SuppPriceList.php:250
msgid "Price List"
msgstr "FIYAT LISTESI"
@@ -4026,7 +4050,7 @@
#: PO_SelectPurchOrder.php:181 SelectCompletedOrder.php:468
#: SelectCreditItems.php:981 SelectQASamples.php:266 SelectSalesOrder.php:573
#: SelectWorkOrder.php:193 Shipt_Select.php:158 TestPlanResults.php:144
-#: WorkOrderEntry.php:899 WorkOrderIssue.php:961
+#: WorkOrderEntry.php:900 WorkOrderIssue.php:961
msgid "Select a stock category"
msgstr "STOK KATEGORISI"
@@ -4131,7 +4155,7 @@
#: CollectiveWorkOrderCost.php:448 Prices.php:223 PricesByCost.php:156
#: Prices_Customer.php:354 RecurringSalesOrders.php:428 SelectWorkOrder.php:337
-#: WorkOrderEntry.php:782 WorkOrderStatus.php:85
+#: WorkOrderEntry.php:783 WorkOrderStatus.php:85
msgid "Start Date"
msgstr "BASLANGIÇ TARIHI"
@@ -4163,7 +4187,7 @@
msgid "The company name must be entered and be fifty characters or less long"
msgstr "FIRMA ADI GIRISI ZORUNLUDUR VE 50 KARAKTERDEN KISA OLMALIDIR"
-#: CompanyPreferences.php:37 Suppliers.php:374 Z_ImportSuppliers.php:177
+#: CompanyPreferences.php:37 Suppliers.php:374 Z_ImportSuppliers.php:178
msgid "The email address is not correctly formed"
msgstr "E-posta adresi doğru oluşmuş değil"
@@ -4419,26 +4443,6 @@
"Only balance sheet general ledger accounts can be selected."
msgstr ""
-#: 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: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
-#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:981
-#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293 PricesByCost.php:223
-#: PurchData.php:758 ReorderLevelLocation.php:140 RevisionTranslations.php:111
-#: SMTPServer.php:126 SecurityTokens.php:136 SelectCreditItems.php:954
-#: SellThroughSupport.php:476 ShopParameters.php:610 StockCostUpdate.php:196
-#: StockReorderLevel.php:111 Stocks.php:1452 SystemParameters.php:1246
-#: UserGLAccounts.php:159 UserLocations.php:178 WOSerialNos.php:345
-#: WorkOrderEntry.php:886 reportwriter/languages/en_US/reports.php:156
-msgid "Update"
-msgstr "GÜNCELLE"
-
#: ConfirmDispatchControlled_Invoice.php:8
msgid "Specify Dispatched Controlled Items"
msgstr "Belirtmek Kontrollü Öğeler gönderilir"
@@ -4714,7 +4718,7 @@
#: SelectOrderItems.php:1316 SelectProduct.php:169 Shipments.php:403
#: StockLocMovements.php:96 StockMovements.php:111 StockStatus.php:331
#: SuppCreditGRNs.php:197 SuppCreditGRNs.php:293 SuppCreditGRNs.php:294
-#: SuppPriceList.php:311 SupplierPriceList.php:543 SupplierTenders.php:127
+#: SuppPriceList.php:308 SupplierPriceList.php:543 SupplierTenders.php:127
#: SupplierTenders.php:329 SupplierTenders.php:537 SupplierTenders.php:...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-23 19:08:11
|
Revision: 7679
http://sourceforge.net/p/web-erp/reponame/7679
Author: rchacon
Date: 2016-11-23 19:08:09 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Removes ':' from text.
Modified Paths:
--------------
trunk/BOMIndented.php
trunk/MaintenanceReminders.php
trunk/PDFStockCheckComparison.php
trunk/PcReportTab.php
trunk/SuppPriceList.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/BOMIndented.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Shows the bill of material indented for each level */
// BOMIndented.php - Indented Bill of Materials
@@ -323,7 +323,7 @@
$FontSize=8;
$YPos =$YPos - (2*$line_height);
- $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly:'),'',0);
+ $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly').':','',0);
$pdf->addTextWrap(85,$YPos,100,$FontSize,mb_strtoupper($_POST['Part']),'',0);
$pdf->addTextWrap(185,$YPos,150,$FontSize,$assemblydesc,'',0);
$YPos -=(2*$line_height);
Modified: trunk/MaintenanceReminders.php
===================================================================
--- trunk/MaintenanceReminders.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/MaintenanceReminders.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -34,7 +34,7 @@
${'Mail' . $myrow['userresponsible']}->setSubject('Maintenance Tasks Reminder');
${'Mail' . $myrow['userresponsible']}->setFrom('Do_not_reply <>');
}
- $MailText .= "Asset: " . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
+ $MailText .= 'Asset' . ': ' . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
if (Date1GreaterThanDate2(ConvertSQLDate($myrow['duedate']),Date($_SESSION['DefaultDateFormat']))) {
$MailText .= _('NB: THIS JOB IS OVERDUE');
}
@@ -74,7 +74,7 @@
${'Mail' . $myrow['manager']}->setSubject('Overdue Maintenance Tasks Reminder');
${'Mail' . $myrow['manager']}->setFrom('Do_not_reply <>');
}
- $MailText .= _('Asset:') .' ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
+ $MailText .= _('Asset') . ': ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
$MailText . "\n\n";
}
if (DB_num_rows($result)>0){
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/PDFStockCheckComparison.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Creates a pdf comparing the quantites entered as counted at a given range of locations against the quantity stored as on hand as at the time a stock check was initiated. */
include('includes/session.inc');
@@ -219,7 +219,7 @@
$FirstRow = DB_fetch_array($CheckedItems);
$LocationName = $FirstRow['locationname'];
DB_data_seek($CheckedItems,0);
-
+
include ('includes/PDFStockComparisonPageHeader.inc');
$Location = '';
@@ -254,7 +254,7 @@
$YPos -=$line_height;
}
-
+
$SQL = "SELECT qtycounted,
reference
FROM stockcounts
@@ -279,7 +279,7 @@
$YPos -=$line_height;
$FontSize=8;
if (mb_strlen($CheckItemRow['bin'])>0){
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin:') . $CheckItemRow['bin'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin') . ':' . $CheckItemRow['bin'], 'left');
} else {
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
}
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/PcReportTab.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,11 +1,14 @@
<?php
-
/* $Id$ */
+/* */
include ('includes/session.inc');
+$Title = _('Petty Cash Management Report');
+$ViewTopic = 'PettyCash';
+$BookMark = 'PcReportTab';
+
include ('includes/SQL_CommonFunctions.inc');
-$Title = _('Petty Cash Management Report');
if (isset($_POST['SelectedTabs'])){
$SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
@@ -13,7 +16,7 @@
$SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
-if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])){
+if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])) {
include ('includes/header.inc');
@@ -78,7 +81,7 @@
</div>
</form>';
-} else if (isset($_POST['PrintPDF'])) {
+} elseif (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
$PageNumber = 0;
@@ -138,34 +141,34 @@
$YPos -= (2 * $line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Tab Code :'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$SelectedTabs);
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('From'). ' ');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['FromDate']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('User '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['usercode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('To '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Currency '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['currency']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Balance before '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+55,$YPos,70,$FontSize,$_POST['FromDate']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,locale_number_format($Balance['0'],$_SESSION['CompanyRecord']['decimalplaces']));
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,70,$FontSize,$Tabs['currency']);
@@ -222,7 +225,7 @@
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin+70,$YPos,100,$FontSize,_('Balance at'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$_POST['ToDate']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,70,$FontSize,locale_number_format($Amount[0],$_SESSION['CompanyRecord']['decimalplaces']),'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,70,$FontSize,$Tabs['currency']);
$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/SuppPriceList.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* */
include('includes/session.inc');
@@ -246,7 +246,6 @@
}
echo '</select></td>
</tr>';
-
echo '<tr>
<td>' . _('Price List') . ':</td>
<td><select name="price">
@@ -255,8 +254,6 @@
</select>
</td>
</tr>';
-
-
echo '</table>
<br/>
<div class="centre">
@@ -293,15 +290,15 @@
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Supplier').' ');
- $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$SupplierName);
+ $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$SupplierName);
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category').' ');
- $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$Categoryname);
+ $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$Categoryname);
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Currency').' ');
- $pdf->addTextWrap(95,$YPos,50,$FontSize,_(': ').$CurrCode);
+ $pdf->addTextWrap(95,$YPos,50,$FontSize,': '.$CurrCode);
$YPos -=(2*$line_height);
/*set up the headings */
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-23 17:15:37 UTC (rev 7678)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-23 08:21-0600\n"
+"PO-Revision-Date: 2016-11-23 13:05-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -23793,7 +23793,7 @@
#: PcReportTab.php:168 PcReportTab.php:225 SuppPriceList.php:296
#: SuppPriceList.php:301 SuppPriceList.php:304
msgid ": "
-msgstr ":"
+msgstr ": "
#: PcReportTab.php:148
msgid "User "
|
|
From: <rc...@us...> - 2016-11-23 17:15:39
|
Revision: 7678
http://sourceforge.net/p/web-erp/reponame/7678
Author: rchacon
Date: 2016-11-23 17:15:37 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Add navigation aids (return button).
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/doc/Change.log
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2016-11-23 16:05:02 UTC (rev 7677)
+++ trunk/AccountGroups.php 2016-11-23 17:15:37 UTC (rev 7678)
@@ -11,14 +11,13 @@
include('includes/SQL_CommonFunctions.inc');
-function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
+function CheckForRecursiveGroup($ParentGroupName, $GroupName, $db) {
/* returns true ie 1 if the group contains the parent group as a child group
ie the parent group results in a recursive group structure otherwise false ie 0 */
$ErrMsg = _('An error occurred in retrieving the account groups of the parent account group during the check for recursion');
$DbgMsg = _('The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was');
-
do {
$sql = "SELECT parentgroupname
FROM accountgroups
@@ -26,22 +25,22 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_row($result);
- if ($ParentGroupName == $myrow[0]){
+ if($ParentGroupName == $myrow[0]) {
return true;
}
$GroupName = $myrow[0];
- } while ($myrow[0]!='');
+ } while($myrow[0] != '');
return false;
-} //end of function CheckForRecursiveGroupName
+}// END of function CheckForRecursiveGroupName
// If $Errors is set, then unset it.
-if (isset($Errors)) {
+if(isset($Errors)) {
unset($Errors);
}
$Errors = array();
-if (isset($_POST['MoveGroup'])) {
+if(isset($_POST['MoveGroup'])) {
$sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
$ErrMsg = _('An error occurred in moving the account group');
$DbgMsg = _('The SQL that was used to move the account group was');
@@ -50,7 +49,7 @@
prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');
}
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -72,26 +71,26 @@
$result=DB_query($sql,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_row($result);
- if ($myrow[0] != 0 AND $_POST['SelectedAccountGroup'] == '') {
+ if($myrow[0] != 0 AND $_POST['SelectedAccountGroup'] == '') {
$InputError = 1;
prnMsg( _('The account group name already exists in the database'),'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if (ContainsIllegalCharacters($_POST['GroupName'])) {
+ if(ContainsIllegalCharacters($_POST['GroupName'])) {
$InputError = 1;
prnMsg( _('The account group name cannot contain the character') . " '&' " . _('or the character') ."' '",'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if (mb_strlen($_POST['GroupName'])==0){
+ if(mb_strlen($_POST['GroupName'])==0) {
$InputError = 1;
prnMsg( _('The account group name must be at least one character long'),'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if ($_POST['ParentGroupName'] !=''){
- if (CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'],$db)) {
+ if($_POST['ParentGroupName'] !='') {
+ if(CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'],$db)) {
$InputError =1;
prnMsg(_('The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group'),'error');
$Errors[$i] = 'ParentGroupName';
@@ -115,19 +114,19 @@
prnMsg(_('Since this account group is a child group, the sequence in the trial balance, the section in the accounts and whether or not the account group appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect.'),'warn');
}
}
- if (!ctype_digit($_POST['SectionInAccounts'])) {
+ if(!ctype_digit($_POST['SectionInAccounts'])) {
$InputError = 1;
prnMsg( _('The section in accounts must be an integer'),'error');
$Errors[$i] = 'SectionInAccounts';
$i++;
}
- if (!ctype_digit($_POST['SequenceInTB'])) {
+ if(!ctype_digit($_POST['SequenceInTB'])) {
$InputError = 1;
prnMsg( _('The sequence in the trial balance must be an integer'),'error');
$Errors[$i] = 'SequenceInTB';
$i++;
}
- if (!ctype_digit($_POST['SequenceInTB']) OR $_POST['SequenceInTB'] > 10000) {
+ if(!ctype_digit($_POST['SequenceInTB']) OR $_POST['SequenceInTB'] > 10000) {
$InputError = 1;
prnMsg( _('The sequence in the TB must be numeric and less than') . ' 10,000','error');
$Errors[$i] = 'SequenceInTB';
@@ -135,10 +134,10 @@
}
- if ($_POST['SelectedAccountGroup']!='' AND $InputError !=1) {
+ if($_POST['SelectedAccountGroup']!='' AND $InputError !=1) {
/*SelectedAccountGroup 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 ($_POST['SelectedAccountGroup']!==$_POST['GroupName']) {
+ if($_POST['SelectedAccountGroup']!==$_POST['GroupName']) {
DB_IgnoreForeignKeys();
@@ -169,7 +168,7 @@
$DbgMsg = _('The SQL that was used to update the account group was');
$msg = _('Record Updated');
- } elseif ($InputError !=1) {
+ } elseif($InputError !=1) {
/*Selected group is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new account group form */
@@ -189,7 +188,7 @@
$msg = _('Record inserted');
}
- if ($InputError!=1){
+ if($InputError!=1) {
//run the SQL from either of the above possibilites
$result = DB_query($sql,$ErrMsg,$DbgMsg);
prnMsg($msg,'success');
@@ -198,7 +197,7 @@
unset ($_POST['SequenceInTB']);
}
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartMaster'
@@ -208,7 +207,7 @@
$DbgMsg = _('The SQL that was used to retrieve the information was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_array($result);
- if ($myrow['groups']>0) {
+ if($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
@@ -222,9 +221,9 @@
$sql = "SELECT groupname FROM accountgroups";
$GroupResult = DB_query($sql,$ErrMsg,$DbgMsg);
- while ($GroupRow = DB_fetch_array($GroupResult) ) {
+ while($GroupRow = DB_fetch_array($GroupResult) ) {
- if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$GroupRow['groupname']) {
+ if(isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$GroupRow['groupname']) {
echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8'). '</option>';
} else {
echo '<option value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
@@ -243,7 +242,7 @@
$DbgMsg = _('The SQL that was used to retrieve the information was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_array($result);
- if ($myrow['groupnames']>0) {
+ if($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
@@ -258,7 +257,7 @@
} //end if account group used in GL accounts
}
-if (!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
+if(!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
/* An account group could be posted when one has been edited and is being updated or GOT when selected for modification
SelectedAccountGroup will exist because it was sent with the page in a GET .
@@ -292,9 +291,9 @@
</tr>';
$k=0; //row colour counter
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -327,17 +326,17 @@
} //end of ifs and buts!
-if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
+if(isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
echo '<div class="centre"><br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
}
-if (!isset($_GET['delete'])) {
+if(!isset($_GET['delete'])) {
echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_GET['SelectedAccountGroup'])) {
+ if(isset($_GET['SelectedAccountGroup'])) {
//editing an existing account group
$sql = "SELECT groupname,
@@ -351,7 +350,7 @@
$ErrMsg = _('An error occurred in retrieving the account group information');
$DbgMsg = _('The SQL that was used to retrieve the account group and that failed in the process was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result) == 0) {
+ if(DB_num_rows($result) == 0) {
prnMsg( _('The account group name does not exist in the database'),'error');
include('includes/footer.inc');
exit;
@@ -370,45 +369,60 @@
<th colspan="2">', _('Edit Account Group Details'), '</th>
</tr>
</thead>
+ <tfoot>
+ <tr>
+ <td class="centre" colspan="2">',
+ '<button name="submit" tabindex="6" type="submit" value="Update"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Update'), '</button>', // "Update" button.
+ '<button onclick="window.location=\'AccountGroups.php\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</td>
+ </tr>
+ </tfoot>
<tbody>
<tr>
<td><input name="SelectedAccountGroup" type="hidden" value="', $_GET['SelectedAccountGroup'], '" /></td>
</tr>';
- } elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
+ } elseif(!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
- if (!isset($_POST['SelectedAccountGroup'])){
+ if(!isset($_POST['SelectedAccountGroup'])) {
$_POST['SelectedAccountGroup']='';
}
- if (!isset($_POST['GroupName'])){
+ if(!isset($_POST['GroupName'])) {
$_POST['GroupName']='';
}
- if (!isset($_POST['SectionInAccounts'])){
+ if(!isset($_POST['SectionInAccounts'])) {
$_POST['SectionInAccounts']='';
}
- if (!isset($_POST['SequenceInTB'])){
+ if(!isset($_POST['SequenceInTB'])) {
$_POST['SequenceInTB']='';
}
- if (!isset($_POST['PandL'])){
+ if(!isset($_POST['PandL'])) {
$_POST['PandL']='';
}
echo '<br />
- <table class="noprint selection">
- <thead>
+ <table class="noprint selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('New Account Group Details'), '</th>
+ </tr>
+ </thead>
+ <tfoot>
<tr>
- <th colspan="2">', _('New Account Group Details'), '</th>
+ <td class="centre" colspan="2">',
+ '<button name="submit" tabindex="6" type="submit" value="Insert"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Insert'), '</button>', // "Insert" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</td>
</tr>
- </thead>
- <tfoot>
- <tr>
- <td class="centre" colspan="2"><input name="submit" tabindex="6" type="submit" value="', _('Enter Information'), '" /></td>
- </tr>
- </tfoot>
- <tbody>
- <tr>
- <td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
- </tr>';
+ </tfoot>
+ <tbody>
+ <tr>
+ <td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
+ </tr>';
}
echo '<tr>
<td>', _('Account Group Name'), ':</td>
@@ -419,16 +433,14 @@
<td><select ',
( in_array('ParentGroupName',$Errors) ? 'class="selecterror" ' : '' ),
'name="ParentGroupName" tabindex="2">';
-
- $sql = "SELECT groupname FROM accountgroups";
- $groupresult = DB_query($sql,$ErrMsg,$DbgMsg);
echo '<option ',
( !isset($_POST['ParentGroupName']) ? 'selected="selected" ' : '' ),
'value="">', _('Top Level Group'), '</option>';
- while ( $grouprow = DB_fetch_array($groupresult) ) {
-
- if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
+ $sql = "SELECT groupname FROM accountgroups";
+ $groupresult = DB_query($sql,$ErrMsg,$DbgMsg);
+ while( $grouprow = DB_fetch_array($groupresult) ) {
+ if(isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
echo '<option selected="selected" value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
echo '<option value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
@@ -445,7 +457,7 @@
$sql = "SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid";
$secresult = DB_query($sql,$ErrMsg,$DbgMsg);
while( $secrow = DB_fetch_array($secresult) ) {
- if ($_POST['SectionInAccounts']==$secrow['sectionid']) {
+ if($_POST['SectionInAccounts']==$secrow['sectionid']) {
echo '<option selected="selected" value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
} else {
echo '<option value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
@@ -456,18 +468,13 @@
<tr>
<td>', _('Profit and Loss'), ':</td>
<td><select name="PandL" tabindex="4" title="', _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account'), '">';
-
- if ($_POST['PandL']!=0 ) {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ if($_POST['PandL']!=0 ) {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
} else {
- echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
+ '<option value="1">', _('Yes'), '</option>';
}
- if ($_POST['PandL']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- } else {
- echo '<option value="0">' . _('No') . '</option>';
- }
-
echo '</select></td>
</tr>
<tr>
@@ -481,5 +488,6 @@
</form>';
} //end if record deleted no point displaying form to add record
+
include('includes/footer.inc');
?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-23 16:05:02 UTC (rev 7677)
+++ trunk/doc/Change.log 2016-11-23 17:15:37 UTC (rev 7678)
@@ -1,5 +1,6 @@
webERP Change Log
+23/11/16 RChacon: On AccountGroups.php, add navigation aids (return button).
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.
|
|
From: <rc...@us...> - 2016-11-23 16:05:04
|
Revision: 7677
http://sourceforge.net/p/web-erp/reponame/7677
Author: rchacon
Date: 2016-11-23 16:05:02 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Standardise text.
Modified Paths:
--------------
trunk/ExchangeRateTrend.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2016-11-22 17:15:03 UTC (rev 7676)
+++ trunk/ExchangeRateTrend.php 2016-11-23 16:05:02 UTC (rev 7677)
@@ -3,9 +3,9 @@
/* This script shows the trend in exchange rates as retrieved from ECB. */
include('includes/session.inc');
-$Title = _('View Currency Trends');// Screen identification.
-$ViewTopic= 'Currencies';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'ExchangeRateTrend';// Anchor's id in the manual's html document.
+$Title = _('View Currency Trend');
+$ViewTopic= 'Currencies';
+$BookMark = 'ExchangeRateTrend';
include('includes/header.inc');
$FunctionalCurrency = $_SESSION['CompanyRecord']['currencydefault'];
@@ -23,12 +23,11 @@
echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<div class="centre">';
- echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/currency.png" title="' .// Icon image.
- _('View Currency Trend') . '" /> ' .// Icon title.
- _('View Currency Trend') . '</p>';// Page title.
- echo '</div><table>'; // First column
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/currency.png" title="', // Icon image.
+ _('View Currency Trend'), '" /> ', // Icon title.
+ _('View Currency Trend'), '</p>';// Page title.
+ echo '<table>'; // First column
$SQL = "SELECT currabrev FROM currencies";
$result=DB_query($SQL);
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-22 17:15:03 UTC (rev 7676)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-23 16:05:02 UTC (rev 7677)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-22 11:01-0600\n"
+"PO-Revision-Date: 2016-11-23 08:21-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -11948,7 +11948,7 @@
#: Departments.php:197
msgid "View all Departments"
-msgstr "Ver todos los Departamentos"
+msgstr "Ver todos los departamentos"
#: Departments.php:220
msgid "The selected departemnt could not be found."
@@ -12870,11 +12870,11 @@
#: ExchangeRateTrend.php:6
msgid "View Currency Trends"
-msgstr "Ver Tendencias de la Divisa"
+msgstr "Ver tendencia de la moneda"
#: ExchangeRateTrend.php:29 ExchangeRateTrend.php:30
msgid "View Currency Trend"
-msgstr "Ver Tendencia de la Divisa"
+msgstr "Ver tendencia de la moneda"
#: ExchangeRateTrend.php:76
msgid "Trend Currently Unavailable"
@@ -29849,7 +29849,7 @@
#: SelectSupplier.php:178
msgid "View All Purchase Orders"
-msgstr "Ver todas las Órdenes de Compra"
+msgstr "Ver todas las órdenes de compra"
#: SelectSupplier.php:180
msgid "List all open shipments for"
|
|
From: <rc...@us...> - 2016-11-22 17:15:05
|
Revision: 7676
http://sourceforge.net/p/web-erp/reponame/7676
Author: rchacon
Date: 2016-11-22 17:15:03 +0000 (Tue, 22 Nov 2016)
Log Message:
-----------
Standardise text.
Modified Paths:
--------------
trunk/Z_ImportDebtors.php
trunk/Z_ImportSuppliers.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
Modified: trunk/Z_ImportDebtors.php
===================================================================
--- trunk/Z_ImportDebtors.php 2016-11-21 14:55:36 UTC (rev 7675)
+++ trunk/Z_ImportDebtors.php 2016-11-22 17:15:03 UTC (rev 7676)
@@ -1,27 +1,28 @@
<?php
/* $Id: Z_ImportDebtors.php 6067 2013-07-10 02:04:22Z tehonu $*/
+/* Import debtors by csv file */
include('includes/session.inc');
$Title = _('Import Debtors And branches');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if(isset($_POST['FormID'])){
- if(!isset($_POST['AutoDebtorNo'])){
+if(isset($_POST['FormID'])) {
+ if(!isset($_POST['AutoDebtorNo'])) {
$_POST['AutoDebtorNo']=0;
- }else{
+ } else {
$_POST['AutoDebtorNo']=1;
}
- if($_POST['AutoDebtorNo']==1){
+ if($_POST['AutoDebtorNo']==1) {
$_POST['UpdateIfExists']=0;
- }else{
- if(!isset($_POST['UpdateIfExists'])){
+ } else {
+ if(!isset($_POST['UpdateIfExists'])) {
$_POST['UpdateIfExists']=0;
- }else{
+ } else {
$_POST['UpdateIfExists']=1;
}
}
-}else{
+} else {
$_POST['AutoDebtorNo']=$_SESSION['AutoDebtorNo'];
$_POST['UpdateIfExists']=0;
}
@@ -86,7 +87,7 @@
'custbranchcode', //53
);
-if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+if(isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//initialize
$FieldTarget = count($FieldHeadings);
@@ -101,7 +102,7 @@
//get the header row
$headRow = fgetcsv($FileHandle, 10000, ",");
//check for correct number of fields
- if ( count($headRow) != count($FieldHeadings) ) {
+ if( count($headRow) != count($FieldHeadings) ) {
prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -110,8 +111,8 @@
//test header row field name and sequence
$head = 0;
- foreach ($headRow as $headField) {
- if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ foreach($headRow as $headField) {
+ if( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -127,11 +128,11 @@
$row = 1;
$UpdatedNum=0;
$InsertNum=0;
- while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+ while( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
//check for correct number of fields
$fieldCount = count($filerow);
- if ($fieldCount != $FieldTarget){
+ if($fieldCount != $FieldTarget) {
prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -139,7 +140,7 @@
}
// cleanup the data (csv files often import with empty strings and such)
- foreach ($filerow as &$value) {
+ foreach($filerow as &$value) {
$value = trim($value);
}
@@ -175,9 +176,9 @@
$_POST['CustomerPOLine']=$filerow[29];
$_POST['typeid']=$filerow[30];
- if ($_POST['AutoDebtorNo']== 1) {
+ if($_POST['AutoDebtorNo']== 1) {
$_POST['DebtorNo'] = GetNextTransNo(500, $db);
- }else{
+ } else {
$_POST['DebtorNo'] = mb_strtoupper($_POST['DebtorNo']);
}
@@ -214,96 +215,96 @@
$_POST['SpecialInstructions']=$filerow[52];
$i=0;
- if ($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
+ if($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
$InputError = 1;
prnMsg( _('The debtor code cannot be empty'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
- } elseif ($_POST['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR mb_strpos($_POST['DebtorNo'], ' '))) {
+ } elseif($_POST['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR mb_strpos($_POST['DebtorNo'], ' '))) {
$InputError = 1;
prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
}
- if (mb_strlen($_POST['CustName']) > 40 OR mb_strlen($_POST['CustName'])==0) {
+ if(mb_strlen($_POST['CustName']) > 40 OR mb_strlen($_POST['CustName'])==0) {
$InputError = 1;
prnMsg( _('The customer name must be entered and be forty characters or less long'),'error');
$Errors[$i] = 'CustName';
$i++;
- } elseif (mb_strlen($_POST['Address1']) >40) {
+ } elseif(mb_strlen($_POST['Address1']) >40) {
$InputError = 1;
prnMsg( _('The Line 1 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address1';
$i++;
- } elseif (mb_strlen($_POST['Address2']) >40) {
+ } elseif(mb_strlen($_POST['Address2']) >40) {
$InputError = 1;
prnMsg( _('The Line 2 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address2';
$i++;
- } elseif (mb_strlen($_POST['Address3']) >40) {
+ } elseif(mb_strlen($_POST['Address3']) >40) {
$InputError = 1;
prnMsg( _('The Line 3 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address3';
$i++;
- } elseif (mb_strlen($_POST['Address4']) >50) {
+ } elseif(mb_strlen($_POST['Address4']) >50) {
$InputError = 1;
prnMsg( _('The Line 4 of the address must be fifty characters or less long'),'error');
$Errors[$i] = 'Address4';
$i++;
- } elseif (mb_strlen($_POST['Address5']) >20) {
+ } elseif(mb_strlen($_POST['Address5']) >20) {
$InputError = 1;
prnMsg( _('The Line 5 of the address must be twenty characters or less long'),'error');
$Errors[$i] = 'Address5';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['CreditLimit']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['CreditLimit']))) {
$InputError = 1;
prnMsg( _('The credit limit must be numeric'),'error');
$Errors[$i] = 'CreditLimit';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['PymtDiscount']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['PymtDiscount']))) {
$InputError = 1;
prnMsg( _('The payment discount must be numeric'),'error');
$Errors[$i] = 'PymtDiscount';
$i++;
- } elseif (!Is_Date($_POST['ClientSince'])) {
+ } elseif(!Is_Date($_POST['ClientSince'])) {
$InputError = 1;
prnMsg( _('The customer since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'ClientSince';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['Discount']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['Discount']))) {
$InputError = 1;
prnMsg( _('The discount percentage must be numeric'),'error');
$Errors[$i] = 'Discount';
$i++;
- } elseif (filter_number_format($_POST['CreditLimit']) <0) {
+ } elseif(filter_number_format($_POST['CreditLimit']) <0) {
$InputError = 1;
prnMsg( _('The credit limit must be a positive number'),'error');
$Errors[$i] = 'CreditLimit';
$i++;
- } elseif ((filter_number_format($_POST['PymtDiscount'])> 10) OR (filter_number_format($_POST['PymtDiscount']) <0)) {
+ } elseif((filter_number_format($_POST['PymtDiscount'])> 10) OR (filter_number_format($_POST['PymtDiscount']) <0)) {
$InputError = 1;
prnMsg( _('The payment discount is expected to be less than 10% and greater than or equal to 0'),'error');
$Errors[$i] = 'PymtDiscount';
$i++;
- } elseif ((filter_number_format($_POST['Discount'])> 100) OR (filter_number_format($_POST['Discount']) <0)) {
+ } elseif((filter_number_format($_POST['Discount'])> 100) OR (filter_number_format($_POST['Discount']) <0)) {
$InputError = 1;
prnMsg( _('The discount is expected to be less than 100% and greater than or equal to 0'),'error');
$Errors[$i] = 'Discount';
$i++;
}
- if (ContainsIllegalCharacters($_POST['EDIReference'])
+ if(ContainsIllegalCharacters($_POST['EDIReference'])
OR mb_strstr($_POST['EDIReference'],' ')) {
$InputError = 1;
prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
}
- if (mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)){
+ if(mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)) {
$InputError = 1;
prnMsg(_('The customers EDI reference code must be set when EDI Invoices or EDI orders are activated'),'warn');
$Errors[$i] = 'EDIReference';
$i++;
}
- if (mb_strlen($_POST['EDIAddress'])<4 AND $_POST['EDIInvoices']==1){
+ if(mb_strlen($_POST['EDIAddress'])<4 AND $_POST['EDIInvoices']==1) {
$InputError = 1;
prnMsg(_('The customers EDI email address or FTP server address must be entered if EDI Invoices are to be sent'),'warn');
$Errors[$i] = 'EDIAddress';
@@ -311,17 +312,17 @@
}
- if ($InputError !=1){
+ if($InputError !=1) {
$sql="SELECT 1 FROM debtorsmaster WHERE debtorno='".$_POST['DebtorNo']."' LIMIT 1";
$result=DB_query($sql);
$DebtorExists=(DB_num_rows($result)>0);
- if ($DebtorExists AND $_POST['UpdateIfExists']!=1) {
+ if($DebtorExists AND $_POST['UpdateIfExists']!=1) {
$UpdatedNum++;
- }else{
+ } else {
$SQL_ClientSince = FormatDateForSQL($_POST['ClientSince']);
- if ($DebtorExists) {//update
+ if($DebtorExists) {//update
$UpdatedNum++;
$sql = "SELECT 1
FROM debtortrans
@@ -329,16 +330,16 @@
$result = DB_query($sql);
$curr=false;
- if (DB_num_rows($result) == 0) {
+ if(DB_num_rows($result) == 0) {
$curr=true;
- }else{
+ } else {
$CurrSQL = "SELECT currcode
FROM debtorsmaster
where debtorno = '" . $_POST['DebtorNo'] . "'";
$CurrResult = DB_query($CurrSQL);
$CurrRow = DB_fetch_array($CurrResult);
$OldCurrency = $CurrRow[0];
- if ($OldCurrency != $_POST['CurrCode']) {
+ if($OldCurrency != $_POST['CurrCode']) {
prnMsg( _('The currency code cannot be updated as there are already transactions for this customer'),'info');
}
}
@@ -426,52 +427,52 @@
}
}
- }else{
+ } else {
break;
}
$i=0;
- if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
+ if(ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (mb_strlen($_POST['BranchCode'])==0) {
+ if(mb_strlen($_POST['BranchCode'])==0) {
$InputError = 1;
prnMsg(_('The Branch code must be at least one character long'),'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (!is_numeric($_POST['FwdDate'])) {
+ if(!is_numeric($_POST['FwdDate'])) {
$InputError = 1;
prnMsg(_('The date after which invoices are charged to the following month is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if ($_POST['FwdDate'] >30) {
+ if($_POST['FwdDate'] >30) {
$InputError = 1;
prnMsg(_('The date (in the month) after which invoices are charged to the following month should be a number less than 31'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if (!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
+ if(!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
$InputError = 1;
prnMsg(_('The estimated delivery days is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if (filter_number_format($_POST['EstDeliveryDays']) >60) {
+ if(filter_number_format($_POST['EstDeliveryDays']) >60) {
$InputError = 1;
prnMsg(_('The estimated delivery days should be a number of days less than 60') . '. ' . _('A package can be delivered by seafreight anywhere in the world normally in less than 60 days'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if ($InputError !=1){
- if (DB_error_no() ==0) {
+ if($InputError !=1) {
+ if(DB_error_no() ==0) {
$sql = "SELECT 1
FROM custbranch
@@ -479,18 +480,18 @@
branchcode='".$_POST['BranchCode']."' LIMIT 1";
$result=DB_query($sql);
$BranchExists=(DB_num_rows($result)>0);
- if ($BranchExists AND $_POST['UpdateIfExists']!=1) {
+ if($BranchExists AND $_POST['UpdateIfExists']!=1) {
//do nothing
- }else{
+ } else {
- if (!isset($_POST['EstDeliveryDays'])) {
+ if(!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=1;
}
- if (!isset($Latitude)) {
+ if(!isset($Latitude)) {
$Latitude=0.0;
$Longitude=0.0;
}
- if ($BranchExists) {
+ if($BranchExists) {
$sql = "UPDATE custbranch SET brname = '" . $_POST['BrName'] . "',
braddress1 = '" . $_POST['BrAddress1'] . "',
braddress2 = '" . $_POST['BrAddress2'] . "',
@@ -594,7 +595,7 @@
$result = DB_query($sql, $ErrMsg);
- if (DB_error_no() ==0) {
+ if(DB_error_no() ==0) {
prnMsg( _('New Item') .' ' . $StockID . ' '. _('has been added to the transaction'),'info');
} else { //location insert failed so set some useful error info
$InputError = 1;
@@ -608,29 +609,29 @@
}
- if ($InputError == 1) { //this row failed so exit loop
+ if($InputError == 1) { //this row failed so exit loop
break;
}
$row++;
}
- if ($InputError == 1) { //exited loop with errors so rollback
+ if($InputError == 1) { //exited loop with errors so rollback
prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
DB_Txn_Rollback();
} else { //all good so commit data transaction
DB_Txn_Commit();
prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
- if($_POST['UpdateIfExists']==1){
- prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
- }else{
- prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ if($_POST['UpdateIfExists']==1) {
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert') . ':' . $InsertNum );
+ } else {
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
}
}
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
Modified: trunk/Z_ImportSuppliers.php
===================================================================
--- trunk/Z_ImportSuppliers.php 2016-11-21 14:55:36 UTC (rev 7675)
+++ trunk/Z_ImportSuppliers.php 2016-11-22 17:15:03 UTC (rev 7676)
@@ -1,17 +1,18 @@
<?php
/* $Id: Z_ImportSuppliers.php 6067 2013-07-10 02:04:22Z tehonu $*/
+/* Import suppliers by csv file */
include('includes/session.inc');
$Title = _('Import Items');
include('includes/header.inc');
-if(isset($_POST['FormID'])){
- if(!isset($_POST['UpdateIfExists'])){
+if(isset($_POST['FormID'])) {
+ if(!isset($_POST['UpdateIfExists'])) {
$_POST['UpdateIfExists']=0;
- }else{
- $_POST['UpdateIfExists']=1;
+ } else {
+ $_POST['UpdateIfExists']=1;
}
-}else{
+} else {
$_POST['UpdateIfExists']=0;
}
// If this script is called with a file object, then the file contents are imported
@@ -45,7 +46,7 @@
'lng', //23
);
-if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+if(isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//initialize
$FieldTarget = count($FieldHeadings);
@@ -55,7 +56,7 @@
$FileName = $_FILES['userfile']['name'];
$TempName = $_FILES['userfile']['tmp_name'];
$FileSize = $_FILES['userfile']['size'];
-
+
//get file handle
$FileHandle = fopen($TempName, 'r');
@@ -63,7 +64,7 @@
$headRow = fgetcsv($FileHandle, 10000, ",");
//check for correct number of fields
- if ( count($headRow) != count($FieldHeadings) ) {
+ if( count($headRow) != count($FieldHeadings) ) {
prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -72,8 +73,8 @@
//test header row field name and sequence
$head = 0;
- foreach ($headRow as $headField) {
- if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ foreach($headRow as $headField) {
+ if( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -89,10 +90,10 @@
$row = 1;
$UpdatedNum=0;
$InsertNum=0;
- while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+ while( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
//check for correct number of fields
$fieldCount = count($filerow);
- if ($fieldCount != $FieldTarget){
+ if($fieldCount != $FieldTarget) {
prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -100,7 +101,7 @@
}
// cleanup the data (csv files often import with empty strings and such)
- foreach ($filerow as &$value) {
+ foreach($filerow as &$value) {
$value = trim($value);
}
@@ -133,7 +134,7 @@
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
- if (mb_strlen(trim($_POST['SuppName'])) > 40
+ if(mb_strlen(trim($_POST['SuppName'])) > 40
OR mb_strlen(trim($_POST['SuppName'])) == 0
OR trim($_POST['SuppName']) == '') {
@@ -142,56 +143,56 @@
$Errors[$i]='Name';
$i++;
}
- if (mb_strlen($SupplierID) == 0) {
+ if(mb_strlen($SupplierID) == 0) {
$InputError = 1;
prnMsg(_('The Supplier Code cannot be empty'),'error');
$Errors[$i]='ID';
$i++;
}
- if (ContainsIllegalCharacters($SupplierID)) {
+ if(ContainsIllegalCharacters($SupplierID)) {
$InputError = 1;
prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
$Errors[$i]='ID';
$i++;
}
- if (mb_strlen($_POST['Phone']) >25) {
+ if(mb_strlen($_POST['Phone']) >25) {
$InputError = 1;
prnMsg(_('The telephone number must be 25 characters or less long'),'error');
$Errors[$i] = 'Telephone';
$i++;
}
- if (mb_strlen($_POST['Fax']) >25) {
+ if(mb_strlen($_POST['Fax']) >25) {
$InputError = 1;
prnMsg(_('The fax number must be 25 characters or less long'),'error');
$Errors[$i] = 'Fax';
$i++;
}
- if (mb_strlen($_POST['Email']) >55) {
+ if(mb_strlen($_POST['Email']) >55) {
$InputError = 1;
prnMsg(_('The email address must be 55 characters or less long'),'error');
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
+ if(mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
$InputError = 1;
prnMsg(_('The email address is not correctly formed'),'error');
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['BankRef']) > 12) {
+ if(mb_strlen($_POST['BankRef']) > 12) {
$InputError = 1;
prnMsg(_('The bank reference text must be less than 12 characters long'),'error');
$Errors[$i]='BankRef';
$i++;
}
- if (!Is_Date($_POST['SupplierSince'])) {
+ if(!Is_Date($_POST['SupplierSince'])) {
$InputError = 1;
prnMsg(_('The supplier since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
$Errors[$i]='SupplierSince';
$i++;
}
- if ($InputError != 1){
+ if($InputError != 1) {
$SQL_SupplierSince = FormatDateForSQL($_POST['SupplierSince']);
@@ -202,9 +203,9 @@
$SuppExists = ($myrow[0]>0);
- if ($SuppExists AND $_POST['UpdateIfExists']!=1) {
+ if($SuppExists AND $_POST['UpdateIfExists']!=1) {
$UpdatedNum++;
- }elseif($SuppExists){
+ }elseif($SuppExists) {
$UpdatedNum++;
$supptranssql = "SELECT supplierno
FROM supptrans
@@ -229,7 +230,7 @@
fax = '". $_POST['Fax']."',
email = '" . $_POST['Email'] . "',
supptype = '".$_POST['SupplierType']."',";
- if ($supptrans == 0)$sql.="currcode='" . $_POST['CurrCode'] . "',";
+ if($supptrans == 0)$sql.="currcode='" . $_POST['CurrCode'] . "',";
$sql.="suppliersince='".$SQL_SupplierSince . "',
paymentterms='" . $_POST['PaymentTerms'] . "',
bankpartics='" . $_POST['BankPartics'] . "',
@@ -242,11 +243,11 @@
lng='" . $longitude ."',
taxref='". $_POST['TaxRef'] ."'
WHERE supplierid = '".$SupplierID."'";
-
- if ($suppcurr[0] != $_POST['CurrCode']) {
+
+ if($suppcurr[0] != $_POST['CurrCode']) {
prnMsg( _('Cannot change currency code as transactions already exist'), 'info');
}
-
+
$ErrMsg = _('The supplier could not be updated because');
$DbgMsg = _('The SQL that was used to update the supplier but failed was');
// echo $sql;
@@ -309,7 +310,7 @@
$result = DB_query($sql, $ErrMsg, $DbgMsg);
}
- if (DB_error_no() ==0) {
+ if(DB_error_no() ==0) {
} else { //location insert failed so set some useful error info
$InputError = 1;
@@ -317,7 +318,7 @@
} else { //item insert failed so set some useful error info
$InputError = 1;
}
- if ($InputError == 1) { //this row failed so exit loop
+ if($InputError == 1) { //this row failed so exit loop
break;
}
@@ -325,30 +326,30 @@
}
- if ($InputError == 1) { //exited loop with errors so rollback
+ if($InputError == 1) { //exited loop with errors so rollback
prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
DB_Txn_Rollback();
} else { //all good so commit data transaction
DB_Txn_Commit();
prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
- if($_POST['UpdateIfExists']==1){
- prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
- }else{
- prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ if($_POST['UpdateIfExists']==1) {
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
+ } else {
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
}
}
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
} else { //show file upload form
prnMsg(_('Please ensure that your csv file charset is UTF-8, otherwise the data will not store correctly in database'),'warn');
-
+
echo '
<br />
<a href="Z_ImportSuppliers.php?gettemplate=1">Get Import Template</a>
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-21 14:55:36 UTC (rev 7675)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-22 17:15:03 UTC (rev 7676)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-21 07:31-0600\n"
+"PO-Revision-Date: 2016-11-22 11:01-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3777,7 +3777,7 @@
#: BankReconciliation.php:208
msgid "Add back unpresented cheques"
-msgstr "Sumar cheques no cobrados"
+msgstr "Añadir cheques no cobrados"
#: BankReconciliation.php:214 BankReconciliation.php:291 CustWhereAlloc.php:135
#: CustomerAccount.php:251 CustomerAllocations.php:347
@@ -9476,11 +9476,11 @@
#: CustomerAllocations.php:340
msgid "Allocate Receipt"
-msgstr "Asignar Cobro"
+msgstr "Asignar cobro"
#: CustomerAllocations.php:340 CustomerReceipt.php:594
msgid "Allocate Receipts"
-msgstr "Asignar Cobros"
+msgstr "Asignar cobros"
#: CustomerAllocations.php:344 PDFRemittanceAdvice.php:307
#: SupplierAllocations.php:566 SupplierAllocations.php:641
@@ -13080,7 +13080,7 @@
#: Factors.php:256
msgid "Insert New Factor"
-msgstr "Agregar la Nueva Compañía Financiera"
+msgstr "Insertar compañía de factoreo nueva"
#: Factors.php:263
msgid "Update Factor"
@@ -13770,7 +13770,7 @@
#: FixedAssetItems.php:679
msgid "Insert New Fixed Asset"
-msgstr "Insertar Nuevo activo fijo"
+msgstr "Insertar activo fijo nuevo"
#: FixedAssetItems.php:685
msgid ""
@@ -14342,7 +14342,7 @@
#: GLAccountCSV.php:79 GLAccountInquiry.php:90 GLAccountReport.php:282
msgid "All tags"
-msgstr "Todos los Centros de Costo"
+msgstr "Todos los centros de costo"
#: GLAccountCSV.php:91 SalesAnalRepts.php:306
#, php-format
@@ -15598,7 +15598,7 @@
#: GLTags.php:70 SecurityTokens.php:154
msgid "Insert"
-msgstr "Crear"
+msgstr "Insertar"
#: GLTags.php:81
msgid "Tag ID"
@@ -22334,7 +22334,7 @@
#: PO_Items.php:1164 SelectProduct.php:477 SelectProduct.php:515
#: StockClone.php:1116 Stocks.php:1445
msgid "Insert New Item"
-msgstr "Agregar nuevo artículo"
+msgstr "Insertar artículo nuevo"
#: PO_Items.php:1169
msgid "Order a non stock item"
@@ -27050,7 +27050,7 @@
#: SalesAnalReptCols.php:515 SalesAnalReptCols.php:517
msgid "Add to"
-msgstr "Sumar a"
+msgstr "Añadir a"
#: SalesAnalReptCols.php:520 SalesAnalReptCols.php:522
msgid "Numerator Minus Denominator"
@@ -31394,7 +31394,7 @@
#: StockAdjustmentsControlled.php:56
msgid "Adding Items"
-msgstr "Agregando Artículos"
+msgstr "Añadiendo artículos"
#: StockAdjustmentsControlled.php:61
msgid "Removing Items"
@@ -36568,7 +36568,7 @@
#: Suppliers.php:859
msgid "Insert New Supplier"
-msgstr "Inserte nuevo proveedor"
+msgstr "Insertar proveedor nuevo"
#: Suppliers.php:953 Suppliers.php:957 Suppliers.php:961
msgid "Within 40 characters"
@@ -41406,7 +41406,7 @@
#: Z_ChangeLocationCode.php:61
msgid "Adding the new location record"
-msgstr "Agregando registro de nueva localidad"
+msgstr "Añadiendo registro de nueva localidad"
#: Z_ChangeLocationCode.php:107
msgid "The SQL to insert the new location record failed"
@@ -41648,7 +41648,7 @@
#: Z_ChangeStockCategory.php:51
msgid "Adding the new stock Category record"
-msgstr "Agregar la nueva categoría del registro de la ubicación de productos"
+msgstr "Añadiendo la nueva categoría del registro de la ubicación de productos"
#: Z_ChangeStockCategory.php:75
msgid "The SQL to insert the new stock category record failed"
@@ -41744,7 +41744,7 @@
#: Z_ChangeStockCode.php:56
msgid "Adding the new stock master record"
-msgstr "Agregando nuevo registro maestro de existencias"
+msgstr "Añadiendo nuevo registro maestro de existencias"
#: Z_ChangeStockCode.php:113
msgid "The SQL to insert the new stock master record failed"
@@ -42748,7 +42748,7 @@
#: Z_ImportChartOfAccounts.php:111
msgid "All general ledger accounts have been added to the chart of accounts"
-msgstr ""
+msgstr "Todas las cuentas contables se han añadido al catálogo contable"
#: Z_ImportChartOfAccounts.php:124
msgid ""
@@ -42930,7 +42930,7 @@
#: Z_ImportCustbranch.php:513
msgid "Insert branches total:"
-msgstr ""
+msgstr "Insertar total de sucursales:"
#: Z_ImportCustbranch.php:515
msgid "Exist branches total:"
@@ -42970,7 +42970,7 @@
#: Z_ImportDebtors.php:625 Z_ImportDebtors.php:627 Z_ImportSuppliers.php:335
#: Z_ImportSuppliers.php:337
msgid "Insert:"
-msgstr ""
+msgstr "Insertar:"
#: Z_ImportDebtors.php:627 Z_ImportSuppliers.php:337
msgid "Exist:"
@@ -46281,7 +46281,7 @@
#: api/api_xml-rpc.php:1218
msgid "Insert Sales Order Header"
-msgstr "Insertar el Encabezado de Pedidos de Venta"
+msgstr "Insertar encabezado de orden de venta"
#: api/api_xml-rpc.php:1222
msgid ""
@@ -46333,7 +46333,7 @@
#: api/api_xml-rpc.php:1316
msgid "Insert Sales Order Line"
-msgstr "Inserte la Línea de Pedidos de Venta"
+msgstr "Insertar línea de orden de ventas"
#: api/api_xml-rpc.php:1320
msgid "The orderno key must be one of these values. "
@@ -50974,7 +50974,7 @@
#: includes/MainMenuLinksArray.php:441
msgid "Add or Maintain Asset Locations"
-msgstr "Agregar o Administrar Ubicaciones de activos"
+msgstr "Añadir o Administrar Ubicaciones de activos"
#: includes/MainMenuLinksArray.php:448
msgid "Assign Cash to PC Tab"
@@ -51615,7 +51615,7 @@
#: install/index.php:1070
msgid "Administrator account settings"
-msgstr ""
+msgstr "Configuración de la cuenta del administrador"
#: install/index.php:1074
msgid "The default user name is 'admin' and it cannot be changed."
@@ -52077,7 +52077,7 @@
#: reportwriter/languages/en_US/reports.php:164
msgid "Administrator Page"
-msgstr ""
+msgstr "Página del administrador"
#: reportwriter/languages/en_US/reports.php:165
msgid "Border Line"
Modified: trunk/sql/mysql/country_sql/default.sql
===================================================================
--- trunk/sql/mysql/country_sql/default.sql 2016-11-21 14:55:36 UTC (rev 7675)
+++ trunk/sql/mysql/country_sql/default.sql 2016-11-22 17:15:03 UTC (rev 7676)
@@ -7133,6 +7133,7 @@
INSERT INTO `scripts` VALUES ('Z_ImportPartCodes.php',11,'Allows inventory items to be imported from a csv');
INSERT INTO `scripts` VALUES ('Z_ImportPriceList.php',15,'Loads a new price list from a csv file');
INSERT INTO `scripts` VALUES ('Z_ImportStocks.php',15,'');
+INSERT INTO `scripts` VALUES ('Z_ImportSuppliers.php',15,'Import suppliers by csv file');
INSERT INTO `scripts` VALUES ('Z_index.php',15,'Utility menu page');
INSERT INTO `scripts` VALUES ('Z_ItemsWithoutPicture.php',15,'Shows the list of curent items without picture in webERP');
INSERT INTO `scripts` VALUES ('Z_MakeLocUsers.php',15,'Create User Location records');
|
|
From: <rc...@us...> - 2016-11-21 14:55:39
|
Revision: 7675
http://sourceforge.net/p/web-erp/reponame/7675
Author: rchacon
Date: 2016-11-21 14:55:36 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
Fix and standardise texts.
Modified Paths:
--------------
trunk/AgedDebtors.php
trunk/PDFCustomerList.php
trunk/PcAuthorizeExpenses.php
trunk/SalesInquiry.php
trunk/SelectCustomer.php
trunk/WorkOrderEntry.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/AgedDebtors.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,10 +1,10 @@
<?php
-
/* $Id$ */
+ /* Lists customer account balances in detail or summary in selected currency */
include('includes/session.inc');
-if (isset($_POST['PrintPDF'])
+if(isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
and mb_strlen($_POST['FromCriteria'])>=1
and isset($_POST['ToCriteria'])
@@ -18,15 +18,15 @@
$line_height = 12;
/*Now figure out the aged analysis for the customer range under review */
- 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 = "";
}
- if ($_POST['All_Or_Overdues']=='All'){
+ if($_POST['All_Or_Overdues']=='All') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -46,7 +46,7 @@
ELSE 0 END
ELSE
CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
) AS due,
@@ -97,7 +97,7 @@
HAVING
ROUND(ABS(SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)),currencies.decimalplaces) > 0";
- } elseif ($_POST['All_Or_Overdues']=='OverduesOnly') {
+ } elseif($_POST['All_Or_Overdues']=='OverduesOnly') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -117,7 +117,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END
) AS due,
@@ -180,7 +180,7 @@
END
) > 0.01";
- } elseif ($_POST['All_Or_Overdues']=='HeldOnly'){
+ } elseif($_POST['All_Or_Overdues']=='HeldOnly') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -264,12 +264,12 @@
}
$CustomerResult = DB_query($SQL,'','',False,False); /*dont trap errors handled below*/
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
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){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
@@ -287,7 +287,7 @@
$ListCount = DB_num_rows($CustomerResult);
$CurrDecimalPlaces =2; //by default
- while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
+ while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)) {
$CurrDecimalPlaces = $AgedAnalysis['decimalplaces'];
$DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$CurrDecimalPlaces);
$DisplayCurrent = locale_number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],$CurrDecimalPlaces);
@@ -309,12 +309,12 @@
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ if($YPos < $Bottom_Margin + $line_height) {
include('includes/PDFAgedDebtorsPageHeader.inc');
}
- if ($_POST['DetailedReport']=='Yes'){
+ if($_POST['DetailedReport']=='Yes') {
/*draw a line under the customer aged analysis*/
$pdf->line($Page_Width-$Right_Margin, $YPos+10,$Left_Margin, $YPos+10);
@@ -361,24 +361,24 @@
AND debtortrans.debtorno = '" . $AgedAnalysis['debtorno'] . "'
AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004";
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
$DetailResult = DB_query($sql,'','',False,False); /*Dont trap errors */
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
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){
+ 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)) {
$LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,60,$FontSize,$DetailTrans['typename'],'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,60,$FontSize,$DetailTrans['transno'],'left');
@@ -398,7 +398,7 @@
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ if($YPos < $Bottom_Margin + $line_height) {
include('includes/PDFAgedDebtorsPageHeader.inc');
}
@@ -410,10 +410,10 @@
} /*end customer aged analysis while loop */
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + (2*$line_height)){
+ if($YPos < $Bottom_Margin + (2*$line_height)) {
$PageNumber++;
include('includes/PDFAgedDebtorsPageHeader.inc');
- } elseif ($_POST['DetailedReport']=='Yes') {
+ } elseif($_POST['DetailedReport']=='Yes') {
//dont do a line if the totals have to go on a new page
$pdf->line($Page_Width-$Right_Margin, $YPos+10 ,220, $YPos+10);
}
@@ -430,7 +430,7 @@
$LeftOvers = $pdf->addTextWrap(400,$YPos,60,$FontSize,$DisplayTotOverdue1,'right');
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayTotOverdue2,'right');
- if ($ListCount == 0) {
+ if($ListCount == 0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('There are no customers with balances meeting the criteria specified to list'),'info');
@@ -453,7 +453,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
- if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
+ if((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
/*if $FromCriteria is not set then show a form to allow input */
@@ -480,7 +480,7 @@
</tr>
<tr>
<td>' . _('Only Show Customers Of') . ':' . '</td>';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
echo '<td>';
echo $_SESSION['UsersRealName'];
echo '</td>';
@@ -490,8 +490,8 @@
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$result=DB_query($sql);
- echo '<option value="">' . _('All Sales people') . '</option>';
- while ($myrow=DB_fetch_array($result)){
+ echo '<option value="">' . _('All Salespeople') . '</option>';
+ while ($myrow=DB_fetch_array($result)) {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td>';
@@ -504,8 +504,8 @@
$sql = "SELECT currency, currabrev FROM currencies";
$result=DB_query($sql);
- while ($myrow=DB_fetch_array($result)){
- if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
+ while ($myrow=DB_fetch_array($result)) {
+ if($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']) {
echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
} else {
echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/PDFCustomerList.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,13 +1,13 @@
<?php
-
/* $Id$*/
+/* Creates a report of the customer and branch information held. This report has options to print only customer branches in a specified sales area and sales person. Additional option allows to list only those customers with activity either under or over a specified amount, since a specified date. */
include('includes/session.inc');
$ViewTopic = 'ARReports';
$BookMark = 'CustomerListing';
-
-if (isset($_POST['PrintPDF'])){
+if(isset($_POST['PrintPDF'])) {
+
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Customer Listing') );
$pdf->addInfo('Subject', _('Customer Listing') );
@@ -15,8 +15,8 @@
$PageNumber = 0;
$FontSize=10;
- if ($_POST['Activity']!='All'){
- if (!is_numeric($_POST['ActivityAmount'])){
+ if($_POST['Activity']!='All') {
+ if(!is_numeric($_POST['ActivityAmount'])) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
echo '<p />';
@@ -28,8 +28,8 @@
/* Now figure out the customer data to report for the selections made */
- if (in_array('All', $_POST['Areas'])){
- if (in_array('All', $_POST['SalesPeople'])){
+ if(in_array('All', $_POST['Areas'])) {
+ if(in_array('All', $_POST['SalesPeople'])) {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
@@ -101,8 +101,8 @@
WHERE (";
$i=0;
- foreach ($_POST['SalesPeople'] as $Salesperson){
- if ($i>0){
+ foreach ($_POST['SalesPeople'] as $Salesperson) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -115,7 +115,7 @@
custbranch.branchcode";
} /*end if SalesPeople =='All' */
} else { /* not all sales areas has been selected so need to build the where clause */
- if (in_array('All', $_POST['SalesPeople'])){
+ if(in_array('All', $_POST['SalesPeople'])) {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
@@ -150,8 +150,8 @@
WHERE (";
$i=0;
- foreach ($_POST['Areas'] as $Area){
- if ($i>0){
+ foreach ($_POST['Areas'] as $Area) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -198,8 +198,8 @@
WHERE (";
$i=0;
- foreach ($_POST['Areas'] as $Area){
- if ($i>0){
+ foreach ($_POST['Areas'] as $Area) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -209,8 +209,8 @@
$SQL .= ") AND (";
$i=0;
- foreach ($_POST['SalesPeople'] as $Salesperson){
- if ($i>0){
+ foreach ($_POST['SalesPeople'] as $Salesperson) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -228,19 +228,19 @@
$CustomersResult = DB_query($SQL);
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg( _('The customer List could not be retrieved by the SQL because') . ' - ' . DB_error_msg() );
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
}
- if (DB_num_rows($CustomersResult) == 0) {
+ if(DB_num_rows($CustomersResult) == 0) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg( _('This report has no output because there were no customers retrieved'), 'error' );
@@ -255,9 +255,9 @@
$Area ='';
$SalesPerson='';
- While ($Customers = DB_fetch_array($CustomersResult,$db)){
+ while($Customers = DB_fetch_array($CustomersResult,$db)) {
- if ($_POST['Activity']!='All'){
+ if($_POST['Activity']!='All') {
/*Get the total turnover in local currency for the customer/branch
since the date entered */
@@ -273,14 +273,14 @@
$ActivityRow = DB_fetch_row($ActivityResult);
$LocalCurrencyTurnover = $ActivityRow[0];
- if ($_POST['Activity'] =='GreaterThan'){
- if ($LocalCurrencyTurnover > $_POST['ActivityAmount']){
+ if($_POST['Activity'] =='GreaterThan') {
+ if($LocalCurrencyTurnover > $_POST['ActivityAmount']) {
$PrintThisCustomer = true;
} else {
$PrintThisCustomer = false;
}
- } elseif ($_POST['Activity'] =='LessThan'){
- if ($LocalCurrencyTurnover < $_POST['ActivityAmount']){
+ } elseif($_POST['Activity'] =='LessThan') {
+ if($LocalCurrencyTurnover < $_POST['ActivityAmount']) {
$PrintThisCustomer = true;
} else {
$PrintThisCustomer = false;
@@ -290,11 +290,11 @@
$PrintThisCustomer = true;
}
- if ($PrintThisCustomer){
- if ($Area!=$Customers['area']){
+ if($PrintThisCustomer) {
+ if($Area!=$Customers['area']) {
$FontSize=10;
$YPos -=$line_height;
- if ($YPos < ($Bottom_Margin + 80)){
+ if($YPos < ($Bottom_Margin + 80)) {
include('includes/PDFCustomerListPageHeader.inc');
}
$pdf->setFont('','B');
@@ -305,10 +305,10 @@
$YPos -=$line_height;
}
- if ($SalesPerson!=$Customers['salesman']){
+ if($SalesPerson!=$Customers['salesman']) {
$FontSize=10;
$YPos -=($line_height);
- if ($YPos < ($Bottom_Margin + 80)){
+ if($YPos < ($Bottom_Margin + 80)) {
include('includes/PDFCustomerListPageHeader.inc');
}
$pdf->setFont('','B');
@@ -333,7 +333,7 @@
$LeftOvers = $pdf->addTextWrap(230,$YPos,60,$FontSize,$Customers['branchcode']);
$LeftOvers = $pdf->addTextWrap(230,$YPos-10,60,$FontSize, _('Price List') . ': ' . $Customers['salestype']);
- if ($_POST['Activity']!='All'){
+ if($_POST['Activity']!='All') {
$LeftOvers = $pdf->addTextWrap(230,$YPos-20,60,$FontSize,_('Turnover'),'right');
$LeftOvers = $pdf->addTextWrap(230,$YPos-30,60,$FontSize,locale_number_format($LocalCurrencyTurnover,0), 'right');
}
@@ -353,7 +353,7 @@
$pdf->line($Page_Width-$Right_Margin, $YPos-32,$Left_Margin, $YPos-32);
$YPos -=40;
- if ($YPos < ($Bottom_Margin +30)){
+ if($YPos < ($Bottom_Margin +30)) {
include('includes/PDFCustomerListPageHeader.inc');
}
} /*end if $PrintThisCustomer == true */
@@ -381,19 +381,19 @@
echo '<option selected="selected" value="All">' . _('All Areas') . '</option>';
- While ($myrow = DB_fetch_array($AreasResult)){
+ while($myrow = DB_fetch_array($AreasResult)) {
echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td>' . _('For Sales folk'). ':</td>
<td><select name="SalesPeople[]" multiple="multiple">
- <option selected="selected" value="All">' . _('All sales folk') . '</option>';
+ <option selected="selected" value="All">' . _('All Salespeople') . '</option>';
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$SalesFolkResult = DB_query($sql);
- While ($myrow = DB_fetch_array($SalesFolkResult)){
+ while($myrow = DB_fetch_array($SalesFolkResult)) {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td></tr>';
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/PcAuthorizeExpenses.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,67 +1,68 @@
<?php
/* $Id$*/
+/* */
include('includes/session.inc');
$Title = _('Authorisation of Petty Cash Expenses');
-/* webERP manual links before header.inc */
$ViewTopic= 'PettyCash';
$BookMark = 'AuthorizeExpense';
include('includes/header.inc');
+
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['SelectedTabs'])){
+if(isset($_POST['SelectedTabs'])) {
$SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])){
+} elseif(isset($_GET['SelectedTabs'])) {
$SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
-if (isset($_POST['SelectedIndex'])){
+if(isset($_POST['SelectedIndex'])) {
$SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])){
+} elseif(isset($_GET['SelectedIndex'])) {
$SelectedIndex = $_GET['SelectedIndex'];
}
-if (isset($_POST['Days'])){
+if(isset($_POST['Days'])) {
$Days = filter_number_format($_POST['Days']);
-} elseif (isset($_GET['Days'])){
+} elseif(isset($_GET['Days'])) {
$Days = filter_number_format($_GET['Days']);
}
-if (isset($_POST['Process'])) {
- if ($SelectedTabs=='') {
+if(isset($_POST['Process'])) {
+ if($SelectedTabs=='') {
prnMsg(_('You Must First Select a Petty Cash Tab To Authorise'),'error');
unset($SelectedTabs);
}
}
-if (isset($_POST['Go'])) {
- if ($Days<=0) {
+if(isset($_POST['Go'])) {
+ if($Days<=0) {
prnMsg(_('The number of days must be a positive number'),'error');
$Days=30;
}
}
-if (isset($SelectedTabs)) {
+if(isset($SelectedTabs)) {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorisation Of Petty Cash Expenses') . ' '.$SelectedTabs . '</p>';
+ '" alt="" />', _('Authorisation of Petty Cash Expenses'), ' ', $SelectedTabs, '</p>';
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorisation Of Petty Cash Expenses') . '</p>';
+ '" alt="" />', _('Authorisation of Petty Cash Expenses'), '</p>';
}
-if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
+if(isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if(!isset ($Days)){
+ if(!isset ($Days)) {
$Days=30;
}
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<br />
<table class="selection">
<tr>
- <th colspan="7">' . _('Detail Of Movement For Last ') .':<input type="text" class="intger" name="Days" value="' . $Days . '" maxlength="3" size="4" />' . _('Days');
+ <th colspan="7">', _('Detail Of Movement For Last '), ':<input class="integer" maxlength="3" name="Days" size="4" type="text" value="', $Days, '" />', _('Days');
echo '<input type="submit" name="Go" value="' . _('Go') . '" /></th>
</tr>';
@@ -101,22 +102,22 @@
$k=0; //row colour counter
- while ($myrow=DB_fetch_array($result)) {
+ while($myrow=DB_fetch_array($result)) {
$CurrDecimalPlaces = $myrow['decimalplaces'];
//update database if update pressed
- if (isset($_POST['Submit'])
+ if(isset($_POST['Submit'])
AND $_POST['Submit']==_('Update')
- AND isset($_POST[$myrow['counterindex']])){
+ AND isset($_POST[$myrow['counterindex']])) {
$PeriodNo = GetPeriod(ConvertSQLDate($myrow['date']), $db);
- if ($myrow['rate'] == 1){ // functional currency
+ if($myrow['rate'] == 1) { // functional currency
$Amount = $myrow['amount'];
}else{ // other currencies
$Amount = $myrow['amount']/$myrow['rate'];
}
- if ($myrow['codeexpense'] == 'ASSIGNCASH'){
+ if($myrow['codeexpense'] == 'ASSIGNCASH') {
$type = 2;
$AccountFrom = $myrow['glaccountassignment'];
$AccountTo = $myrow['glaccountpcash'];
@@ -139,7 +140,7 @@
$typeno = GetNextTransNo($type,$db);
//build narrative
- $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
+ $Narrative = _('Petty Cash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
//insert to gltrans
DB_Txn_Begin();
@@ -197,7 +198,7 @@
$ResultTo = DB_query($sqlTo,'', '', true);
- if ($myrow['codeexpense'] == 'ASSIGNCASH'){
+ if($myrow['codeexpense'] == 'ASSIGNCASH') {
// if it's a cash assignation we need to updated banktrans table as well.
$ReceiptTransNo = GetNextTransNo( 2, $db);
$SQLBank= "INSERT INTO banktrans (transno,
@@ -235,14 +236,14 @@
DB_Txn_Commit();
}
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
echo '<tr class="OddTableRows">';
$k=1;
}
- if ($myrow['posted']==0) {
+ if($myrow['posted']==0) {
$Posted=_('No');
} else {
$Posted=_('Yes');
@@ -254,11 +255,11 @@
<td>' .$myrow['notes'] . '</td>
<td>' . $myrow['receipt'] . '</td>';
- if (isset($_POST[$myrow['counterindex']])){
+ if(isset($_POST[$myrow['counterindex']])) {
echo'<td>' . ConvertSQLDate(Date('Y-m-d'));
}else{
//compare against raw SQL format date, then convert for display.
- if(($myrow['authorized']!='0000-00-00')){
+ if(($myrow['authorized']!='0000-00-00')) {
echo'<td>' . ConvertSQLDate($myrow['authorized']);
}else{
echo '<td align="right"><input type="checkbox" name="'.$myrow['counterindex'].'" />';
@@ -278,7 +279,7 @@
$ResultAmount = DB_query($sqlamount);
$Amount=DB_fetch_array($ResultAmount);
- if (!isset($Amount['0'])) {
+ if(!isset($Amount['0'])) {
$Amount['0']=0;
}
@@ -315,10 +316,10 @@
<td>' . _('Authorise expenses to Petty Cash Tab') . ':</td>
<td><select name="SelectedTabs" required="required" autofocus="autofocus" >';
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
$Authorisers = explode(',',$myrow['authorizer']);
- if (in_array($_SESSION['UserID'],$Authorisers)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ if(in_array($_SESSION['UserID'],$Authorisers)) {
+ if(isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -340,5 +341,6 @@
</div>
</form>';
} /*end of else not submit */
+
include('includes/footer.inc');
?>
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/SalesInquiry.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* */
// SalesInquiry.php
// Inquiry on Sales Orders - If Date Type is Order Date, salesorderdetails is the main table
// If Date Type is Invoice, stockmoves is the main table
@@ -10,43 +10,43 @@
include('includes/header.inc');
# Sets default date range for current month
-if (!isset($_POST['FromDate'])){
+if(!isset($_POST['FromDate'])) {
$_POST['FromDate']=Date($_SESSION['DefaultDateFormat'], mktime(0,0,0,Date('m'),1,Date('Y')));
}
-if (!isset($_POST['ToDate'])){
+if(!isset($_POST['ToDate'])) {
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
}
-if (isset($_POST['PartNumber'])){
+if(isset($_POST['PartNumber'])) {
$PartNumber = trim(mb_strtoupper($_POST['PartNumber']));
-} elseif (isset($_GET['PartNumber'])){
+} elseif(isset($_GET['PartNumber'])) {
$PartNumber = trim(mb_strtoupper($_GET['PartNumber']));
}
# Part Number operator - either LIKE or =
-if (isset($_POST['PartNumberOp'])){
+if(isset($_POST['PartNumberOp'])) {
$PartNumberOp = $_POST['PartNumberOp'];
} else {
$PartNumberOp = '=';
}
-if (isset($_POST['DebtorNo'])){
+if(isset($_POST['DebtorNo'])) {
$DebtorNo = trim(mb_strtoupper($_POST['DebtorNo']));
-} elseif (isset($_GET['DebtorNo'])){
+} elseif(isset($_GET['DebtorNo'])) {
$DebtorNo = trim(mb_strtoupper($_GET['DebtorNo']));
}
-if (isset($_POST['DebtorNoOp'])){
+if(isset($_POST['DebtorNoOp'])) {
$DebtorNoOp = $_POST['DebtorNoOp'];
} else {
$DebtorNoOp = '=';
}
-if (isset($_POST['DebtorName'])){
+if(isset($_POST['DebtorName'])) {
$DebtorName = trim(mb_strtoupper($_POST['DebtorName']));
-} elseif (isset($_GET['DebtorName'])){
+} elseif(isset($_GET['DebtorName'])) {
$DebtorName = trim(mb_strtoupper($_GET['DebtorName']));
}
-if (isset($_POST['DebtorNameOp'])){
+if(isset($_POST['DebtorNameOp'])) {
$DebtorNameOp = $_POST['DebtorNameOp'];
} else {
$DebtorNameOp = '=';
@@ -54,13 +54,13 @@
// Save $_POST['SummaryType'] in $SaveSummaryType because change $_POST['SummaryType'] when
// create $sql
-if (isset($_POST['SummaryType'])){
+if(isset($_POST['SummaryType'])) {
$SaveSummaryType = $_POST['SummaryType'];
} else {
$SaveSummaryType = 'name';
}
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
submit($db,$PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType);
} else {
display($db);
@@ -77,22 +77,22 @@
//first off validate inputs sensible
- if (!Is_Date($_POST['FromDate'])) {
+ if(!Is_Date($_POST['FromDate'])) {
$InputError = 1;
prnMsg(_('Invalid From Date'),'error');
}
- if (!Is_Date($_POST['ToDate'])) {
+ if(!Is_Date($_POST['ToDate'])) {
$InputError = 1;
prnMsg(_('Invalid To Date'),'error');
}
- if ($_POST['ReportType'] == 'Summary' AND $_POST['DateType'] == 'Order' AND $_POST['SummaryType'] == 'transno') {
+ if($_POST['ReportType'] == 'Summary' AND $_POST['DateType'] == 'Order' AND $_POST['SummaryType'] == 'transno') {
$InputError = 1;
prnMsg(_('Cannot summarize by transaction number with a date type of Order Date'),'error');
return;
}
- if ($_POST['ReportType'] == 'Detail' AND $_POST['DateType'] == 'Order' AND $_POST['SortBy'] == 'tempstockmoves.transno,salesorderdetails.stkcode') {
+ if($_POST['ReportType'] == 'Detail' AND $_POST['DateType'] == 'Order' AND $_POST['SortBy'] == 'tempstockmoves.transno,salesorderdetails.stkcode') {
$InputError = 1;
prnMsg(_('Cannot sort by transaction number with a date type of Order Date'),'error');
return;
@@ -100,44 +100,44 @@
// TempStockmoves function creates a temporary table of stockmoves that is used when the DateType
// is Invoice Date
- if ($_POST['DateType'] == 'Invoice') {
+ if($_POST['DateType'] == 'Invoice') {
TempStockmoves($db);
}
# Add more to WHERE statement, if user entered something for the part number,debtorno, name
// Variables that end with Op - meaning operator - are either = or LIKE
$WherePart = ' ';
- if (mb_strlen($PartNumber) > 0 AND $PartNumberOp == 'LIKE') {
+ if(mb_strlen($PartNumber) > 0 AND $PartNumberOp == 'LIKE') {
$PartNumber = $PartNumber . '%';
} else {
$PartNumberOp = '=';
}
- if (mb_strlen($PartNumber) > 0) {
+ if(mb_strlen($PartNumber) > 0) {
$WherePart = " AND salesorderdetails.stkcode " . $PartNumberOp . " '" . $PartNumber . "' ";
}
$WhereDebtorNo = ' ';
- if ($DebtorNoOp == 'LIKE') {
+ if($DebtorNoOp == 'LIKE') {
$DebtorNo = $DebtorNo . '%';
} else {
$DebtorNoOp = '=';
}
- if (mb_strlen($DebtorNo) > 0) {
+ if(mb_strlen($DebtorNo) > 0) {
$WhereDebtorNo = " AND salesorders.debtorno " . $DebtorNoOp . " '" . $DebtorNo . "' ";
} else {
$WhereDebtorNo = ' ';
}
$WhereDebtorName = ' ';
- if (mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
+ if(mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
$DebtorName = $DebtorName . '%';
} else {
$DebtorNameOp = '=';
}
- if (mb_strlen($DebtorName) > 0) {
+ if(mb_strlen($DebtorName) > 0) {
$WhereDebtorName = " AND debtorsmaster.name " . $DebtorNameOp . " '" . $DebtorName . "' ";
}
- if (mb_strlen($_POST['OrderNo']) > 0) {
+ if(mb_strlen($_POST['OrderNo']) > 0) {
$WhereOrderNo = " AND salesorderdetails.orderno = " . " '" . $_POST['OrderNo'] . "' ";
} else {
$WhereOrderNo = " ";
@@ -147,7 +147,7 @@
# Had to use IF statement instead of comparing 'linestatus' to $_POST['LineStatus']
#in WHERE clause because the WHERE clause did not recognize
# that had used the IF statement to create a field caused linestatus
- if ($_POST['LineStatus'] != 'All') {
+ if($_POST['LineStatus'] != 'All') {
$WhereLineStatus = " AND IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
salesorderdetails.completed = 1,'Completed','Open') = '" . $_POST['LineStatus'] . "'";
}
@@ -156,35 +156,35 @@
// for multiple selections from Areas - decided to just allow selection of one Area at
// a time, so used simpler code
$WhereArea = ' ';
- if ($_POST['Area'] != 'All') {
+ if($_POST['Area'] != 'All') {
$WhereArea = " AND custbranch.area = '" . $_POST['Area'] . "'";
}
$WhereSalesman = ' ';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$WhereSalesman .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
- }elseif ($_POST['Salesman'] != 'All') {
+ }elseif($_POST['Salesman'] != 'All') {
$WhereSalesman = " AND custbranch.salesman = '" . $_POST['Salesman'] . "'";
}
$WhereCategory = ' ';
- if ($_POST['Category'] != 'All') {
+ if($_POST['Category'] != 'All') {
$WhereCategory = " AND stockmaster.categoryid = '" . $_POST['Category'] . "'";
}
// Only used for Invoice Date type where tempstockmoves is the main table
$WhereType = " AND (tempstockmoves.type='10' OR tempstockmoves.type='11')";
- if ($_POST['InvoiceType'] != 'All') {
+ if($_POST['InvoiceType'] != 'All') {
$WhereType = " AND tempstockmoves.type = '" . $_POST['InvoiceType'] . "'";
}
- if ($InputError !=1) {
+ if($InputError !=1) {
$FromDate = FormatDateForSQL($_POST['FromDate']);
$ToDate = FormatDateForSQL($_POST['ToDate']);
- if ($_POST['ReportType'] == 'Detail') {
- if ($_POST['DateType'] == 'Order') {
+ if($_POST['ReportType'] == 'Detail') {
+ if($_POST['DateType'] == 'Order') {
$sql = "SELECT salesorderdetails.orderno,
salesorderdetails.stkcode,
salesorderdetails.itemdue,
@@ -274,12 +274,12 @@
// The following is because the 'extprice' summary is a special case - with the other
// summaries, you group and order on the same field; with 'extprice', you are actually
// grouping on the stkcode and ordering by extprice descending
- if ($_POST['SummaryType'] == 'extprice') {
+ if($_POST['SummaryType'] == 'extprice') {
$_POST['SummaryType'] = 'stkcode';
$orderby = 'extprice DESC';
}
- if ($_POST['DateType'] == 'Order') {
- if ($_POST['SummaryType'] == 'extprice' OR $_POST['SummaryType'] == 'stkcode') {
+ if($_POST['DateType'] == 'Order') {
+ if($_POST['SummaryType'] == 'extprice' OR $_POST['SummaryType'] == 'stkcode') {
$sql = "SELECT salesorderdetails.stkcode,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
@@ -312,7 +312,7 @@
stockmaster.description,
stockmaster.decimalplaces
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'orderno') {
+ } elseif($_POST['SummaryType'] == 'orderno') {
$sql = "SELECT salesorderdetails.orderno,
salesorders.debtorno,
debtorsmaster.name,
@@ -344,8 +344,8 @@
",salesorders.debtorno,
debtorsmaster.name
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'debtorno' OR $_POST['SummaryType'] == 'name') {
- if ($_POST['SummaryType'] == 'name') {
+ } elseif($_POST['SummaryType'] == 'debtorno' OR $_POST['SummaryType'] == 'name') {
+ if($_POST['SummaryType'] == 'name') {
$orderby = 'name';
}
$sql = "SELECT debtorsmaster.debtorno,
@@ -377,7 +377,7 @@
"GROUP BY debtorsmaster.debtorno
,debtorsmaster.name
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'month') {
+ } elseif($_POST['SummaryType'] == 'month') {
$sql = "SELECT EXTRACT(YEAR_MONTH from salesorders.orddate) as month,
CONCAT(MONTHNAME(salesorders.orddate),' ',YEAR(salesorders.orddate)) as monthname,
SUM(salesorderdetails.quantity) as quantity,
@@ -407,7 +407,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",monthname
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'categoryid') {
+ } elseif($_POST['SummaryType'] == 'categoryid') {
$sql = "SELECT stockmaster.categoryid,
stockcategory.categorydescription,
SUM(salesorderdetails.quantity) as quantity,
@@ -438,7 +438,7 @@
",categorydescription
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'salesman') {
+ } elseif($_POST['SummaryType'] == 'salesman') {
$sql = "SELECT custbranch.salesman,
salesman.salesmanname,
SUM(salesorderdetails.quantity) as quantity,
@@ -468,7 +468,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",salesmanname
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'area') {
+ } elseif($_POST['SummaryType'] == 'area') {
$sql = "SELECT custbranch.area,
areas.areadescription,
SUM(salesorderdetails.quantity) as quantity,
@@ -501,7 +501,7 @@
}
} else {
// Selects by tempstockmoves.trandate not order date
- if ($_POST['SummaryType'] == 'extprice' OR $_POST['SummaryType'] == 'stkcode') {
+ if($_POST['SummaryType'] == 'extprice' OR $_POST['SummaryType'] == 'stkcode') {
$sql = "SELECT salesorderdetails.stkcode,
SUM(salesorderdetails.quantity) as quantity,
SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
@@ -536,7 +536,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",stockmaster.description
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'orderno') {
+ } elseif($_POST['SummaryType'] == 'orderno') {
$sql = "SELECT salesorderdetails.orderno,
salesorders.debtorno,
debtorsmaster.name,
@@ -573,8 +573,8 @@
",salesorders.debtorno,
debtorsmaster.name
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'debtorno' OR $_POST['SummaryType'] == 'name') {
- if ($_POST['SummaryType'] == 'name') {
+ } elseif($_POST['SummaryType'] == 'debtorno' OR $_POST['SummaryType'] == 'name') {
+ if($_POST['SummaryType'] == 'name') {
$orderby = 'name';
}
$sql = "SELECT debtorsmaster.debtorno,
@@ -611,7 +611,7 @@
"GROUP BY debtorsmaster.debtorno" . ' ' .
",debtorsmaster.name
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'month') {
+ } elseif($_POST['SummaryType'] == 'month') {
$sql = "SELECT EXTRACT(YEAR_MONTH from salesorders.orddate) as month,
CONCAT(MONTHNAME(salesorders.orddate),' ',YEAR(salesorders.orddate)) as monthname,
SUM(salesorderdetails.quantity) as quantity,
@@ -646,7 +646,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",monthname
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'categoryid') {
+ } elseif($_POST['SummaryType'] == 'categoryid') {
$sql = "SELECT stockmaster.categoryid,
stockcategory.categorydescription,
SUM(salesorderdetails.quantity) as quantity,
@@ -681,7 +681,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",categorydescription
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'salesman') {
+ } elseif($_POST['SummaryType'] == 'salesman') {
$sql = "SELECT custbranch.salesman,
salesman.salesmanname,
SUM(salesorderdetails.quantity) as quantity,
@@ -716,7 +716,7 @@
"GROUP BY " . $_POST['SummaryType'] .
",salesmanname
ORDER BY " . $orderby;
- } elseif ($_POST['SummaryType'] == 'area') {
+ } elseif($_POST['SummaryType'] == 'area') {
$sql = "SELECT custbranch.area,
areas.areadescription,
SUM(salesorderdetails.quantity) as quantity,
@@ -753,7 +753,7 @@
ORDER BY " . $orderby;
}
}
- } // End of if ($_POST['ReportType']
+ } // End of if($_POST['ReportType']
//echo "<br/>$sql<br/>";
$ErrMsg = _('The SQL to find the parts selected failed with the message');
$result = DB_query($sql,$ErrMsg);
@@ -783,26 +783,26 @@
$Detail_Array['tempstockmoves.transno,salesorderdetails.stkcode'] = _('Transaction Number');
// Display Header info
- if ($_POST['ReportType'] == 'Summary') {
+ if($_POST['ReportType'] == 'Summary') {
$SortBy_Display = $Summary_Array[$SaveSummaryType];
} else {
$SortBy_Display = $Detail_Array[$_POST['SortBy']];
}
echo ' ' . _('Sales Inquiry') . ' - ' . $_POST['ReportType'] . ' ' . _('By') . ' ' . $SortBy_Display . '<br/>';
- if ($_POST['OrderType'] == '0') {
+ if($_POST['OrderType'] == '0') {
echo ' ' . _('Order Type - Sales Orders') . '<br/>';
} else {
echo ' ' . _('Order Type - Quotations') . '<br/>';
}
echo ' ' . _('Date Type') . ' - ' . $_POST['DateType'] . '<br/>';
echo ' ' . _('Date Range') . ' - ' . $_POST['FromDate'] . ' ' . _('To') . ' ' . $_POST['ToDate'] . '<br/>';
- if (mb_strlen(trim($PartNumber)) > 0) {
+ if(mb_strlen(trim($PartNumber)) > 0) {
echo ' ' . _('Stock Code') . ' - ' . $_POST['PartNumberOp'] . ' ' . $_POST['PartNumber'] . '<br/>';
}
- if (mb_strlen(trim($_POST['DebtorNo'])) > 0) {
+ if(mb_strlen(trim($_POST['DebtorNo'])) > 0) {
echo ' ' . _('Customer Code') . ' - ' . $_POST['DebtorNoOp'] . ' ' . $_POST['DebtorNo'] . '<br/>';
}
- if (mb_strlen(trim($_POST['DebtorName'])) > 0) {
+ if(mb_strlen(trim($_POST['DebtorName'])) > 0) {
echo ' ' . _('Customer Name') . ' - ' . $_POST['DebtorNameOp'] . ' ' . $_POST['DebtorName'] . '<br/>';
}
echo ' ' . _('Line Item Status') . ' - ' . $_POST['LineStatus'] . '<br/>';
@@ -811,16 +811,16 @@
echo ' ' . _('Sales Area') . ' - ' . $_POST['Area'] . '<br/>';
If ($_POST['DateType'] != 'Order') {
$itype = 'All';
- if ($_POST['InvoiceType'] == '10') {
+ if($_POST['InvoiceType'] == '10') {
$itype = 'Sales Invoice';
- } elseif ($_POST['InvoiceType'] == '11') {
+ } elseif($_POST['InvoiceType'] == '11') {
$itype = 'Credit Notes';
}
echo ' ' . _('Invoice Type') . ' - ' . $itype . '<br/>';
}
echo '<br/><br/>';
- if ($_POST['ReportType'] == 'Detail') {
- if ($_POST['DateType'] == 'Order') {
+ if($_POST['ReportType'] == 'Detail') {
+ if($_POST['DateType'] == 'Order') {
printf('%10s | %-20s | %10s | %-10s | %-30s | %-30s | %12s | %14s | %14s | %14s | %12s | %-10s | %-10s | %-10s | %-40s ',
_('Order No'),
_('Stock Code'),
@@ -860,7 +860,7 @@
$linectr = 0;
while ($myrow = DB_fetch_array($result)) {
$linectr++;
- if ($_POST['DateType'] == 'Order') {
+ if($_POST['DateType'] == 'Order') {
printf('%10s | %-20s | %10s | %-10s | %-30s | %-30s | %12s | %14s | %14s | %14s | %12s | %-10s | %-10s | %-10s | %-40s ',
$myrow['orderno'],
$myrow['stkcode'],
@@ -906,7 +906,7 @@
$TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
- if ($_POST['DateType'] == 'Order') {
+ if($_POST['DateType'] == 'Order') {
printf('%10s | %-20s | %10s | %-10s | %-30s | %-30s | %12s | %14s | %14s | %14s | %12s | %-10s | %-40s ',
_('Totals'),
_('Lines - ') . $linectr,
@@ -944,50 +944,50 @@
$SummaryType = $_POST['SummaryType'];
$columnheader7 = ' ';
// Set up description based on the Summary Type
- if ($SummaryType == 'name') {
+ if($SummaryType == 'name') {
$SummaryType = 'name';
$Description = 'debtorno';
$SummaryHeader = _('Customer Name');
$Descriptionheader = _('Customer Code');
}
- if ($SummaryType == 'stkcode' OR $SummaryType == 'extprice') {
+ if($SummaryType == 'stkcode' OR $SummaryType == 'extprice') {
$Description = 'Description';
$SummaryHeader = _('Stock Code');
$Descriptionheader = _('Item Description');
}
- if ($SummaryType == 'transno') {
+ if($SummaryType == 'transno') {
$Description = 'name';
$SummaryHeader = _('Transaction Number');
$Descriptionheader = _('Customer Name');
$columnheader7 = _('Order Number');
}
- if ($SummaryType == 'debtorno') {
+ if($SummaryType == 'debtorno') {
$Description = 'name';
$SummaryHeader = _('Customer Code');
$Descriptionheader = _('Customer Name');
}
- if ($SummaryType == 'orderno') {
+ if($SummaryType == 'orderno') {
$Description = 'debtorno';
$SummaryHeader = _('Order Number');
$Descriptionheader = _('Customer Code');
$columnheader7 = _('Customer Name');
}
- if ($SummaryType == 'categoryid') {
+ if($SummaryType == 'categoryid') {
$Description = 'categorydescription';
$SummaryHeader = _('Stock Category');
$Descriptionheader = _('Category Description');
}
- if ($SummaryType == 'salesman') {
+ if($SummaryType == 'salesman') {
$Description = 'salesmanname';
$SummaryHeader = _('Salesman Code');
$Descriptionheader = _('Salesman Name');
}
- if ($SummaryType == 'area') {
+ if($SummaryType == 'area') {
$Description = 'areadescription';
$SummaryHeader = _('Sales Area');
$Descriptionheader = _('Area Description');
}
- if ($SummaryType == 'month') {
+ if($SummaryType == 'month') {
$Description = 'monthname';
$SummaryHeader = _('Month');
$Descriptionheader = _('Month');
@@ -1006,13 +1006,13 @@
$linectr = 0;
while ($myrow = DB_fetch_array($result)) {
$linectr++;
- if ($SummaryType == 'orderno') {
+ if($SummaryType == 'orderno') {
$column7 = $myrow['name'];
}
- if ($SummaryType == 'transno') {
+ if($SummaryType == 'transno') {
$column7 = $myrow['orderno'];
}
- if ($_POST['DateType'] == 'Order') {
+ if($_POST['DateType'] == 'Order') {
// quantity is from salesorderdetails
$DisplayQty = $myrow['quantity'];
} else {
@@ -1044,7 +1044,7 @@
locale_number_format($TotalInvQty,2),
' ');
echo '</pre>';
- } // End of if ($_POST['ReportType']
+ } // End of if($_POST['ReportType']
} // End of if inputerror != 1
} // End of function submit()
@@ -1107,7 +1107,7 @@
<td>' . _('To') . ':</td>
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
</tr>';
- if (!isset($_POST['PartNumber'])){
+ if(!isset($_POST['PartNumber'])) {
$_POST['PartNumber']='';
}
echo '<tr>
@@ -1119,7 +1119,7 @@
<td> </td>
<td><input type="text" name="PartNumber" size="20" maxlength="20" value="'. $_POST['PartNumber'] . '" /></td>
</tr>';
- if (!isset($_POST['DebtorNo'])){
+ if(!isset($_POST['DebtorNo'])) {
$_POST['DebtorNo']='';
}
echo '<tr>
@@ -1131,7 +1131,7 @@
<td> </td>
<td><input type="text" name="DebtorNo" size="10" maxlength="10" value="' . $_POST['DebtorNo'] . '" /></td>
</tr>';
- if (!isset($_POST['DebtorName'])){
+ if(!isset($_POST['DebtorName'])) {
$_POST['DebtorName']='';
}
echo '<tr>
@@ -1143,7 +1143,7 @@
<td> </td>
<td><input type="text" name="DebtorName" size="30" maxlength="30" value="' . $_POST['DebtorName'] .'" /></td>
</tr>';
- if (!isset($_POST['OrderNo'])){
+ if(!isset($_POST['OrderNo'])) {
$_POST['OrderNo']='';
}
echo '<tr>
@@ -1169,7 +1169,7 @@
$CategoryResult= DB_query("SELECT categoryid, categorydescription FROM stockcategory");
echo '<option selected="selected" value="All">' . _('All Categories') . '</option>';
- While ($myrow = DB_fetch_array($CategoryResult)){
+ while($myrow = DB_fetch_array($CategoryResult)) {
echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
echo '</select></td>
@@ -1177,7 +1177,7 @@
echo '<tr>
<td>' . _('For Sales Person') . ':</td>';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
echo '<td>';
echo $_SESSION['UsersRealName'];
echo '</td>';
@@ -1185,8 +1185,8 @@
echo '<td><select name="Salesman">';
$sql="SELECT salesmancode, salesmanname FROM salesman";
$SalesmanResult= DB_query($sql);
- echo '<option selected="selected" value="All">' . _('All Salesmen') . '</option>';
- While ($myrow = DB_fetch_array($SalesmanResult)){
+ echo '<option selected="selected" value="All">' . _('All Salespeople') . '</option>';
+ while($myrow = DB_fetch_array($SalesmanResult)) {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td>';
@@ -1198,7 +1198,7 @@
<td><select name="Area">';
$AreasResult= DB_query("SELECT areacode, areadescription FROM areas");
echo '<option selected="selected" value="All">' . _('All Areas') . '</option>';
- While ($myrow = DB_fetch_array($AreasResult)){
+ while($myrow = DB_fetch_array($AreasResult)) {
echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
echo '</select></td></tr>';
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/SelectCustomer.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -206,7 +206,7 @@
echo '</td><td valign="top" class="select">';
// Customer transactions options:
echo '<a href="', $RootPath, '/SelectSalesOrder.php?SelectedCustomer=', urlencode($_SESSION['CustomerID']), '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
- echo '<a title="' . _('This allows the deposits received from the customer to be matched against invoices') . '" href="', $RootPath, '/CustomerAllocations.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Allocate Receipts OR Credit Notes') . '</a><br />';
+ echo '<a title="' . _('This allows the deposits received from the customer to be matched against invoices') . '" href="', $RootPath, '/CustomerAllocations.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
if(isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])) {
echo '<a href="', $RootPath, '/CounterSales.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
}
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/WorkOrderEntry.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,37 +1,38 @@
<?php
-
/* $Id$*/
+/* Entry of new work orders */
include('includes/session.inc');
$Title = _('Work Order Entry');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
- </p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
-if (isset($_GET['WO'])) {
+if(isset($_GET['WO'])) {
$SelectedWO = $_GET['WO'];
-} elseif (isset($_POST['WO'])){
+} elseif(isset($_POST['WO'])) {
$SelectedWO = $_POST['WO'];
} else {
unset($SelectedWO);
}
-if (isset($_GET['ReqDate'])){
+if(isset($_GET['ReqDate'])) {
$ReqDate = $_GET['ReqDate'];
} else {
$ReqDate=Date('Y-m-d');
}
-if (isset($_GET['StartDate'])){
+if(isset($_GET['StartDate'])) {
$StartDate = $_GET['StartDate'];
} else {
$StartDate=Date('Y-m-d');
}
-if (isset($_GET['loccode'])){
+if(isset($_GET['loccode'])) {
$LocCode = $_GET['loccode'];
} else {
$LocCode=$_SESSION['UserStockLocation'];
@@ -44,7 +45,7 @@
WHERE locations.loccode='" . $LocCode . "'");
$LocRow = DB_fetch_array($LocResult);
-if (is_null($LocRow['loccode']) OR $LocRow['loccode']==''){
+if(is_null($LocRow['loccode']) OR $LocRow['loccode']=='') {
prnMsg(_('Your security settings do not allow you to create or update new Work Order at this location') . ' ' . $LocCode,'error');
echo '<br /><a href="' . $RootPath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
include('includes/footer.inc');
@@ -52,24 +53,24 @@
}
foreach ($_POST as $key=>$value) {
- if (substr($key, 0, 9)=='OutputQty' OR substr($key, 0, 7)=='RecdQty') {
+ if(substr($key, 0, 9)=='OutputQty' OR substr($key, 0, 7)=='RecdQty') {
$_POST[$key] = filter_number_format($value);
}
}
// check for new or modify condition
-if (isset($SelectedWO) AND$SelectedWO!=''){
+if(isset($SelectedWO) AND$SelectedWO!='') {
// modify
$_POST['WO'] = (int)$SelectedWO;
$EditingExisting = true;
} else {
- if (!isset($_POST['Ref'])) {
+ if(!isset($_POST['Ref'])) {
$Ref = '';
}
- if (!isset($_POST['Remark'])) {
+ if(!isset($_POST['Remark'])) {
$Remark = '';
}
-
+
// new
$_POST['WO'] = GetNextTransNo(40,$db);
$SQL = "INSERT INTO workorders (wo,
@@ -89,34 +90,34 @@
}
-if (isset($_GET['NewItem'])){
+if(isset($_GET['NewItem'])) {
$NewItem = $_GET['NewItem'];
}
-if (isset($_GET['ReqQty'])){
+if(isset($_GET['ReqQty'])) {
$ReqQty = $_GET['ReqQty'];
}
-if (!isset($_POST['StockLocation'])){
- if (isset($LocCode)){
+if(!isset($_POST['StockLocation'])) {
+ if(isset($LocCode)) {
$_POST['StockLocation']=$LocCode;
- } elseif (isset($_SESSION['UserStockLocation'])){
+ } elseif(isset($_SESSION['UserStockLocation'])) {
$_POST['StockLocation']=$_SESSION['UserStockLocation'];
}
}
-if (isset($_POST['Search']) OR isset($_POST['Prev']) OR isset($_POST['Next'])){
+if(isset($_POST['Search']) OR isset($_POST['Prev']) OR isset($_POST['Next'])) {
If ($_POST['Keywords'] AND $_POST['StockCode']) {
prnMsg(_('Stock description keywords have been used in preference to the Stock code extract entered'),'warn');
}
- if (mb_strlen($_POST['SO'])>0) {
+ if(mb_strlen($_POST['SO'])>0) {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
stockmaster.controlled,
salesorderdetails.quantity
- FROM salesorderdetails
+ FROM salesorderdetails
INNER JOIN stockmaster
ON salesorderdetails.stkcode=stockmaster.stockid
WHERE salesorderdetails.orderno='" . $_POST['SO'] . "'
@@ -140,7 +141,7 @@
$_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,
stockmaster.units,
@@ -169,13 +170,13 @@
ORDER BY stockmaster.stockid";
}
- } elseif (mb_strlen($_POST['StockCode'])>0){
+ } elseif(mb_strlen($_POST['StockCode'])>0) {
$_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
$SearchString = '%' . $_POST['StockCode'] . '%';
/* Only items of stock type F finished goods or M - raw materials can have work orders created - raw materials can include the manufacture of components (as noted by Bob Thomas! */
- if ($_POST['StockCat']=='All'){
+ if($_POST['StockCat']=='All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
@@ -204,7 +205,7 @@
ORDER BY stockmaster.stockid";
}
} else {
- if ($_POST['StockCat']=='All'){
+ if($_POST['StockCat']=='All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
@@ -242,26 +243,26 @@
DB_free_result($SearchResult);
unset($SearchResult);
$ListCount = $myrow[0];
- if ($ListCount>0){
+ if($ListCount>0) {
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax'])-1;
} else {
$ListPageMax =1;
}
- if (isset($_POST['Next'])) {
+ if(isset($_POST['Next'])) {
$Offset = $_POST['CurrPage']+1;
}
- if (isset($_POST['Prev'])) {
+ if(isset($_POST['Prev'])) {
$Offset = $_POST['CurrPage']-1;
}
- if (!isset($Offset)) {
+ if(!isset($Offset)) {
$Offset=0;
}
- if($Offset<0){
+ if($Offset<0) {
$Offset=0;
}
- if($Offset>$ListPageMax){
+ if($Offset>$ListPageMax) {
$Offset=$ListPageMax;
}
$SQL = $SQL . ' LIMIT ' . $_SESSION['DisplayRecordsMax'].' OFFSET ' . strval($_SESSION['DisplayRecordsMax']*$Offset);
@@ -271,29 +272,29 @@
$DbgMsg = _('The SQL used to get the part selection was');
$SearchResult = DB_query($SQL,$ErrMsg, $DbgMsg);
- if (DB_num_rows($SearchResult)==0 ){
+ if(DB_num_rows($SearchResult)==0 ) {
prnMsg (_('There are no products available meeting the criteria specified'),'info');
- if ($debug==1){
+ if($debug==1) {
prnMsg(_('The SQL statement used was') . ':<br />' . $SQL,'info');
}
}
- if (DB_num_rows($SearchResult)==1){
+ if(DB_num_rows($SearchResult)==1) {
$myrow=DB_fetch_array($SearchResult);
$NewItem = $myrow['stockid'];
- if (isset($myrow['quantity'])) {
+ if(isset($myrow['quantity'])) {
$ReqQty = $myrow['quantity'];
}
DB_data_seek($SearchResult,0);
}
} //end of if search
-if (isset($_POST['Add'])) {
- foreach($_POST as $key=>$value){
- if (strpos($key,'Check_')!==false){
+if(isset($_POST['Add'])) {
+ foreach($_POST as $key=>$value) {
+ if(strpos($key,'Check_')!==false) {
$NewItem[] = array('item'=>$value,'qty'=>0);
}
- if (strpos($key,'Qty_') !== false AND $value>0) {
+ if(strpos($key,'Qty_') !== false AND $value>0) {
$No = substr($key,4);
$NewItem[] = array('item'=>$_POST['Item_'.$No],'qty'=>$value);
}
@@ -301,25 +302,25 @@
}
-if (isset($NewItem) AND isset($_POST['WO'])){
- if (!is_array($NewItem)) {
+if(isset($NewItem) AND isset($_POST['WO'])) {
+ if(!is_array($NewItem)) {
$InputError=false;
$CheckItemResult = DB_query("SELECT mbflag,
eoq,
controlled
FROM stockmaster
WHERE stockid='" . $NewItem . "'");
- if (DB_num_rows($CheckItemResult)==1){
+ if(DB_num_rows($CheckItemResult)==1) {
$CheckItemRow = DB_fetch_array($CheckItemResult);
- if ($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1){ //need to add serial nos or batches to determine quantity
+ if($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1) { //need to add serial nos or batches to determine quantity
$EOQ = 0;
} else {
- if (!isset($ReqQty)) {
+ if(!isset($ReqQty)) {
$ReqQty=$CheckItemRow['eoq'];
}
$EOQ = $ReqQty;
}
- if ($CheckItemRow['mbflag']!='M'){
+ if($CheckItemRow['mbflag']!='M') {
prnMsg(_('The item selected cannot be added to a work order because it is not a manufactured item'),'warn');
$InputError=true;
}
@@ -331,13 +332,13 @@
FROM woitems
WHERE stockid='" . $NewItem . "'
AND wo='" .$_POST['WO'] . "'");
- if (DB_num_rows($CheckItemResult)==1){
+ if(DB_num_rows($CheckItemResult)==1) {
prnMsg(_('This item is already on the work order and cannot be added again'),'warn');
$InputError=true;
}
- if ($InputError==false){
+ if($InputError==false) {
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost,
bom.loccode
FROM stockmaster
@@ -348,16 +349,16 @@
AND bom.effectiveafter<='" . Date('Y-m-d') . "'
AND bom.effectiveto>='" . Date('Y-m-d') . "'");
$CostRow = DB_fetch_array($CostResult);
- if (is_null($CostRow['cost'])){
+ if(is_null($CostRow['cost'])) {
$Cost =0;
prnMsg(_('The cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this'),'warn');
- } elseif ($CostRow['cost'] == 0) {
+ } elseif($CostRow['cost'] == 0) {
$Cost = 0;
prnMsg(_('The cost of this item as accumulated from the sum of the component costs is zero'),'warn');
} else {
$Cost = $CostRow['cost'];
}
- if (!isset($EOQ)){
+ if(!isset($EOQ)) {
$EOQ=1;
}
@@ -388,7 +389,7 @@
DB_txn_begin($db);
foreach ($NewItem as $ItemDetail) {
$Itm = $ItemDetail['item'];
- if ($ItemDetail['qty']>0) {
+ if($ItemDetail['qty']>0) {
$ReqQty = $ItemDetail['qty'];
}
$InputError=false;
@@ -398,17 +399,17 @@
FROM stockmaster
WHERE stockid='" . $Itm . "'",
$db);
- if (DB_num_rows($CheckItemResult)==1){
+ if(DB_num_rows($CheckItemResult)==1) {
$CheckItemRow = DB_fetch_array($CheckItemResult);
- if ($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1){ //need to add serial nos or batches to determine quantity
+ if($CheckItemRow['controlled']==1 AND $_SESSION['DefineControlledOnWOEntry']==1) { //need to add serial nos or batches to determine quantity
$EOQ = 0;
} else {
- if (!isset($ReqQty)) {
+ if(!isset($ReqQty)) {
$ReqQty=$CheckItemRow['eoq'];
}
$EOQ = $ReqQty;
}
- if ($CheckItemRow['mbflag']!='M'){
+ if($CheckItemRow['mbflag']!='M') {
prnMsg(_('The item selected cannot be added to a work order because it is not a manufactured item'),'warn');
$InputError=true;
}
@@ -421,13 +422,13 @@
WHERE stockid='" . $Itm . "'
AND wo='" .$_POST['WO'] . "'"
);
- if (DB_num_rows($CheckItemResult)==1){
+ if(DB_num_rows($CheckItemResult)==1) {
prnMsg(_('This item is already on the work order and cannot be added again'),'warn');
$InputError=true;
}
- if ($InputError==false){
+ if($InputError==false) {
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost,
bom.loccode
FROM stockmaster
@@ -438,18 +439,18 @@
AND bom.effectiveafter<='" . Date('Y-m-d') . "'
AND bom.effectiveto>='" . Date('Y-m-d') . "'",
$db);
-
+
$CostRow = DB_fetch_array($CostResult);
- if (is_null($CostRow['cost'])){
+ if(is_null($CostRow['cost'])) {
$Cost =0;
prnMsg(_('The cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this'),'warn');
- } elseif ($CostRow['cost'] == 0) {
+ } elseif($CostRow['cost'] == 0) {
$Cost = 0;
prnMsg(_('The The cost of this item as accumulated from the sum of the component costs is zero'),'warn');
} else {
$Cost = $CostRow['cost'];
}
- if (!isset($EOQ)){
+ if(!isset($EOQ)) {
$EOQ=1;
}
@@ -474,45 +475,45 @@
DB_txn_rollback($db);
}
}//end of foreach loop;
-
+
DB_txn_commit($db);
unset($NewItem);
}
} //adding a new item to the work order
-if (isset($_POST['submit']) OR isset($_POST['Search'])) { //The update button has been clicked
+if(isset($_POST['submit']) OR isset($_POST['Search'])) { //The update button has been click...
[truncated message content] |
|
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:523
msgid "User Can Create Tenders"
msgstr ""
-#: WWW_Users.php:570
+#: WWW_Users.php:564
msgid ""
"If this user login is to be associated with a customer account, enter the "
"customer account code"
msgstr ""
-#: WWW_Users.php:575
+#: WWW_Users.php:569
msgid ""
"If this user login is to be associated with a customer account a valid "
"branch for the customer account must be entered."
msgstr ""
-#: WWW_Users.php:584
+#: WWW_Users.php:578
msgid "Restrict to Sales Person"
msgstr ""
-#: WWW_Users.php:590 WWW_Users.php:592
+#: WWW_Users.php:584 WWW_Users.php:586
msgid "Not a salesperson only login"
msgstr ""
-#: WWW_Users.php:703
-msgid "module"
-msgstr ""
-
-#: WWW_Users.php:718
+#: WWW_Users.php:710
msgid "Display Dashboard after Login"
msgstr ""
-#: WWW_Users.php:750
+#: WWW_Users.php:741
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:760 WWW_Users.php:762
+#: WWW_Users.php:751 WWW_Users.php:753
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:777 index.php:38
+#: WWW_Users.php:768 index.php:38
msgid "Account Status"
msgstr ""
-#: WWW_Users.php:780 WWW_Users.php:784
+#: WWW_Users.php:771 WWW_Users.php:775
msgid "Open"
msgstr ""
-#: WWW_Users.php:781 WWW_Users.php:783
+#: WWW_Users.php:772 WWW_Users.php:774
msgid "Blocked"
msgstr ""
@@ -44863,6 +44899,10 @@
msgid "Items"
msgstr ""
+#: includes/header.inc:77 includes/header.inc:81
+msgid "Manual"
+msgstr ""
+
#: includes/header.inc:90 ../webSHOP/includes/header.php:232
msgid "Are you sure you wish to logout?"
msgstr ""
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-20 22:56:18 UTC (rev 7673)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-11-21 00:08:18 UTC (rev 7674)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\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: 2015-11-12 20:40+0200\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -271,10 +271,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 "إبحث"
@@ -358,8 +358,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 "موافق"
@@ -427,8 +427,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 "ﻻ"
@@ -459,7 +459,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
@@ -507,7 +507,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
@@ -555,7 +555,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 "أدخل المعلومات"
@@ -755,7 +755,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
@@ -994,7 +994,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"
@@ -4239,7 +4239,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 ""
@@ -4386,9 +4386,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
@@ -4558,7 +4558,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
@@ -6463,9 +6463,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 ""
@@ -6591,7 +6590,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 "الاعدادات"
@@ -8061,7 +8060,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"
@@ -8430,39 +8429,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 ""
@@ -8479,8 +8478,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 ""
@@ -8489,7 +8488,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"
@@ -8499,8 +8498,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 ""
@@ -8509,7 +8508,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 ""
@@ -8518,27 +8517,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 ""
@@ -8548,35 +8547,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 ""
@@ -9428,7 +9427,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 "البائعين"
@@ -12389,7 +12388,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 ""
@@ -14234,6 +14233,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 ""
@@ -14379,21 +14382,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 ""
@@ -19830,7 +19822,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 "المبيعات"
@@ -21248,7 +21240,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 ""
@@ -21492,7 +21484,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 ""
@@ -22264,7 +22256,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 "المصروفات النثرية"
@@ -26528,7 +26520,6 @@
msgstr ""
#: SalesTopCustomersInquiry.php:82 SalesTopItemsInquiry.php:83
-#: WWW_Users.php:703
msgid "Display"
msgstr ""
@@ -32343,33 +32334,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 "مدير الاصول"
@@ -32461,7 +32452,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 ""
@@ -33109,6 +33100,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"
@@ -35641,7 +35638,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
@@ -36853,11 +36850,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 ""
@@ -36877,11 +36874,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 ""
@@ -36914,7 +36911,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 ""
@@ -37185,202 +37182,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:523
msgid "User Can Create Tenders"
msgstr ""
-#: WWW_Users.php:570
+#: WWW_Users.php:564
msgid ""
"If this user login is to be associated with a customer account, enter the "
"customer account code"
msgstr ""
-#: WWW_Users.php:575
+#: WWW_Users.php:569
msgid ""
"If this user login is to be associated with a customer account a valid "
"branch for the customer account must be entered."
msgstr ""
-#: WWW_Users.php:584
+#: WWW_Users.php:578
msgid "Restrict to Sales Person"
msgstr ""
-#: WWW_Users.php:590 WWW_Users.php:592
+#: WWW_Users.php:584 WWW_Users.php:586
msgid "Not a salesperson only login"
msgstr ""
-#: WWW_Users.php:703
-msgid "module"
-msgstr ""
-
-#: WWW_Users.php:718
+#: WWW_Users.php:710
msgid "Display Dashboard after Login"
msgstr ""
-#: WWW_Users.php:750
+#: WWW_Users.php:741
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:760 WWW_Users.php:762
+#: WWW_Users.php:751 WWW_Users.php:753
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:777 index.php:38
+#: WWW_Users.php:768 index.php:38
msgid "Account Status"
msgstr ""
-#: WWW_Users.php:780 WWW_Users.php:784
+#: WWW_Users.php:771 WWW_Users.php:775
msgid "Open"
msgstr ""
-#: WWW_Users.php:781 WWW_Users.php:783
+#: WWW_Users.php:772 WWW_Users.php:774
msgid "Blocked"
msgstr ""
@@ -44942,6 +44978,10 @@
msgid "Items"
msgstr "الاصناف"
+#: includes/header.inc:77 includes/header.inc:81
+msgid "Manual"
+msgstr "دليل المستخدم"
+
#: includes/header.inc:90 ../webSHOP/includes/header.php:232
msgid "Are you sure you wish to logout?"
msgstr ""
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-20 22:56:18 UTC (rev 7673)
+++ trunk/locale/cs_CZ.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:20-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -279,10 +279,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...
[truncated message content] |
|
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-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-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 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"
-msgstr ""
+msgstr "Interés"
#: GLCashFlowsSetup.php:86
msgid "Loan"
-msgstr ""
+msgstr "Préstamo"
#: GLCashFlowsSetup.php:89
msgid "Building"
-msgstr ""
+msgstr "Edificio"
#: GLCashFlowsSetup.php:92
msgid "Equipment"
-msgstr ""
+msgstr "Equipo"
#: GLCashFlowsSetup.php:95
msgid "Land"
-msgstr ""
+msgstr "Terreno"
#: GLCashFlowsSetup.php:98
msgid "Vehicle"
-msgstr ""
+msgstr "Vehículo"
#: GLCashFlowsSetup.php:101
msgid "Sale"
-msgstr ""
+msgstr "Venta"
#: GLCashFlowsSetup.php:107
msgid "Receivable"
-msgstr ""
+msgstr "Cuenta por cobrar"
#: GLCashFlowsSetup.php:113
msgid "Payable"
-msgstr ""
+msgstr "Cuenta por pagar"
#: GLCashFlowsSetup.php:116 includes/PDFStockComparisonPageHeader.inc:37
msgid "Adjustment"
@@ -15168,7 +15190,7 @@
#: GLCashFlowsSetup.php:119
msgid "Amortisation"
-msgstr ""
+msgstr "Amortización"
#: GLCashFlowsSetup.php:130
msgid "Can not update chartmaster.cashflowsactivity. Error code:"
@@ -50854,7 +50876,7 @@
#: includes/MainMenuLinksArray.php:378
msgid "Statement of Cash Flows"
-msgstr ""
+msgstr "Estado de flujos de efectivo"
#: includes/MainMenuLinksArray.php:381
msgid "Tag Reports"
@@ -53663,6 +53685,17 @@
msgid "Bank Transfer"
msgstr "Transferencia bancaria"
+#~ 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."
+#~ msgstr ""
+#~ "El estado de flujos de efectivo, también conocido como estado de flujos "
+#~ "de efectivo, informa cómo los cambios en las cuentas del balance y los "
+#~ "ingresos afectan al efectivo y equivalentes de efectivo y divide el "
+#~ "análisis en actividades operativas, de inversión y de financiación."
+
#~ msgid "Chart of Accounts Maintenance"
#~ msgstr "Administrar el Plan de Cuentas"
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/et_EE.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:24-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Estonian <kal...@ee...>\n"
@@ -14230,16 +14230,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/fa_IR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/fa_IR.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:25-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Persian <hos...@io...>\n"
@@ -14587,16 +14587,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/fr_CA.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2016-11-18 01:46:09 UTC (rev 7670)
@@ -9,7 +9,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-06 10:12-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: french <none>\n"
@@ -14865,16 +14865,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/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 00:46:07 UTC (rev 7669)
+++ trunk/locale/fr_FR.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-09-14 09:56-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
@@ -15118,16 +15118,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/he_IL.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/he_IL.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-11 01:58+0200\n"
"Last-Translator: Hagay Mandel <ma...@ne...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
@@ -15091,16 +15091,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/hi_IN.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo 2016-11-18 00:46:07 UTC (rev 7669)
+++ trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo 2016-11-18 01:46:09 UTC (rev 7670)
@@ -2492,7 +2492,7 @@
@@ Diff output truncated at 100000 characters. @@
|
|
From: <rc...@us...> - 2016-11-18 00:46:12
|
Revision: 7669
http://sourceforge.net/p/web-erp/reponame/7669
Author: rchacon
Date: 2016-11-18 00:46:07 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
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/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:22:26 UTC (rev 7668)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-18 00:46:07 UTC (rev 7669)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-31 20:01-0600\n"
+"POT-Creation-Date: 2016-11-17 18:42-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"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
-#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
-#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
-#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
-#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
-#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
-#: Locations.php:343 Locations.php:351 Manufacturers.php:185
-#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147
-#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166
-#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
-#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
-#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
-#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
+#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
+#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
+#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:137 GLAccounts.php:109 GLAccounts.php:123
+#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
+#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
+#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
+#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
+#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
+#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
+#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
+#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
+#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
+#: WorkCentres.php:91 WorkCentres.php:97
msgid "There are"
msgstr "يوجد"
@@ -227,54 +227,51 @@
#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
-#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
-#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:285 BOMs.php:991
-#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
-#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:100
-#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: Credit_Invoice.php:287 CreditStatus.php:21 CustEDISetup.php:17
-#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
+#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
+#: BOMListing.php:110 BOMs.php:285 BOMs.php:991 COGSGLPostings.php:19
+#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273
+#: CompanyPreferences.php:100 CounterReturns.php:1629 CounterSales.php:2097
+#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:287
+#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:168
-#: InternalStockRequest.php:316 InventoryPlanning.php:459
-#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
-#: MaintenanceUserSchedule.php:16 MRPReport.php:544 NoSalesItems.php:91
-#: PcAssignCashTabToTab.php:57 PcAssignCashTabToTab.php:137
-#: PcAssignCashTabToTab.php:193 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
-#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
-#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
-#: PurchData.php:373 PurchData.php:401 QATests.php:22
-#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
-#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
-#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
-#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
-#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
-#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:559
-#: SelectOrderItems.php:1472 SelectOrderItems.php:1572 SelectProduct.php:522
-#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:14
-#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
-#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: HistoricalTestResults.php:42 InternalStockRequest.php:316
+#: InternalStockRequestInquiry.php:168 InventoryPlanning.php:459
+#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:544
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
+#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:57
+#: PcAssignCashTabToTab.php:137 PcAssignCashTabToTab.php:193
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
+#: PcAssignCashToTab.php:207 PriceMatrix.php:16 Prices.php:11
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
+#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
+#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
+#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
+#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
+#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
+#: SelectOrderItems.php:559 SelectOrderItems.php:1472 SelectOrderItems.php:1572
+#: SelectProduct.php:522 SelectQASamples.php:45 SelectSalesOrder.php:545
+#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
+#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:16 SupplierPriceList.php:226
-#: SupplierPriceList.php:396 SupplierPriceList.php:400
-#: SupplierPriceList.php:451 SupplierPriceList.php:501 Suppliers.php:304
+#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
+#: SupplierPriceList.php:458 SupplierPriceList.php:503
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
-#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:251
+#: 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
msgid "Search"
msgstr "إبحث"
@@ -312,65 +309,64 @@
#: InternalStockRequestInquiry.php:437 InternalStockRequestInquiry.php:448
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
-#: MRP.php:566 MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
-#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
-#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602
-#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
-#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
-#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
-#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
-#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
-#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
-#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
-#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
-#: QATests.php:424 QATests.php:429 QATests.php:434
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
-#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:230
-#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
-#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
-#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
+#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
+#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
+#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
+#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
+#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
+#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
+#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
+#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
+#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
+#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
+#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
+#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
+#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
+#: SelectProduct.php:230 SelectProduct.php:368 SelectQASamples.php:424
+#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
+#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
+#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
+#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
+#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
+#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:938
+#: StockClone.php:940 StockClone.php:963 StockClone.php:965 Stocks.php:1266
+#: Stocks.php:1268 Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
-#: SystemParameters.php:1090 SystemParameters.php:1100
-#: SystemParameters.php:1102 SystemParameters.php:1156
-#: SystemParameters.php:1168 SystemParameters.php:1170
-#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
-#: TaxGroups.php:314 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
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
+#: 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
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
-#: AddCustomerContacts.php:278 AddCustomerContacts.php:281
-#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895
-#: BOMs.php:899 CompanyPreferences.php:422 CompanyPreferences.php:426
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BOMs.php:142
+#: BOMs.php:895 BOMs.php:899 BankAccounts.php:218 BankAccounts.php:412
+#: BankAccounts.php:414 BankAccounts.php:418 BankAccounts.php:426
+#: CompanyPreferences.php:422 CompanyPreferences.php:426
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
@@ -382,15 +378,15 @@
#: InternalStockRequestInquiry.php:435 InternalStockRequestInquiry.php:446
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
-#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
-#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
-#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
-#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603
+#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
+#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:603
#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
+#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
+#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -419,50 +415,50 @@
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087
-#: SystemParameters.php:1091 SystemParameters.php:1099
-#: SystemParameters.php:1103 SystemParameters.php:1157
-#: SystemParameters.php:1167 SystemParameters.php:1171
-#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
-#: TaxGroups.php:315 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
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
+#: 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
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:158
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:112
+#: BOMs.php:198 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
+#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
+#: FreightCosts.php:253 GLAccounts.php:347 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
-#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
-#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
-#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
-#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
-#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
-#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
-#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
-#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:116
-#: SelectCustomer.php:733 SelectCustomer.php:759 SelectCustomer.php:814
-#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
-#: SelectGLAccount.php:139 SelectGLAccount.php:154 SelectQASamples.php:417
-#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
-#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
-#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
-#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:368
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
+#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
+#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
+#: PaymentTerms.php:205 PcAssignCashToTab.php:291
+#: PcClaimExpensesFromTab.php:280 PcExpenses.php:226 PcTabs.php:256
+#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
+#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
+#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
+#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
+#: SecurityTokens.php:116 SelectCustomer.php:733 SelectCustomer.php:759
+#: SelectCustomer.php:814 SelectCustomer.php:832 SelectCustomer.php:856
+#: SelectCustomer.php:873 SelectGLAccount.php:139 SelectGLAccount.php:154
+#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
+#: 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
+#: WorkCentres.php:145 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
@@ -474,41 +470,41 @@
#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:159
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:113
+#: BOMs.php:200 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:420
-#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:1001 Customers.php:1166 CustomerTypes.php:206
+#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
+#: Credit_Invoice.php:420 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:1001 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:431 GLTags.php:97
+#: GLAccounts.php:348 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
-#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:211 Payments.php:1155 PaymentTerms.php:206
+#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
+#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1155
#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
-#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
-#: PurchData.php:314 PurchData.php:721 QATests.php:468
+#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
+#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
-#: SelectOrderItems.php:1384 SelectQASamples.php:418
-#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
-#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
-#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151 SupplierContacts.php:166
-#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
-#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
-#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:146 WorkOrderEntry.php:864 WOSerialNos.php:335
-#: WWW_Access.php:133 WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
+#: SelectOrderItems.php:1384 SelectQASamples.php:418 SellThroughSupport.php:299
+#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90
+#: SuppInvGRNs.php:151 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
+#: SupplierContacts.php:166 SupplierTenderCreate.php:422
+#: 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
+#: WorkOrderEntry.php:864 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
@@ -539,21 +535,21 @@
#: AccountGroups.php:405 AccountSections.php:285 AddCustomerContacts.php:297
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:433 BOMs.php:916 COGSGLPostings.php:368
+#: BOMs.php:916 BankAccounts.php:433 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:647
-#: Locations.php:716 Manufacturers.php:375 MRPDemands.php:424
-#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
-#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
+#: FreightCosts.php:371 GLAccounts.php:297 GeocodeSetup.php:271 Labels.php:647
+#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424
+#: Manufacturers.php:375 OffersReceived.php:57 OffersReceived.php:146
+#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
-#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
+#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WorkCentres.php:289 WWW_Users.php:792
+#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:289
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -697,12 +693,11 @@
#: AddCustomerContacts.php:63 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102
-#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
-#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PO_Items.php:380
+#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:86 PcExpenses.php:98
+#: PcTabs.php:124 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531
-#: SupplierTypes.php:68
+#: SelectQASamples.php:85 Stocks.php:594 SupplierTypes.php:68 Suppliers.php:531
msgid "has been updated"
msgstr ""
@@ -720,7 +715,7 @@
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288
-#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
+#: StockDispatch.php:299 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:164
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
@@ -745,14 +740,13 @@
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
-#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403
-#: PrintCustStatements.php:99 PrintCustTrans.php:740
-#: PrintCustTransPortrait.php:788 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 includes/PDFStatementPageHeader.inc:76
-#: includes/PDFTransPageHeader.inc:85
+#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99
+#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788
+#: 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
+#: 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
#: ../webSHOP/Register.php:595
@@ -766,13 +760,14 @@
#: AddCustomerContacts.php:138 AddCustomerContacts.php:289
#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:123
-#: Customers.php:1122 Customers.php:1130 PcAssignCashTabToTab.php:242
+#: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:126
+#: GLCashFlowsIndirect.php:445 PDFQuotation.php:252
+#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:242
#: PcAssignCashTabToTab.php:365 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportTab.php:333 PDFQuotation.php:252 PDFQuotationPortrait.php:249
-#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411
-#: WOSerialNos.php:306 WOSerialNos.php:312
+#: PcReportTab.php:333 SelectCustomer.php:732 ShopParameters.php:198
+#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -804,9 +799,8 @@
#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:597
-#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72
-#: includes/PDFTransPageHeader.inc:84
+#: SelectCustomer.php:406 SelectOrderItems.php:597 SupplierTenderCreate.php:395
+#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
msgid "Phone"
@@ -859,23 +853,23 @@
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: AgedControlledInventory.php:47 BankMatching.php:281
#: BankReconciliation.php:212 BankReconciliation.php:289
-#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
-#: CustomerAllocations.php:378 CustomerInquiry.php:252
-#: CustomerTransInquiry.php:100 CustWhereAlloc.php:133 GLAccountReport.php:347
+#: ContractCosting.php:177 CustWhereAlloc.php:133 CustomerAccount.php:252
+#: CustomerAllocations.php:348 CustomerAllocations.php:378
+#: CustomerInquiry.php:252 CustomerTransInquiry.php:100 GLAccountReport.php:347
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
+#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:238
-#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:93
-#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
-#: PrintCustTrans.php:822 PrintCustTransPortrait.php:902
-#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
-#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
-#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
-#: StockLocMovements.php:92 StockMovements.php:105
-#: StockSerialItemResearch.php:82 SupplierAllocations.php:455
-#: SupplierAllocations.php:569 SupplierAllocations.php:644
-#: SupplierInquiry.php:210 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132
-#: Tax.php:408 includes/PDFQuotationPageHeader.inc:31
+#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
+#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
+#: SelectCustomer.php:810 SelectCustomer.php:852 ShipmentCosting.php:538
+#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:279
+#: StockDispatch.php:290 StockDispatch.php:301 StockLocMovements.php:92
+#: StockMovements.php:105 StockSerialItemResearch.php:82 SuppWhereAlloc.php:132
+#: SupplierAllocations.php:455 SupplierAllocations.php:569
+#: SupplierAllocations.php:644 SupplierInquiry.php:204
+#: SupplierTransInquiry.php:111 Tax.php:408
+#: includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:62
@@ -980,16 +974,17 @@
msgid "as-of"
msgstr ""
-#: AgedControlledInventory.php:12 InventoryQuantities.php:155
-#: InventoryValuation.php:217 Locations.php:12 MRPCalendar.php:21
-#: MRPCreateDemands.php:193 MRPDemands.php:27 MRPDemandTypes.php:17
-#: MRP.php:542 MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
-#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12
-#: ReorderLevel.php:194 SelectProduct.php:90 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 includes/MainMenuLinksArray.php:26
+#: AgedControlledInventory.php:12 GLCashFlowsSetup.php:110
+#: InventoryQuantities.php:155 InventoryValuation.php:217 Locations.php:12
+#: MRP.php:542 MRPCalendar.php:21 MRPCreateDemands.php:193
+#: MRPDemandTypes.php:17 MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265
+#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321 PricesByCost.php:8
+#: ReorderLevel.php:194 ReorderLevelLocation.php:12 SelectProduct.php:90
+#: 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
+#: includes/MainMenuLinksArray.php:24
#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -999,41 +994,39 @@
msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
-#: StockClone.php:53 Stocks.php:63
-#: reportwriter/languages/en_US/reports.php:103
+#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015
-#: CollectiveWorkOrderCost.php:45 CollectiveWorkOrderCost.php:317
-#: ContractBOM.php:242 ContractBOM.php:354 ContractOtherReqts.php:98
-#: CounterReturns.php:1692 CounterSales.php:2102 CounterSales.php:2256
-#: CreditStatus.php:152 CreditStatus.php:243 CustomerPurchases.php:81
-#: EmailConfirmation.php:219 EmailConfirmation.php:349
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015 CollectiveWorkOrderCost.php:45
+#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
+#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
+#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219 EmailConfirmation.php:349
#: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91
#: FixedAssetRegister.php:87 FixedAssetRegister.php:388
#: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63
#: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122
-#: InternalStockCategoriesByRole.php:168 InternalStockRequestInquiry.php:222
-#: InternalStockRequestInquiry.php:268 InternalStockRequestInquiry.php:405
-#: InternalStockRequest.php:350 InternalStockRequest.php:564
-#: InternalStockRequest.php:634 InventoryPlanning.php:419
+#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:350
+#: InternalStockRequest.php:564 InternalStockRequest.php:634
+#: InternalStockRequestInquiry.php:222 InternalStockRequestInquiry.php:268
+#: InternalStockRequestInquiry.php:405 InventoryPlanning.php:419
#: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290
-#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
-#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295
-#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258 MRPReport.php:564
-#: MRPReport.php:778 MRPReschedules.php:192 MRPShortages.php:350
-#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190
-#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
-#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335
-#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82
-#: PO_Items.php:716 PO_Items.php:1194 PO_SelectOSPurchOrder.php:310
-#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154
-#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:400
-#: SalesCategories.php:549 SecurityTokens.php:107 SecurityTokens.php:167
-#: SelectAsset.php:264 SelectCompletedOrder.php:506 SelectContract.php:147
+#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295
+#: MRPPlannedWorkOrders.php:258 MRPReport.php:564 MRPReport.php:778
+#: MRPReschedules.php:192 MRPShortages.php:350 MaintenanceTasks.php:95
+#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194
+#: PDFCOA.php:64 PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
+#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
+#: PO_Items.php:1194 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
+#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
+#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
+#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
+#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:549
+#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
+#: SelectCompletedOrder.php:506 SelectContract.php:147
#: SelectCreditItems.php:1019 SelectOrderItems.php:1482
#: SelectOrderItems.php:1644 SelectProduct.php:542 SelectProduct.php:830
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
@@ -1041,24 +1034,22 @@
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120
-#: SuppInvGRNs.php:263 SupplierCredit.php:317 SupplierCredit.php:385
-#: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:41
-#: SupplierPriceList.php:273 SupplierPriceList.php:535
+#: SuppInvGRNs.php:263 SuppPriceList.php:309 SupplierCredit.php:317
+#: SupplierCredit.php:385 SupplierInvoice.php:668 SupplierInvoice.php:750
+#: SupplierPriceList.php:44 SupplierPriceList.php:276 SupplierPriceList.php:542
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
-#: SupplierTenderCreate.php:853 SupplierTenders.php:326
-#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309
-#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
-#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
-#: WorkOrderEntry.php:972 WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
-#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
-#: includes/PDFInventoryPlanPageHeader.inc:51
+#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421
+#: SupplierTenders.php:687 TestPlanResults.php:177 TestPlanResults.php:280
+#: TopItems.php:170 WorkCentres.php:130 WorkOrderCosting.php:98
+#: WorkOrderCosting.php:130 WorkOrderEntry.php:972 WorkOrderIssue.php:1009
+#: Z_ItemsWithoutPicture.php:35 api/api_xml-rpc.php:3489
+#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:256
-#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
-#: ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12
+#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236
msgid "Description"
msgstr ""
@@ -1097,14 +1088,13 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
-#: SelectCreditItems.php:697 SelectOrderItems.php:1323
-#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97
+#: SelectCreditItems.php:697 SelectOrderItems.php:1323 SuppContractChgs.php:107
+#: SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140
#: SupplierAllocations.php:457 SupplierAllocations.php:570
-#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:215
-#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250
-#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
-#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: includes/PDFQuotationPageHeader.inc:119
+#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:209
+#: Tax.php:250 Z_CheckDebtorsControl.php:149
+#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
+#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
#: includes/PO_PDFOrderPageHeader.inc:81
#: reportwriter/languages/en_US/reports.php:107
@@ -1131,18 +1121,18 @@
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
-#: GLTrialBalance.php:167 InternalStockRequestInquiry.php:251
-#: InternalStockRequest.php:325 InventoryPlanning.php:99
+#: GLTrialBalance.php:167 InternalStockRequest.php:325
+#: InternalStockRequestInquiry.php:251 InventoryPlanning.php:99
#: InventoryPlanning.php:176 InventoryPlanning.php:213
#: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183
#: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268
#: InventoryPlanningPrefSupplier.php:301 InventoryQuantities.php:84
-#: InventoryValuation.php:64 MailInventoryValuation.php:22
-#: MailInventoryValuation.php:120 MailSalesReport_csv.php:30
-#: MailSalesReport.php:23 MRPPlannedPurchaseOrders.php:114
+#: InventoryValuation.php:64 MRPPlannedPurchaseOrders.php:114
#: MRPPlannedWorkOrders.php:106 MRPReport.php:147 MRPReport.php:536
#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
-#: MRPShortages.php:167 OutstandingGRNs.php:46 OutstandingGRNs.php:59
+#: MRPShortages.php:167 MailInventoryValuation.php:22
+#: MailInventoryValuation.php:120 MailSalesReport.php:23
+#: MailSalesReport_csv.php:30 OutstandingGRNs.php:46 OutstandingGRNs.php:59
#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
#: PDFLowGP.php:20 PDFSalesBySalesperson.php:15
#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
@@ -1151,14 +1141,14 @@
#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471
#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531
#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:46
-#: StockCheck.php:60 StockCheck.php:132 SupplierTenderCreate.php:671
-#: SupplierTenders.php:397 SuppPriceList.php:138
+#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138
+#: SupplierTenderCreate.php:671 SupplierTenders.php:397
#: includes/PDFPaymentRun_PymtFooter.php:152
msgid "Problem Report"
msgstr ""
#: AgedDebtors.php:270 CustomerAccount.php:210 CustomerInquiry.php:116
-#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145
+#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:158
#: DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr ""
@@ -1167,47 +1157,45 @@
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
-#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
-#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
-#: FTP_RadioBeacon.php:187 GetStockImage.php:143 GLBalanceSheet.php:116
-#: GLBalanceSheet.php:155 GLBalanceSheet.php:334 GLProfit_Loss.php:191
-#: GLProfit_Loss.php:203 GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212
-#: GLTrialBalance.php:170 GLTrialBalance.php:182 InventoryPlanning.php:102
-#: InventoryPlanning.php:179 InventoryPlanning.php:216
-#: InventoryPlanning.php:265 InventoryPlanning.php:340
-#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
-#: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304
-#: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87
-#: InventoryQuantities.php:98 InventoryValuation.php:67
-#: InventoryValuation.php:92 MailInventoryValuation.php:123
+#: Credit_Invoice.php:201 Dashboard.php:159 Dashboard.php:246 Dashboard.php:399
+#: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187
+#: GLBalanceSheet.php:116 GLBalanceSheet.php:155 GLBalanceSheet.php:334
+#: GLProfit_Loss.php:191 GLProfit_Loss.php:203 GLTagProfit_Loss.php:199
+#: GLTagProfit_Loss.php:212 GLTrialBalance.php:170 GLTrialBalance.php:182
+#: GetStockImage.php:143 InventoryPlanning.php:102 InventoryPlanning.php:179
+#: InventoryPlanning.php:216 InventoryPlanning.php:265
+#: InventoryPlanning.php:340 InventoryPlanningPrefSupplier.php:186
+#: InventoryPlanningPrefSupplier.php:244 InventoryPlanningPrefSupplier.php:271
+#: InventoryPlanningPrefSupplier.php:304 InventoryPlanningPrefSupplier.php:372
+#: InventoryQuantities.php:87 InventoryQuantities.php:98
+#: InventoryValuation.php:67 InventoryValuation.php:92
+#: MRPPlannedPurchaseOrders.php:117 MRPPlannedPurchaseOrders.php:128
+#: MRPPlannedWorkOrders.php:109 MRPPlannedWorkOrders.php:120
+#: MRPPlannedWorkOrders.php:311 MRPReport.php:39 MRPReport.php:50
+#: MRPReport.php:150 MRPReschedules.php:48 MRPReschedules.php:60
+#: MRPShortages.php:158 MRPShortages.php:170 MailInventoryValuation.php:123
#: MailInventoryValuation.php:219 MailInventoryValuation.php:243
-#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117
-#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
-#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
-#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
-#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
-#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
-#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournalCN.php:148
-#: PDFGLJournal.php:108 PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71
-#: PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116
-#: PDFQuotation.php:276 PDFQuotationPortrait.php:268
-#: PDFRemittanceAdvice.php:83 PDFSalesBySalesperson.php:160
-#: PDFSalesBySalesperson.php:168 PDFSellThroughSupportClaim.php:74
-#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
-#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:271
-#: PDFWeeklyOrders.php:209 PDFWeeklyOrders.php:217 PDFWOPrint.php:109
-#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
-#: PrintCustOrder_generic.php:256 PrintCustOrder.php:238
+#: MailInventoryValuation.php:251 OutstandingGRNs.php:49 OutstandingGRNs.php:62
+#: PDFCustomerList.php:235 PDFCustomerList.php:247 PDFFGLabel.php:217
+#: PDFGLJournal.php:108 PDFGLJournalCN.php:148 PDFGrn.php:180 PDFLowGP.php:59
+#: PDFLowGP.php:71 PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116
+#: PDFQuotation.php:276 PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
+#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
+#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
+#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
+#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PDFWeeklyOrders.php:209
+#: PDFWeeklyOrders.php:217 PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
+#: PrintCustOrder.php:238 PrintCustOrder_generic.php:256
#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402
#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474
#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534
#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63
#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188
-#: StockDispatch.php:128 StockDispatch.php:141 SupplierBalsAtPeriodEnd.php:54
-#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112
+#: StockDispatch.php:128 StockDispatch.php:141 SuppPaymentRun.php:112
#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
-#: SuppPriceList.php:142 Tax.php:57 Tax.php:171 Tax.php:310
+#: SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54
+#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310
#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
@@ -1223,11 +1211,11 @@
msgid "Back to the menu"
msgstr ""
-#: AgedDebtors.php:372 Dashboard.php:256
+#: AgedDebtors.php:372 Dashboard.php:245
msgid "The details of outstanding transactions for customer"
msgstr ""
-#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:256
+#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:245
#: GLAccountCSV.php:179 GLAccountInquiry.php:177 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
@@ -1244,29 +1232,29 @@
#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:765
#: Credit_Invoice.php:786 CustItem.php:73 CustItem.php:86 CustItem.php:197
#: CustomerReceipt.php:587 CustomerReceipt.php:740 CustomerReceipt.php:768
-#: CustomerTransInquiry.php:91 Dashboard.php:259 Dashboard.php:440
+#: CustomerTransInquiry.php:91 Dashboard.php:248 Dashboard.php:401
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
-#: Payments.php:389 PDFRemittanceAdvice.php:85 PurchData.php:114
+#: PDFRemittanceAdvice.php:85 Payments.php:389 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
-#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387
-#: SelectCreditItems.php:1454 SelectSalesOrder.php:213
-#: SelectSalesOrder.php:379 SellThroughSupport.php:81
-#: SellThroughSupport.php:97 SMTPServer.php:66 StockCheck.php:217
+#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387 SMTPServer.php:66
+#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 SelectSalesOrder.php:379
+#: SellThroughSupport.php:81 SellThroughSupport.php:97 StockCheck.php:217
#: StockClone.php:446 StockClone.php:520 StockCostUpdate.php:78
#: StockCostUpdate.php:88 StockLocStatus.php:167
#: StockLocTransferReceive.php:215 StockLocTransferReceive.php:368
#: StockMovements.php:98 StockQuantityByDate.php:98 StockReorderLevel.php:45
#: StockStatus.php:285 StockTransfers.php:202 StockTransfers.php:232
-#: StockTransfers.php:388 StockUsageGraph.php:55 StockUsage.php:142
-#: SupplierInquiry.php:79 SupplierInquiry.php:101 SupplierInquiry.php:139
-#: SupplierInquiry.php:195 SupplierPriceList.php:384
-#: SupplierTransInquiry.php:103 SuppPaymentRun.php:114 SuppPaymentRun.php:188
-#: SuppPaymentRun.php:219 WorkOrderCosting.php:431 WorkOrderReceive.php:305
-#: WOSerialNos.php:49 Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
-#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
-#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
-#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:93
-#: inc...
[truncated message content] |
|
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 $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>';
+ $ActualCash += $MyRow['ActualAmount'];
+ $BudgetCash += $MyRow['BudgetAmount'];
+ $LastCash += $MyRow['LastAmount'];
+ }
+ }
+ // Prints 'Cash or cash equivalent' section total:
+ echo '<tr>
+ <td class="text" colspan="2">', CashFlowsActivityName(4), '</td>',
+ colDebitCredit($ActualCash),
+ colDebitCredit($BudgetCash),
+ colDebitCredit($LastCash),
+ '</tr>';
+ }
+//<<++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // END Outputs the table with budget.
+ } else {// Parameters: PeriodFrom, PeriodTo, ShowBudget=OFF, ShowZeroBalance=on/off, ShowCash=on/off.
+ // BEGIN Outputs the table without 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">', _('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']-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['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']-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['LastRetained'] - $MyRow1['LastProfit']),
+ '</tr><tr>',
+ '<td class="text" colspan="2">', _('Retained earnings'), '</td>',
+ // Retained earnings changes:
+ colDebitCredit($MyRow2['ActualRetained']),
+ colDebitCredit($MyRow2['LastRetained']),
+ '</tr>';
+ $ActualTotal += $MyRow2['ActualRetained'];
+ $LastTotal += $MyRow2['LastRetained'];
+ // Cash flows sections:
+ $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']-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($LastSection),
+ '</tr>';
+ // Resets section totals:
+ $ActualSection = 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['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['LastAmount']),
+ '</tr>';
+ $ActualSection += $MyRow['ActualAmount'];
+ $ActualTotal += $MyRow['ActualAmount'];
+ $LastSection += $MyRow['LastAmount'];
+ $LastTotal += $MyRow['LastAmount'];
+ }
+ }
+ // Prints the last section total:
+ echo '<tr>
+ <td class="text" colspan="2">', CashFlowsActivityName($IdSection), '</td>',
+ colDebitCredit($ActualSection),
+ 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($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=OFF, ShowZeroBalance=on/off, ShowCash=ON):
+ echo '<tr><td colspan="8"> </td></tr>';
+ $ActualBeginning = 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']-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['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['LastAmount']),
+ '</tr>';
+ $ActualBeginning += $MyRow['ActualAmount'];
+ $LastBeginning += $MyRow['LastAmount'];
+ }
+ }
+ } else {
+ // Prints a summary of Cash and cash equivalents at beginning of period (Parameters: PeriodFrom, PeriodTo, ShowBudget=OFF, 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']-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'];
+ $LastBeginning = $MyRow['LastAmount'];
+ }
+ echo '<tr>
+ <td class="text" colspan="2"><b>', _('Cash and cash equivalents at beginning of period'), '</b></td>',
+ colDebitCredit($ActualBeginning),
+ 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=OFF, 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']-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['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['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($LastTotal+$LastBeginning),
+ '</tr>';
+ // Prints 'Cash or cash equivalent' section if selected (Parameters: PeriodFrom, PeriodTo, ShowBudget=OFF, 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;
+ $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']-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 $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['LastAmount']),
+ '</tr>';
+ $ActualCash += $MyRow['ActualAmount'];
+ $LastCash += $MyRow['LastAmount'];
+ }
+ }
+ // Prints 'Cash or cash equivalent' section total:
+ echo '<tr>
+ <td class="text" colspan="2">', CashFlowsActivityName(4), '</td>',
+ colDebitCredit($ActualCash),
+ colDebitCredit($LastCash),
+ '</tr>';
+ }
+//<<----------------------------------------------------------------------------
+ // END Outputs the table without budget.
+ }
+ echo '</tbody></table>',
+ '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ '<input name="PeriodFrom" type="hidden" value="', $_POST['PeriodFrom'], '" />',
+ '<input name="PeriodTo" type="hidden" value="', $_POST['PeriodTo'], '" />',
+ '<input name="ShowDetail" type="hidden" value="', $_POST['ShowDetail'], '" />',
+ '<input name="ShowZeroBalance" type="hidden" value="', $_POST['ShowZeroBalance'], '" />',
+ '<input name="ShowBudget" type="hidden" value="', $_POST['ShowBudget'], '" />',
+ '<input name="ShowCash" type="hidden" value="', $_POST['ShowCash'], '" />', // Form buttons:
+ '<div class="centre noprint">';
+ if($NeedSetup) {
+ echo '<button onclick="javascript:window.location=\'GLCashFlowsSetup.php\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" /> ', _('Run Setup'), '</button>'; // "Run Setup" button.
+ }
+ echo '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/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 onclick="javascript:window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>';
+} else {// If one or more parameters are NOT set or NOT valid, shows a parameters input form:
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/reports.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $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 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>';
+ }
+ // Shows a form to allow input of criteria for the report to generate:
+ echo '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '"/>', // Form's head.
+ // Input table:
+ '<table class="selection">',
+ // Content of the header and footer of the input table:
+ '<thead>
+ <tr>
+ <th colspan="2">',('Report parameters'), '</th>
+ </tr>
+ </thead><tfoot>
+ <tr>
+ <td colspan="2">',
+ '<div class="centre">',
+ '<button name="Submit" type="submit" value="', _('Submit'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Submit'), '</button>', // "Submit" 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>',
+ '</td>
+ </tr>
+ </tfoot><tbody>',
+ // Content of the body of the input table:
+ // Select period from:
+ '<tr>',
+ '<td><label for="PeriodFrom">', _('Select period from'), ':</label></td>
+ <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.
+ 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.
+ $BeginDate = mktime(0, 0, 0, $BeginMonth, 1, date('Y')-1);
+ }
+ $_POST['PeriodFrom'] = GetPeriod(date($_SESSION['DefaultDateFormat'], $BeginDate), $db);
+ }
+ foreach($Periods as $MyRow) {
+ echo '<option',($MyRow['periodno'] == $_POST['PeriodFrom'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
+ }
+ echo '</select>',
+ (!isset($field_help) || $field_help ? _('Select the beginning of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Select period to:
+ '<tr>',
+ '<td><label for="PeriodTo">', _('Select period to'), ':</label></td>
+ <td><select id="PeriodTo" name="PeriodTo" required="required">';
+ if(!isset($_POST['PeriodTo'])) {
+ $_POST['PeriodTo'] = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
+ }
+ foreach($Periods as $MyRow) {
+ echo '<option',($MyRow['periodno'] == $_POST['PeriodTo'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
+ }
+ echo '</select>',
+ (!isset($field_help) || $field_help ? _('Select the end of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Show the budget for the period:
+ '<tr>',
+ '<td><label for="ShowBudget">', _('Show the budget for the period'), ':</label></td>
+ <td><input',($_POST['ShowBudget'] ? ' checked="checked"' : ''), ' id="ShowBudget" name="ShowBudget" type="checkbox">', // "Checked" if ShowBudget is set AND it is TRUE.
+ (!isset($field_help) || $field_help ? _('Check this box to show the budget for the period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Show accounts with zero balance:
+ '<tr>',
+ '<td><label for="ShowZeroBalance">', _('Show accounts with zero balance'), ':</label></td>
+ <td><input',(isset($_POST['ShowZeroBalance']) && $_POST['ShowZeroBalance'] ? ' checked="checked"' : ''), ' id="ShowZeroBalance" name="ShowZeroBalance" type="checkbox">', // "Checked" if ShowZeroBalance is set AND it is TRUE.
+ (!isset($field_help) || $field_help ? _('Check this box to show all accounts including those with zero balance') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Show cash and cash equivalents accounts:
+ '<tr>',
+ '<td><label for="ShowCash">', _('Show cash and cash equivalents accounts'), ':</label></td>
+ <td><input',($_POST['ShowCash'] ? ' checked="checked"' : ''), ' id="ShowCash" name="ShowCash" type="checkbox">', // "Checked" if ShowZeroBalance is set AND it is TRUE.
+ (!isset($field_help) || $field_help ? _('Check this box to show cash and cash equivalents accounts') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ '</tbody></table>';
+}
+echo '</form>';
+include('includes/footer.inc');
+?>
\ No newline at end of file
Added: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php (rev 0)
+++ trunk/GLCashFlowsSetup.php 2016-11-18 00:22:26 UTC (rev 7668)
@@ -0,0 +1,239 @@
+<?php
+/* $Id: GLCashFlowsSetup.php 7332 2015-08-14 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 ---------------------------------------------------
+include('includes/session.inc');
+$Title = _('Cash Flows Activities Maintenance');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLCashFlowsSetup';
+include('includes/header.inc');
+
+// Merges gets into posts:
+if(isset($_GET['Action'])) {
+ $_POST['Action'] = $_GET['Action'];
+}
+if(isset($_GET['PeriodProfitAccount'])) {
+ $_POST['PeriodProfitAccount'] = $_GET['PeriodProfitAccount'];
+}
+if(isset($_GET['RetainedEarningsAccount'])) {
+ $_POST['RetainedEarningsAccount'] = $_GET['RetainedEarningsAccount'];
+}
+// Do selected action:
+switch ($_POST['Action']) {
+ case 'Update':
+ // Updates config accounts:
+ if ($_SESSION['PeriodProfitAccount'] != $_POST['PeriodProfitAccount'] ) {
+ if(DB_query(
+ "UPDATE config SET confvalue = '" . $_POST['PeriodProfitAccount'] . "' WHERE confname = 'PeriodProfitAccount'",
+ _('Can not update chartmaster.cashflowsactivity because')
+ )) {
+ $_SESSION['PeriodProfitAccount'] = $_POST['PeriodProfitAccount'];
+ prnMsg(_('The net profit of the period GL account was updated'), 'success');
+ }
+ }
+ if ($_SESSION['RetainedEarningsAccount'] != $_POST['RetainedEarningsAccount'] ) {
+ if(DB_query(
+/* "UPDATE config SET confvalue = '" . $_POST['RetainedEarningsAccount'] . "' WHERE confname = 'RetainedEarningsAccount'",*/
+ "UPDATE companies SET retainedearnings = '" . $_POST['RetainedEarnings'] . "' WHERE coycode = 1",
+ _('Can not update chartmaster.cashflowsactivity because')
+ )) {
+ $_SESSION['RetainedEarningsAccount'] = $_POST['RetainedEarningsAccount'];
+ prnMsg(_('The retained earnings GL account was updated'), 'success');
+ }
+ }
+ break;// END Update.
+ case 'Reset':
+ $Sql = "UPDATE `chartmaster` SET `cashflowsactivity`='-1';";
+ $ErrMsg = _('Can not update chartmaster.cashflowsactivity because');
+ $Result = DB_query($Sql, $ErrMsg);
+ if($Result) {
+ prnMsg(_('The cash flow activity was reset in all accounts'), 'success');
+ }
+ break;// END Reset.
+ case 'Automatic':
+ // Loads the criteria for assigning the cash flow activity to the account:
+ // The last criterion overwrites the previous criteria. E.g.:
+ // In English, use singular to englobe singular and plural (e.g. Loan vs. Loans).
+ // Leave penultimate: Interests (e.g. Loan interests vs. Loans).
+ // Leave last: depreciations, amortisations and adjustments (Building depreciation vs. Buildings).
+ // Comment: MySQL queries are not case-sensitive by default.
+
+ $Criterion = array();
+ $i = 0;
+
+ $Criterion[$i]['AccountLike'] = _('Cash');
+ $Criterion[$i++]['CashFlowsActivity'] = 4;
+
+ $Criterion[$i]['AccountLike'] = _('Bank');
+ $Criterion[$i++]['CashFlowsActivity'] = 4;
+
+ $Criterion[$i]['AccountLike'] = _('Investment');
+ $Criterion[$i++]['CashFlowsActivity'] = 4;
+
+ $Criterion[$i]['AccountLike'] = _('Commission');
+ $Criterion[$i++]['CashFlowsActivity'] = 3;
+
+ $Criterion[$i]['AccountLike'] = _('Share');
+ $Criterion[$i++]['CashFlowsActivity'] = 3;
+
+ $Criterion[$i]['AccountLike'] = _('Dividend');
+ $Criterion[$i++]['CashFlowsActivity'] = 3;
+
+ $Criterion[$i]['AccountLike'] = _('Interest');
+ $Criterion[$i++]['CashFlowsActivity'] = 3;
+
+ $Criterion[$i]['AccountLike'] = _('Loan');
+ $Criterion[$i++]['CashFlowsActivity'] = 3;
+
+ $Criterion[$i]['AccountLike'] = _('Building');
+ $Criterion[$i++]['CashFlowsActivity'] = 2;
+
+ $Criterion[$i]['AccountLike'] = _('Equipment');
+ $Criterion[$i++]['CashFlowsActivity'] = 2;
+
+ $Criterion[$i]['AccountLike'] = _('Land');
+ $Criterion[$i++]['CashFlowsActivity'] = 2;
+
+ $Criterion[$i]['AccountLike'] = _('Vehicle');
+ $Criterion[$i++]['CashFlowsActivity'] = 2;
+
+ $Criterion[$i]['AccountLike'] = _('Sale');
+ $Criterion[$i++]['CashFlowsActivity'] = 1;
+
+ $Criterion[$i]['AccountLike'] = _('Cost');
+ $Criterion[$i++]['CashFlowsActivity'] = 1;
+
+ $Criterion[$i]['AccountLike'] = _('Receivable');
+ $Criterion[$i++]['CashFlowsActivity'] = 1;
+
+ $Criterion[$i]['AccountLike'] = _('Inventory');
+ $Criterion[$i++]['CashFlowsActivity'] = 1;
+
+ $Criterion[$i]['AccountLike'] = _('Payable');
+ $Criterion[$i++]['CashFlowsActivity'] = 1;
+
+ $Criterion[$i]['AccountLike'] = _('Adjustment');
+ $Criterion[$i++]['CashFlowsActivity'] = 0;
+
+ $Criterion[$i]['AccountLike'] = _('Amortisation');
+ $Criterion[$i++]['CashFlowsActivity'] = 0;
+
+ $Criterion[$i]['AccountLike'] = _('Depreciation');
+ $Criterion[$i++]['CashFlowsActivity'] = 0;
+
+ foreach ($Criterion as $Criteria) {
+ $Sql = "UPDATE `chartmaster`
+ SET `cashflowsactivity`=". $Criteria['CashFlowsActivity'] . "
+ WHERE `accountname` LIKE '%". _($Criteria['AccountLike']) . "%'
+ AND `cashflowsactivity`=-1";// Uses cashflowsactivity=-1 to NOT overwrite.
+ $ErrMsg = _('Can not update chartmaster.cashflowsactivity. Error code:');
+ $Result = DB_query($Sql, $ErrMsg);
+ // RChacon: Count replacements.
+ }
+ if($Result) {
+ prnMsg(_('The cash flow activity was updated in some accounts'), 'success');// RChacon: Show replacements done.
+ }
+ break;// END Automatic.
+ case 'Manual':
+ echo "<script>window.location = 'GLAccounts.php';</script>";
+ die();
+ default:
+ // No reset , nor Automatic
+}
+
+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.
+ // BEGIN menu.
+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, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
+ _('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.'),
+ '</div>';
+}
+// Show a form to allow input of the action for the script to do:
+echo '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />', // Form's head.
+ // Input table:
+ '<table class="selection">',
+ // Content of the header and footer of the output table:
+ '<thead>
+ <tr>
+ <th colspan="2">', _('Action to do'), '</th>
+ </tr>
+ </thead><tfoot>
+ <tr>
+ <td colspan="2">',
+ '<div class="centre">',
+ '<button name="Action" type=...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-17 04:17:18
|
Revision: 7667
http://sourceforge.net/p/web-erp/reponame/7667
Author: rchacon
Date: 2016-11-17 04:17:16 +0000 (Thu, 17 Nov 2016)
Log Message:
-----------
Replace printf() with plain list echo.
Modified Paths:
--------------
trunk/GLAccounts.php
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2016-11-16 23:45:18 UTC (rev 7666)
+++ trunk/GLAccounts.php 2016-11-17 04:17:16 UTC (rev 7667)
@@ -1,24 +1,26 @@
<?php
/* $Id$*/
+/* Defines the general ledger accounts */
include('includes/session.inc');
-$Title = _('Chart of Accounts Maintenance');
-/* Manual links before header.inc */
-$ViewTopic= 'GeneralLedger';// Filename in ManualContents.php's TOC.
-$BookMark = 'GLAccounts';// Anchor's id in the manual's html document.
+$Title = _('General Ledger Accounts');
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'GLAccounts';
include('includes/header.inc');
-if (isset($_POST['SelectedAccount'])){
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+
+if(isset($_POST['SelectedAccount'])) {
$SelectedAccount = $_POST['SelectedAccount'];
-} elseif (isset($_GET['SelectedAccount'])){
+} elseif(isset($_GET['SelectedAccount'])) {
$SelectedAccount = $_GET['SelectedAccount'];
}
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' .
- _('General Ledger Accounts') . '" />' . ' ' . $Title . '</p>';
+if(isset($_POST['submit'])) {
-if (isset($_POST['submit'])) {
-
//initialise no input errors assumed initially before we test
$InputError = 0;
@@ -27,173 +29,160 @@
//first off validate inputs sensible
- if (mb_strlen($_POST['AccountName']) >50) {
+ if(mb_strlen($_POST['AccountName']) >50) {
$InputError = 1;
- prnMsg( _('The account name must be fifty characters or less long'),'warn');
+ prnMsg(_('The account name must be fifty characters or less long'), 'warn');
}
- if (isset($SelectedAccount) AND $InputError !=1) {
+ if(isset($SelectedAccount) AND $InputError != 1) {
- $sql = "UPDATE chartmaster SET accountname='" . $_POST['AccountName'] . "',
+ $Sql = "UPDATE chartmaster SET accountname='" . $_POST['AccountName'] . "',
group_='" . $_POST['Group'] . "'
WHERE accountcode ='" . $SelectedAccount . "'";
+ $ErrMsg = _('Could not update the account because');
+ $Result = DB_query($Sql, $ErrMsg);
- $ErrMsg = _('Could not update the account because');
- $result = DB_query($sql,$ErrMsg);
prnMsg (_('The general ledger account has been updated'),'success');
- } elseif ($InputError !=1) {
+ } elseif($InputError != 1) {
- /*SelectedAccount is null cos no item selected on first time round so must be adding a record must be submitting new entries */
+ /*SelectedAccount is null cos no item selected on first time round so must be adding a record must be submitting new entries */
- $ErrMsg = _('Could not add the new account code');
- $sql = "INSERT INTO chartmaster (accountcode,
+ $Sql = "INSERT INTO chartmaster (accountcode,
accountname,
group_)
VALUES ('" . $_POST['AccountCode'] . "',
'" . $_POST['AccountName'] . "',
'" . $_POST['Group'] . "')";
- $result = DB_query($sql,$ErrMsg);
+ $ErrMsg = _('Could not add the new account code');
+ $Result = DB_query($Sql, $ErrMsg);
prnMsg(_('The new general ledger account has been added'),'success');
}
- unset ($_POST['Group']);
- unset ($_POST['AccountCode']);
- unset ($_POST['AccountName']);
+ unset($_POST['Group']);
+ unset($_POST['AccountCode']);
+ unset($_POST['AccountName']);
unset($SelectedAccount);
-} elseif (isset($_GET['delete'])) {
-//the link to delete a selected record was clicked instead of the submit button
+} elseif(isset($_GET['delete'])) {
+ //the link to delete a selected record was clicked instead of the submit button
-// PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartDetails'
+ // PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartDetails'
- $sql= "SELECT COUNT(*)
+ $Sql= "SELECT COUNT(*)
FROM chartdetails
WHERE chartdetails.accountcode ='" . $SelectedAccount . "'
AND chartdetails.actual <>0";
- $result = DB_query($sql);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $Result = DB_query($Sql);
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0] > 0) {
$CancelDelete = 1;
- prnMsg(_('Cannot delete this account because chart details have been created using this account and at least one period has postings to it'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('chart details that require this account code');
+ prnMsg(_('Cannot delete this account because chart details have been created using this account and at least one period has postings to it'), 'warn');
+ echo '<br />' . _('There are') . ' ' . $MyRow[0] . ' ' . _('chart details that require this account code');
} else {
// PREVENT DELETES IF DEPENDENT RECORDS IN 'GLTrans'
- $sql= "SELECT COUNT(*)
+ $Sql = "SELECT COUNT(*)
FROM gltrans
WHERE gltrans.account ='" . $SelectedAccount . "'";
-
$ErrMsg = _('Could not test for existing transactions because');
+ $Result = DB_query($Sql, $ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0] > 0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because transactions have been created using this account'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('transactions that require this account code');
+ prnMsg(_('Cannot delete this account because transactions have been created using this account'), 'warn');
+ echo '<br />' . _('There are') . ' ' . $MyRow[0] . ' ' . _('transactions that require this account code');
} else {
//PREVENT DELETES IF Company default accounts set up to this account
- $sql= "SELECT COUNT(*) FROM companies
- WHERE debtorsact='" . $SelectedAccount ."'
- OR pytdiscountact='" . $SelectedAccount ."'
- OR creditorsact='" . $SelectedAccount ."'
- OR payrollact='" . $SelectedAccount ."'
- OR grnact='" . $SelectedAccount ."'
- OR exchangediffact='" . $SelectedAccount ."'
- OR purchasesexchangediffact='" . $SelectedAccount ."'
- OR retainedearnings='" . $SelectedAccount ."'";
-
-
+ $Sql = "SELECT COUNT(*) FROM companies
+ WHERE debtorsact='" . $SelectedAccount . "'
+ OR pytdiscountact='" . $SelectedAccount . "'
+ OR creditorsact='" . $SelectedAccount . "'
+ OR payrollact='" . $SelectedAccount . "'
+ OR grnact='" . $SelectedAccount . "'
+ OR exchangediffact='" . $SelectedAccount . "'
+ OR purchasesexchangediffact='" . $SelectedAccount . "'
+ OR retainedearnings='" . $SelectedAccount . "'";
$ErrMsg = _('Could not test for default company GL codes because');
+ $Result = DB_query($Sql, $ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0] > 0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because it is used as one of the company default accounts'),'warn');
+ prnMsg(_('Cannot delete this account because it is used as one of the company default accounts'), 'warn');
- } else {
+ } else {
//PREVENT DELETES IF Company default accounts set up to this account
- $sql= "SELECT COUNT(*) FROM taxauthorities
+ $Sql = "SELECT COUNT(*) FROM taxauthorities
WHERE taxglcode='" . $SelectedAccount ."'
OR purchtaxglaccount ='" . $SelectedAccount ."'";
-
$ErrMsg = _('Could not test for tax authority GL codes because');
- $result = DB_query($sql,$ErrMsg);
+ $Result = DB_query($Sql, $ErrMsg);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0] > 0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because it is used as one of the tax authority accounts'),'warn');
+ prnMsg(_('Cannot delete this account because it is used as one of the tax authority accounts'), 'warn');
} else {
//PREVENT DELETES IF SALES POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*) FROM salesglpostings
- WHERE salesglcode='" . $SelectedAccount ."'
- OR discountglcode='" . $SelectedAccount ."'";
-
+ $Sql = "SELECT COUNT(*) FROM salesglpostings
+ WHERE salesglcode='" . $SelectedAccount . "'
+ OR discountglcode='" . $SelectedAccount . "'";
$ErrMsg = _('Could not test for existing sales interface GL codes because');
+ $Result = DB_query($Sql, $ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0] > 0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because it is used by one of the sales GL posting interface records'),'warn');
+ prnMsg(_('Cannot delete this account because it is used by one of the sales GL posting interface records'), 'warn');
} else {
//PREVENT DELETES IF COGS POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*)
+ $Sql = "SELECT COUNT(*)
FROM cogsglpostings
- WHERE glcode='" . $SelectedAccount ."'";
-
+ WHERE glcode='" . $SelectedAccount . "'";
$ErrMsg = _('Could not test for existing cost of sales interface codes because');
+ $Result = DB_query($Sql, $ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0]>0) {
$CancelDelete = 1;
- prnMsg(_('Cannot delete this account because it is used by one of the cost of sales GL posting interface records'),'warn');
+ prnMsg(_('Cannot delete this account because it is used by one of the cost of sales GL posting interface records'), 'warn');
} else {
//PREVENT DELETES IF STOCK POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*) FROM stockcategory
- WHERE stockact='" . $SelectedAccount ."'
- OR adjglact='" . $SelectedAccount ."'
- OR purchpricevaract='" . $SelectedAccount ."'
- OR materialuseagevarac='" . $SelectedAccount ."'
- OR wipact='" . $SelectedAccount ."'";
-
+ $Sql = "SELECT COUNT(*) FROM stockcategory
+ WHERE stockact='" . $SelectedAccount . "'
+ OR adjglact='" . $SelectedAccount . "'
+ OR purchpricevaract='" . $SelectedAccount . "'
+ OR materialuseagevarac='" . $SelectedAccount . "'
+ OR wipact='" . $SelectedAccount . "'";
$Errmsg = _('Could not test for existing stock GL codes because');
+ $Result = DB_query($Sql,$ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0]>0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because it is used by one of the stock GL posting interface records'),'warn');
+ prnMsg(_('Cannot delete this account because it is used by one of the stock GL posting interface records'), 'warn');
} else {
//PREVENT DELETES IF STOCK POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*) FROM bankaccounts
+ $Sql= "SELECT COUNT(*) FROM bankaccounts
WHERE accountcode='" . $SelectedAccount ."'";
$ErrMsg = _('Could not test for existing bank account GL codes because');
+ $Result = DB_query($Sql,$ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
+ $MyRow = DB_fetch_row($Result);
+ if($MyRow[0]>0) {
$CancelDelete = 1;
- prnMsg( _('Cannot delete this account because it is used by one the defined bank accounts'),'warn');
+ prnMsg(_('Cannot delete this account because it is used by one the defined bank accounts'), 'warn');
} else {
- $sql = "DELETE FROM chartdetails WHERE accountcode='" . $SelectedAccount ."'";
- $result = DB_query($sql);
- $sql="DELETE FROM chartmaster WHERE accountcode= '" . $SelectedAccount ."'";
- $result = DB_query($sql);
- prnMsg( _('Account') . ' ' . $SelectedAccount . ' ' . _('has been deleted'),'succes');
+ $Sql = "DELETE FROM chartdetails WHERE accountcode='" . $SelectedAccount ."'";
+ $Result = DB_query($Sql);
+ $Sql="DELETE FROM chartmaster WHERE accountcode= '" . $SelectedAccount ."'";
+ $Result = DB_query($Sql);
+ prnMsg(_('Account') . ' ' . $SelectedAccount . ' ' . _('has been deleted'), 'succes');
}
}
}
@@ -204,23 +193,23 @@
}
}
-if (!isset($_GET['delete'])) {
+if(!isset($_GET['delete'])) {
echo '<form method="post" id="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($SelectedAccount)) {
+ if(isset($SelectedAccount)) {
//editing an existing account
- $sql = "SELECT accountcode, accountname, group_ FROM chartmaster WHERE accountcode='" . $SelectedAccount ."'";
+ $Sql = "SELECT accountcode, accountname, group_ FROM chartmaster WHERE accountcode='" . $SelectedAccount ."'";
- $result = DB_query($sql);
- $myrow = DB_fetch_array($result);
+ $Result = DB_query($Sql);
+ $MyRow = DB_fetch_array($Result);
- $_POST['AccountCode'] = $myrow['accountcode'];
- $_POST['AccountName'] = $myrow['accountname'];
- $_POST['Group'] = $myrow['group_'];
+ $_POST['AccountCode'] = $MyRow['accountcode'];
+ $_POST['AccountName'] = $MyRow['accountname'];
+ $_POST['Group'] = $MyRow['group_'];
echo '<input type="hidden" name="SelectedAccount" value="' . $SelectedAccount . '" />';
echo '<input type="hidden" name="AccountCode" value="' . $_POST['AccountCode'] .'" />';
@@ -235,29 +224,29 @@
</tr>';
}
- if (!isset($_POST['AccountName'])) {
+ if(!isset($_POST['AccountName'])) {
$_POST['AccountName']='';
}
echo '<tr>
<td>' . _('Account Name') . ':</td>
<td><input type="text" size="51" required="required" ' . (isset($_POST['AccountCode']) ? 'autofocus="autofocus"':'') . ' title="' . _('Enter up to 50 alpha-numeric characters for the general ledger account name') . '" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
- $sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
- $result = DB_query($sql);
+ $Sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
+ $Result = DB_query($Sql);
echo '<tr>
<td>' . _('Account Group') . ':</td>
<td><select required="required" name="Group">';
- while ($myrow = DB_fetch_array($result)){
- if (isset($_POST['Group']) and $myrow[0]==$_POST['Group']){
+ while($MyRow = DB_fetch_array($Result)) {
+ if(isset($_POST['Group']) and $MyRow[0]==$_POST['Group']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
}
- echo $myrow[0] . '">' . $myrow[0] . '</option>';
+ echo $MyRow[0] . '">' . $MyRow[0] . '</option>';
}
- echo '</select></td>
+ echo '</select></td>
</tr>
</table>
<br />
@@ -270,13 +259,23 @@
} //end if record deleted no point displaying form to add record
-if (!isset($SelectedAccount)) {
+if(!isset($SelectedAccount)) {
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedAccount will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
then none of the above are true and the list of ChartMaster 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 accountcode,
+ 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>
+ </tr>';
+
+ $Sql = "SELECT accountcode,
accountname,
group_,
CASE WHEN pandl=0 THEN '" . _('Balance Sheet') . "' ELSE '" . _('Profit/Loss') . "' END AS acttype
@@ -284,50 +283,26 @@
accountgroups
WHERE chartmaster.group_=accountgroups.groupname
ORDER BY chartmaster.accountcode";
-
$ErrMsg = _('The chart accounts could not be retrieved because');
+ $Result = DB_query($Sql, $ErrMsg);
- $result = DB_query($sql,$ErrMsg);
-
- echo '<br /><table class="selection">';
- echo '<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>
- </tr>';
-
- $k=0; //row colour counter
-
- while ($myrow = DB_fetch_row($result)) {
- if ($k==1){
+ $k = 0;// Row colour counter.
+ while($MyRow = DB_fetch_row($Result)) {
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
-
-
- printf("<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href=\"%s&SelectedAccount=%s\">" . _('Edit') . "</a></td>
- <td><a href=\"%s&SelectedAccount=%s&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>",
- $myrow[0],
- htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8'),
- $myrow[2],
- $myrow[3],
- htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
- $myrow[0],
- htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
- $myrow[0]);
-
- }
- //END WHILE LIST LOOP
+ 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>
+ </tr>';
+ }// END WHILE LIST LOOP.
echo '</table>';
} //END IF selected ACCOUNT
@@ -335,8 +310,8 @@
echo '<br />';
-if (isset($SelectedAccount)) {
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Accounts') . '</a></div>';
+if(isset($SelectedAccount)) {
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Accounts') . '</a></div>';
}
include('includes/footer.inc');
|
|
From: <rc...@us...> - 2016-11-16 23:45:20
|
Revision: 7666
http://sourceforge.net/p/web-erp/reponame/7666
Author: rchacon
Date: 2016-11-16 23:45:18 +0000 (Wed, 16 Nov 2016)
Log Message:
-----------
Groups and reorganises the Inquiries and Reports options of General Ledger menu.
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-11-08 15:51:11 UTC (rev 7665)
+++ trunk/includes/MainMenuLinksArray.php 2016-11-16 23:45:18 UTC (rev 7666)
@@ -1,7 +1,5 @@
<?php
-
/* $Id: MainMenuLinksArray.php 6190 2013-08-12 02:12:02Z rchacon $*/
-
/* webERP menus with Captions and URLs. */
$ModuleLink = array('orders', 'AR', 'PO', 'AP', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system', 'Utilities');
@@ -367,31 +365,31 @@
'/BankMatching.php?Type=Receipts',
'/GLJournal.php?NewJournal=Yes');
-$MenuItems['GL']['Reports']['Caption'] = array( _('Trial Balance'),
+$MenuItems['GL']['Reports']['Caption'] = array( _('Bank Account Reconciliation Statement'),
+ _('Cheque Payments Listing'),
+ _('Daily Bank Transactions'),
_('Account Inquiry'),
_('Account Listing'),
_('Account Listing to CSV File'),
_('General Ledger Journal Inquiry'),
- _('Bank Account Reconciliation Statement'),
- _('Cheque Payments Listing'),
- _('Daily Bank Transactions'),
+ _('Trial Balance'),
+ _('Balance Sheet'),
_('Profit and Loss Statement'),
- _('Balance Sheet'),
_('Horizontal Analysis of Statement of Comprehensive Income'),
_('Horizontal Analysis of Statement of Financial Position'),
_('Tag Reports'),
_('Tax Reports'));
-$MenuItems['GL']['Reports']['URL'] = array( '/GLTrialBalance.php',
+$MenuItems['GL']['Reports']['URL'] = array( '/BankReconciliation.php',
+ '/PDFChequeListing.php',
+ '/DailyBankTransactions.php',
'/SelectGLAccount.php',
'/GLAccountReport.php',
'/GLAccountCSV.php',
'/GLJournalInquiry.php',
- '/BankReconciliation.php',
- '/PDFChequeListing.php',
- '/DailyBankTransactions.php',
+ '/GLTrialBalance.php',
+ '/GLBalanceSheet.php',
'/GLProfit_Loss.php',
- '/GLBalanceSheet.php',
'/AnalysisHorizontalIncome.php',
'/AnalysisHorizontalPosition.php',
'/GLTagProfit_Loss.php',
|
|
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: <dai...@us...> - 2016-11-08 07:59:10
|
Revision: 7664
http://sourceforge.net/p/web-erp/reponame/7664
Author: daintree
Date: 2016-11-08 07:59:07 +0000 (Tue, 08 Nov 2016)
Log Message:
-----------
Harald spotted translated variable which should not be!
Modified Paths:
--------------
trunk/Dashboard.php
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2016-11-07 03:25:49 UTC (rev 7663)
+++ trunk/Dashboard.php 2016-11-08 07:59:07 UTC (rev 7664)
@@ -439,7 +439,7 @@
}
$DislayTranDate = ConvertSQLDate($DetailTrans['trandate']);
$AccumBalance += $DetailTrans['balance'];
- if(_($DetailTrans['type']) == 20) {// If Purchase Invoice:
+ 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>
|
|
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-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 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).
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.
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-11-03 20:33:07 UTC (rev 7661)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-11-06 18:46:52 UTC (rev 7662)
@@ -189,7 +189,7 @@
<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>Conversion Factor</b>. Quantity of company UOM in supplier's UOM. It is the factor to convert the measurement in supplier's units into our measurement unit. 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>
@@ -200,4 +200,4 @@
</ul>
-<!-- Help End: PurchaseOrdering -->
\ No newline at end of file
+<!-- Help End: PurchaseOrdering -->
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-03 20:33:07 UTC (rev 7661)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-06 18:46:52 UTC (rev 7662)
@@ -8,14 +8,14 @@
"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-10-31 20:23-0600\n"
+"PO-Revision-Date: 2016-11-06 11:51-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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
"X-Launchpad-Export-Date: 2011-05-24 09:54+0000\n"
"X-Poedit-SourceCharset: UTF-8\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -246,14 +246,13 @@
#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
-#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
-#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:285 BOMs.php:991
-#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
-#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:100
-#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: Credit_Invoice.php:287 CreditStatus.php:21 CustEDISetup.php:17
-#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
+#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
+#: BOMListing.php:110 BOMs.php:285 BOMs.php:991 COGSGLPostings.php:19
+#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273
+#: CompanyPreferences.php:100 CounterReturns.php:1629 CounterSales.php:2097
+#: CounterSales.php:2193 Credit_Invoice.php:287 CreditStatus.php:21
+#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
@@ -284,16 +283,15 @@
#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:16 SupplierPriceList.php:226
-#: SupplierPriceList.php:396 SupplierPriceList.php:400
-#: SupplierPriceList.php:451 SupplierPriceList.php:501 Suppliers.php:304
-#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
-#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
-#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:251
+#: SupplierPriceList.php:16 SupplierPriceList.php:226 SupplierPriceList.php:396
+#: SupplierPriceList.php:400 SupplierPriceList.php:451
+#: SupplierPriceList.php:501 Suppliers.php:304 SupplierTenderCreate.php:556
+#: SupplierTenderCreate.php:664 SupplierTenders.php:322 SupplierTenders.php:388
+#: SupplierTransInquiry.php:10 TestPlanResults.php:27 TopItems.php:118
+#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113
+#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:34 WorkOrderStatus.php:58 WWW_Users.php:34
+#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "Buscar"
@@ -348,48 +346,47 @@
#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
-#: QATests.php:424 QATests.php:429 QATests.php:434
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
-#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:230
-#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
-#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
-#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
+#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
+#: SelectProduct.php:230 SelectProduct.php:368 SelectQASamples.php:424
+#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
+#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
+#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
+#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
+#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
+#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:938
+#: StockClone.php:940 StockClone.php:963 StockClone.php:965 Stocks.php:1266
+#: Stocks.php:1268 Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
-#: SystemParameters.php:1090 SystemParameters.php:1100
-#: SystemParameters.php:1102 SystemParameters.php:1156
-#: SystemParameters.php:1168 SystemParameters.php:1170
-#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
-#: TaxGroups.php:314 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
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
+#: 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
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Sí"
#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
-#: AddCustomerContacts.php:278 AddCustomerContacts.php:281
-#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895
-#: BOMs.php:899 CompanyPreferences.php:422 CompanyPreferences.php:426
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218
+#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
+#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899
+#: CompanyPreferences.php:422 CompanyPreferences.php:426
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
@@ -438,18 +435,17 @@
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087
-#: SystemParameters.php:1091 SystemParameters.php:1099
-#: SystemParameters.php:1103 SystemParameters.php:1157
-#: SystemParameters.php:1167 SystemParameters.php:1171
-#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
-#: TaxGroups.php:315 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
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
+#: 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
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
@@ -517,18 +513,17 @@
#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
-#: SelectOrderItems.php:1384 SelectQASamples.php:418
-#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
-#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
-#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151 SupplierContacts.php:166
-#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
-#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
-#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:146 WorkOrderEntry.php:864 WOSerialNos.php:335
-#: WWW_Access.php:133 WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
-#: includes/OutputSerialItems.php:99
+#: SelectOrderItems.php:1384 SelectQASamples.php:418 SellThroughSupport.php:299
+#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90
+#: SuppInvGRNs.php:151 SupplierContacts.php:166 SupplierTenderCreate.php:422
+#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:127 TaxAuthorities.php:173 TaxCategories.php:186
+#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
+#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:864
+#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:369
+#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
@@ -731,8 +726,7 @@
#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531
-#: SupplierTypes.php:68
+#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 SupplierTypes.php:68
msgid "has been updated"
msgstr "ha sido actualizado"
@@ -775,14 +769,13 @@
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
-#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403
-#: PrintCustStatements.php:99 PrintCustTrans.php:740
-#: PrintCustTransPortrait.php:788 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 includes/PDFStatementPageHeader.inc:76
-#: includes/PDFTransPageHeader.inc:85
+#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustStatements.php:99
+#: PrintCustTrans.php:740 PrintCustTransPortrait.php:788
+#: 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
+#: 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
#: ../webSHOP/Register.php:595
@@ -834,9 +827,8 @@
#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:597
-#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72
-#: includes/PDFTransPageHeader.inc:84
+#: SelectCustomer.php:406 SelectOrderItems.php:597 SupplierTenderCreate.php:395
+#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
msgid "Phone"
@@ -1012,8 +1004,8 @@
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
#: InventoryValuation.php:217 Locations.php:12 MRPCalendar.php:21
-#: MRPCreateDemands.php:193 MRPDemands.php:27 MRPDemandTypes.php:17
-#: MRP.php:542 MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
+#: MRPCreateDemands.php:193 MRPDemands.php:27 MRPDemandTypes.php:17 MRP.php:542
+#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12
#: ReorderLevel.php:194 SelectProduct.php:90 StockDispatch.php:321
#: StockMovements.php:22 StockQties_csv.php:8 StockQuantityByDate.php:10
@@ -1029,19 +1021,17 @@
msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
-#: StockClone.php:53 Stocks.php:63
-#: reportwriter/languages/en_US/reports.php:103
+#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr "Existencia"
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015
-#: CollectiveWorkOrderCost.php:45 CollectiveWorkOrderCost.php:317
-#: ContractBOM.php:242 ContractBOM.php:354 ContractOtherReqts.php:98
-#: CounterReturns.php:1692 CounterSales.php:2102 CounterSales.php:2256
-#: CreditStatus.php:152 CreditStatus.php:243 CustomerPurchases.php:81
-#: EmailConfirmation.php:219 EmailConfirmation.php:349
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015 CollectiveWorkOrderCost.php:45
+#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
+#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
+#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219 EmailConfirmation.php:349
#: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91
#: FixedAssetRegister.php:87 FixedAssetRegister.php:388
#: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63
@@ -1075,20 +1065,19 @@
#: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:41
#: SupplierPriceList.php:273 SupplierPriceList.php:535
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
-#: SupplierTenderCreate.php:853 SupplierTenders.php:326
-#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309
-#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
-#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
-#: WorkOrderEntry.php:972 WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
+#: SupplierTenderCreate.php:853 SupplierTenders.php:326 SupplierTenders.php:421
+#: SupplierTenders.php:687 SuppPriceList.php:309 TestPlanResults.php:177
+#: TestPlanResults.php:280 TopItems.php:170 WorkCentres.php:130
+#: WorkOrderCosting.php:98 WorkOrderCosting.php:130 WorkOrderEntry.php:972
+#: WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
#: includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:256
-#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
-#: ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12
+#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236
msgid "Description"
msgstr "Descripción"
@@ -1127,14 +1116,13 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
-#: SelectCreditItems.php:697 SelectOrderItems.php:1323
-#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97
-#: SupplierAllocations.php:457 SupplierAllocations.php:570
-#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:215
-#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250
-#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
-#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: includes/PDFQuotationPageHeader.inc:119
+#: SelectCreditItems.php:697 SelectOrderItems.php:1323 SuppContractChgs.php:107
+#: SuppFixedAssetChgs.php:97 SupplierAllocations.php:457
+#: SupplierAllocations.php:570 SupplierAllocations.php:645
+#: SupplierCredit.php:407 SupplierInquiry.php:215 SuppShiptChgs.php:97
+#: SuppTransGLAnalysis.php:140 Tax.php:250 Z_CheckDebtorsControl.php:149
+#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
+#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
#: includes/PO_PDFOrderPageHeader.inc:81
#: reportwriter/languages/en_US/reports.php:107
@@ -1197,48 +1185,47 @@
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
-#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
-#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
-#: FTP_RadioBeacon.php:187 GetStockImage.php:143 GLBalanceSheet.php:116
-#: GLBalanceSheet.php:155 GLBalanceSheet.php:334 GLProfit_Loss.php:191
-#: GLProfit_Loss.php:203 GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212
-#: GLTrialBalance.php:170 GLTrialBalance.php:182 InventoryPlanning.php:102
-#: InventoryPlanning.php:179 InventoryPlanning.php:216
-#: InventoryPlanning.php:265 InventoryPlanning.php:340
-#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
-#: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304
-#: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87
-#: InventoryQuantities.php:98 InventoryValuation.php:67
-#: InventoryValuation.php:92 MailInventoryValuation.php:123
-#: MailInventoryValuation.php:219 MailInventoryValuation.php:243
-#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117
-#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
-#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
-#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
-#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
-#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
-#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournalCN.php:148
-#: PDFGLJournal.php:108 PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71
-#: PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116
-#: PDFQuotation.php:276 PDFQuotationPortrait.php:268
-#: PDFRemittanceAdvice.php:83 PDFSalesBySalesperson.php:160
-#: PDFSalesBySalesperson.php:168 PDFSellThroughSupportClaim.php:74
-#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
-#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:271
-#: PDFWeeklyOrders.php:209 PDFWeeklyOrders.php:217 PDFWOPrint.php:109
-#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
-#: PrintCustOrder_generic.php:256 PrintCustOrder.php:238
-#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402
-#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474
-#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534
-#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
-#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63
-#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188
-#: StockDispatch.php:128 StockDispatch.php:141 SupplierBalsAtPeriodEnd.php:54
-#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112
-#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
-#: SuppPriceList.php:142 Tax.php:57 Tax.php:171 Tax.php:310
-#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257 Dashboard.php:438
+#: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187
+#: GetStockImage.php:143 GLBalanceSheet.php:116 GLBalanceSheet.php:155
+#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203
+#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170
+#: GLTrialBalance.php:182 InventoryPlanning.php:102 InventoryPlanning.php:179
+#: InventoryPlanning.php:216 InventoryPlanning.php:265
+#: InventoryPlanning.php:340 InventoryPlanningPrefSupplier.php:186
+#: InventoryPlanningPrefSupplier.php:244 InventoryPlanningPrefSupplier.php:271
+#: InventoryPlanningPrefSupplier.php:304 InventoryPlanningPrefSupplier.php:372
+#: InventoryQuantities.php:87 InventoryQuantities.php:98
+#: InventoryValuation.php:67 InventoryValuation.php:92
+#: MailInventoryValuation.php:123 MailInventoryValuation.php:219
+#: MailInventoryValuation.php:243 MailInventoryValuation.php:251
+#: MRPPlannedPurchaseOrders.php:117 MRPPlannedPurchaseOrders.php:128
+#: MRPPlannedWorkOrders.php:109 MRPPlannedWorkOrders.php:120
+#: MRPPlannedWorkOrders.php:311 MRPReport.php:39 MRPReport.php:50
+#: MRPReport.php:150 MRPReschedules.php:48 MRPReschedules.php:60
+#: MRPShortages.php:158 MRPShortages.php:170 OutstandingGRNs.php:49
+#: OutstandingGRNs.php:62 PDFCustomerList.php:235 PDFCustomerList.php:247
+#: PDFFGLabel.php:217 PDFGLJournalCN.php:148 PDFGLJournal.php:108
+#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
+#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276
+#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
+#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
+#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
+#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
+#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209
+#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
+#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256
+#: PrintCustOrder.php:238 PrintWOItemSlip.php:122
+#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
+#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
+#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
+#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42
+#: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146
+#: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141
+#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
+#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
+#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171
+#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
@@ -1279,11 +1266,10 @@
#: Payments.php:389 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387
-#: SelectCreditItems.php:1454 SelectSalesOrder.php:213
-#: SelectSalesOrder.php:379 SellThroughSupport.php:81
-#: SellThroughSupport.php:97 SMTPServer.php:66 StockCheck.php:217
-#: StockClone.php:446 StockClone.php:520 StockCostUpdate.php:78
-#: StockCostUpdate.php:88 StockLocStatus.php:167
+#: SelectCreditItems.php:1454 SelectSalesOrder.php:213 SelectSalesOrder.php:379
+#: SellThroughSupport.php:81 SellThroughSupport.php:97 SMTPServer.php:66
+#: StockCheck.php:217 StockClone.php:446 StockClone.php:520
+#: StockCostUpdate.php:78 StockCostUpdate.php:88 StockLocStatus.php:167
#: StockLocTransferReceive.php:215 StockLocTransferReceive.php:368
#: StockMovements.php:98 StockQuantityByDate.php:98 StockReorderLevel.php:45
#: StockStatus.php:285 StockTransfers.php:202 StockTransfers.php:232
@@ -1478,19 +1464,18 @@
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr "Análisis horizontal del estado de resultados"
-#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14
-#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14
+#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14
+#: Z_UpdateChartDetailsBFwd.php:14
msgid "...
[truncated message content] |
|
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 Del Date') . '</th>
- <th>' . _('Delivery To') . '</th>
- <th>' . _('Order Total') . ' ' . _('in') . ' ' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>
- </tr>';
+if(in_array($OrderSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($OrderSecurity)) {
+ echo '<br />
+ <h2>', _('Outstanding Orders'), '</h2>
+ <table class="selection">
+ <thead>',
+ '<tr>
+ <th>', _('View Order'), '</th>
+ <th>', _('Customer'), '</th>
+ <th>', _('Branch'), '</th>
+ <th>', _('Cust Order'), ' #</th>
+ <th>', _('Order Date'), '</th>
+ <th>', _('Req Del Date'), '</th>
+ <th>', _('Delivery To'), '</th>
+ <th>', _('Order Total'), ' ', _('in'), ' ', $_SESSION['CompanyRecord']['currencydefault'], '</th>
+ </tr>
+ </thead><tbody>';
- $SQL = "SELECT salesorders.orderno,
+ $Sql = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
salesorders.customerref,
@@ -694,59 +648,47 @@
salesorders.printedpackingslip
ORDER BY salesorders.orddate DESC, salesorders.orderno";
$ErrMsg = _('No orders or quotations were returned by the SQL because');
- $SalesOrdersResult = DB_query($SQL,$ErrMsg);
+ $SalesOrdersResult = DB_query($Sql,$ErrMsg);
/*show a table of the orders returned by the SQL */
- if (DB_num_rows($SalesOrdersResult)>0) {
- $k=0; //row colour counter
- $OrdersTotal =0;
- $FontColor='';
+ if(DB_num_rows($SalesOrdersResult)>0) {
+ $k = 0; //row colour counter
+ $OrdersTotal = 0;
+ $FontColor = '';
- while ($myrow=DB_fetch_array($SalesOrdersResult)) {
-
- $OrderDate = ConvertSQLDate($myrow['orddate']);
- $FormatedDelDate = ConvertSQLDate($myrow['deliverydate']);
- $FormatedOrderValue = locale_number_format($myrow['ordervalue'],$_SESSION['CompanyRecord']['decimalplaces']);
-
- if (DateDiff(Date($_SESSION['DefaultDateFormat']),$OrderDate,'d')>5) {
- $FontColor=' style="color:green; font-weight:bold"';
+ while($MyRow=DB_fetch_array($SalesOrdersResult)) {
+ $OrderDate = ConvertSQLDate($MyRow['orddate']);
+ $FormatedDelDate = ConvertSQLDate($MyRow['deliverydate']);
+ $FormatedOrderValue = locale_number_format($MyRow['ordervalue'],$_SESSION['CompanyRecord']['decimalplaces']);
+ if(DateDiff(Date($_SESSION['DefaultDateFormat']), $OrderDate, 'd') > 5) {
+ $FontColor = ' style="color:green; font-weight:bold"';
}
- if ($k==1){
+ if($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k++;
+ $k = 1;
}
+ echo '<td class="number"><a href="', $RootPath, '/OrderDetails.php?OrderNumber=', $MyRow['orderno'], '" target="_blank">', $MyRow['orderno'], '</a></td>
+ <td class="text"', $FontColor, '>', $MyRow['name'], '</td>
+ <td class="text"', $FontColor, '>', $MyRow['brname'], '</td>
+ <td class="number"', $FontColor, '>', $MyRow['customerref'], '</td>
+ <td class="centre"', $FontColor, '>', $OrderDate, '</td>
+ <td class="centre"', $FontColor, '>', $FormatedDelDate, '</td>
+ <td class="text"', $FontColor, '>', html_entity_decode($MyRow['deliverto'], ENT_QUOTES, 'UTF-8'), '</td>
+ <td class="number"', $FontColor , '>', $FormatedOrderValue, '</td>
+ </tr>';
+ $OrdersTotal += $MyRow['ordervalue'];
+ }// END while($MyRow=DB_fetch_array($SalesOrdersResult))
- printf( '<td><a href="%s" target="_blank">' . $myrow['orderno'] . '</a></td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . '>%s</td>
- <td' . $FontColor . ' class="number">%s</td>
- </tr>',
- $RootPath . '/OrderDetails.php?OrderNumber=' . $myrow['orderno'],
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $OrderDate,
- $FormatedDelDate,
- html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
- $FormatedOrderValue);
- $OrdersTotal += $myrow['ordervalue'];
- } //while
+ echo '<tr>
+ <td class="number" colspan="7"><b>', _('Total Order(s) Value in'), ' ', $_SESSION['CompanyRecord']['currencydefault'], ' :</b></td>
+ <td class="number"><b>', locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ </tr>
+ </tbody></table>';
- echo '<tfoot>
- <tr>
- <td colspan="7" class="number"><b>' . _('Total Order(s) Value in') . ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td>
- <td class="number"><b>' . locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
- </tr>
- </tfoot>
- </table>';
} //rows > 0
} //OrderSecurity
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-01 18:42:38 UTC (rev 7660)
+++ trunk/doc/Change.log 2016-11-03 20:33:07 UTC (rev 7661)
@@ -1,5 +1,6 @@
webERP Change Log
+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).
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.
|
|
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-01 02:25:48
|
Revision: 7659
http://sourceforge.net/p/web-erp/reponame/7659
Author: rchacon
Date: 2016-11-01 02:25:44 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
Update with new texts.
Modified Paths:
--------------
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/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-10-31 16:47:12 UTC (rev 7658)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-11-01 02:25:44 UTC (rev 7659)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-16 21:31+1200\n"
+"POT-Creation-Date: 2016-10-31 20:01-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"
@@ -18,7 +18,7 @@
"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:401
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -226,52 +226,55 @@
msgstr "لم يتمكن الحصول على مجموات العضو لان"
#: AccountGroups.php:282 AddCustomerContacts.php:28 AddCustomerContacts.php:30
-#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
+#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:280 BOMs.php:981
-#: BOMs_SingleLevel.php:231 BOMs_SingleLevel.php:881 COGSGLPostings.php:19
-#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273
-#: CompanyPreferences.php:102 CounterReturns.php:1629 CounterSales.php:2097
-#: CounterSales.php:2193 Credit_Invoice.php:276 CreditStatus.php:21
-#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:285 BOMs.php:991
+#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
+#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:100
+#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
+#: Credit_Invoice.php:287 CreditStatus.php:21 CustEDISetup.php:17
+#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: HistoricalTestResults.php:42 InternalStockRequest.php:311
-#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
-#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
-#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:168
+#: InternalStockRequest.php:316 InventoryPlanning.php:459
+#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
+#: MaintenanceUserSchedule.php:16 MRPReport.php:544 NoSalesItems.php:91
+#: PcAssignCashTabToTab.php:57 PcAssignCashTabToTab.php:137
+#: PcAssignCashTabToTab.php:193 PcAssignCashToTab.php:59
+#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
+#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
+#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
+#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
+#: PurchData.php:373 PurchData.php:401 QATests.php:22
#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
-#: SelectCustomer.php:258 SelectGLAccount.php:77 SelectOrderItems.php:559
-#: SelectOrderItems.php:1469 SelectOrderItems.php:1569 SelectProduct.php:522
-#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:559
+#: SelectOrderItems.php:1472 SelectOrderItems.php:1572 SelectProduct.php:522
+#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:14
#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:14 SupplierPriceList.php:224
-#: SupplierPriceList.php:394 SupplierPriceList.php:398
-#: SupplierPriceList.php:449 SupplierPriceList.php:499 Suppliers.php:304
+#: SupplierPriceList.php:16 SupplierPriceList.php:226
+#: SupplierPriceList.php:396 SupplierPriceList.php:400
+#: SupplierPriceList.php:451 SupplierPriceList.php:501 Suppliers.php:304
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:218
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -289,22 +292,24 @@
#: AccountGroups.php:289 AccountGroups.php:457 GLProfit_Loss.php:6
#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
-#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
+#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:63
msgid "Profit and Loss"
msgstr ""
#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:461
-#: AccountGroups.php:463 BOMs.php:135 BOMs.php:886 BOMs.php:888
-#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
-#: CompanyPreferences.php:425 CompanyPreferences.php:427
-#: CompanyPreferences.php:440 CompanyPreferences.php:442
-#: CompanyPreferences.php:455 CompanyPreferences.php:457
+#: AccountGroups.php:463 AddCustomerContacts.php:165
+#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
+#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
+#: CompanyPreferences.php:423 CompanyPreferences.php:425
+#: CompanyPreferences.php:438 CompanyPreferences.php:440
+#: CompanyPreferences.php:453 CompanyPreferences.php:455
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:212 DeliveryDetails.php:1158
+#: DailyBankTransactions.php:215 DeliveryDetails.php:1158
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
+#: InternalStockRequestInquiry.php:437 InternalStockRequestInquiry.php:448
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
@@ -331,20 +336,21 @@
#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
#: SalesAnalRepts.php:479 SalesCategories.php:302 SalesCategories.php:389
#: SalesCategories.php:393 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectProduct.php:230 SelectProduct.php:368
-#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
-#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
-#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
-#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
-#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
-#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
-#: StockClone.php:938 StockClone.php:940 StockClone.php:963 StockClone.php:965
-#: Stocks.php:1266 Stocks.php:1268 Stocks.php:1291 Stocks.php:1293
-#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
-#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
-#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
-#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
-#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
+#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:230
+#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
+#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
+#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
+#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
+#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
+#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
+#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
+#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
+#: SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -355,22 +361,25 @@
#: 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
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
+#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281
#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:137 BOMs.php:885
-#: BOMs.php:889 BOMs_SingleLevel.php:127 BOMs_SingleLevel.php:792
-#: BOMs_SingleLevel.php:796 CompanyPreferences.php:424
-#: CompanyPreferences.php:428 CompanyPreferences.php:439
-#: CompanyPreferences.php:443 CompanyPreferences.php:454
-#: CompanyPreferences.php:458 ContractCosting.php:200 Currencies.php:344
-#: Currencies.php:525 Currencies.php:527 CustomerBranches.php:452
-#: Customers.php:658 Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:214 DeliveryDetails.php:1159
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895
+#: BOMs.php:899 CompanyPreferences.php:422 CompanyPreferences.php:426
+#: CompanyPreferences.php:437 CompanyPreferences.php:441
+#: CompanyPreferences.php:452 CompanyPreferences.php:456
+#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
+#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
+#: InternalStockRequestInquiry.php:435 InternalStockRequestInquiry.php:446
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
@@ -396,16 +405,16 @@
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304
#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:232
-#: SelectProduct.php:370 SelectQASamples.php:426 SelectQASamples.php:523
-#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
-#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
-#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
-#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
-#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
-#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
-#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
-#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
+#: SalesPeople.php:372 SalesPeople.php:374 SelectCustomer.php:757
+#: SelectProduct.php:232 SelectProduct.php:370 SelectQASamples.php:426
+#: SelectQASamples.php:523 SelectQASamples.php:525 SelectQASamples.php:579
+#: SelectQASamples.php:581 SelectQASamples.php:593 SelectQASamples.php:595
+#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
+#: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392
+#: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416
+#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:933
+#: StockClone.php:935 StockClone.php:958 StockClone.php:960 Stocks.php:1261
+#: Stocks.php:1263 Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
@@ -422,37 +431,39 @@
#: 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
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
-#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:152
+#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:158
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:193 BOMs_SingleLevel.php:153
-#: COGSGLPostings.php:112 COGSGLPostings.php:219 CreditStatus.php:175
-#: Currencies.php:374 Currencies.php:391 CustItem.php:166
-#: CustomerBranches.php:456 Customers.php:1131 Customers.php:1165
-#: CustomerTypes.php:205 Departments.php:186 EDIMessageFormat.php:150
-#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
+#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:112
+#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
+#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
+#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
-#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
+#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
-#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
-#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
-#: SelectCustomer.php:733 SelectCustomer.php:758 SelectCustomer.php:813
-#: SelectCustomer.php:831 SelectCustomer.php:855 SelectCustomer.php:872
-#: SelectGLAccount.php:130 SelectGLAccount.php:145 SelectQASamples.php:417
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:116
+#: SelectCustomer.php:733 SelectCustomer.php:759 SelectCustomer.php:814
+#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
+#: SelectGLAccount.php:139 SelectGLAccount.php:154 SelectQASamples.php:417
#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:368
#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -461,23 +472,22 @@
msgid "Are you sure you wish to delete this account group?"
msgstr ""
-#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:153
+#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:159
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:195 BOMs_SingleLevel.php:154
-#: COGSGLPostings.php:113 COGSGLPostings.php:220 ContractBOM.php:272
-#: ContractOtherReqts.php:124 CounterReturns.php:740 CounterSales.php:836
-#: Credit_Invoice.php:409 CreditStatus.php:176 Currencies.php:377
-#: CustItem.php:167 CustomerReceipt.php:993 Customers.php:1166
-#: CustomerTypes.php:206 Departments.php:187 DiscountCategories.php:238
-#: DiscountMatrix.php:183 EDIMessageFormat.php:151
-#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
-#: GLAccounts.php:318 GLJournal.php:431 GLTags.php:97
+#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:113
+#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:420
+#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:1001 Customers.php:1166 CustomerTypes.php:206
+#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
+#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:431 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
+#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:211 Payments.php:1156 PaymentTerms.php:206
-#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PaymentMethods.php:211 Payments.php:1155 PaymentTerms.php:206
+#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
@@ -485,21 +495,22 @@
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
-#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
-#: SelectCustomer.php:734 SelectCustomer.php:759 SelectCustomer.php:814
-#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
-#: SelectOrderItems.php:1381 SelectQASamples.php:418
+#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
+#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
+#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
+#: SelectOrderItems.php:1384 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:151 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:146 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
+#: WorkCentres.php:146 WorkOrderEntry.php:864 WOSerialNos.php:335
+#: WWW_Access.php:133 WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -526,24 +537,23 @@
msgid "New Account Group Details"
msgstr ""
-#: AccountGroups.php:405 AccountSections.php:285 AddCustomerContacts.php:273
+#: AccountGroups.php:405 AccountSections.php:285 AddCustomerContacts.php:297
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:433 BOMs.php:906 BOMs_SingleLevel.php:809
-#: COGSGLPostings.php:368 CreditStatus.php:259 Currencies.php:537
-#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
-#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
-#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271
-#: GLAccounts.php:265 Labels.php:647 Locations.php:716 Manufacturers.php:375
-#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
-#: OffersReceived.php:146 PaymentMethods.php:302 PaymentTerms.php:310
-#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
-#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
-#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
-#: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203
-#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
-#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
-#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:792
+#: BankAccounts.php:433 BOMs.php:916 COGSGLPostings.php:368
+#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
+#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:647
+#: Locations.php:716 Manufacturers.php:375 MRPDemands.php:424
+#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
+#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
+#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
+#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
+#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
+#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
+#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
+#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
+#: UnitsOfMeasure.php:241 WorkCentres.php:289 WWW_Users.php:792
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -584,7 +594,7 @@
msgstr ""
#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
-#: includes/MainMenuLinksArray.php:398
+#: includes/MainMenuLinksArray.php:400
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -650,8 +660,8 @@
msgid "New Account Section Details"
msgstr ""
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:62 SelectCustomer.php:724
-#: SelectCustomer.php:790
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:63 SelectCustomer.php:723
+#: SelectCustomer.php:791
msgid "Customer Contacts"
msgstr ""
@@ -684,11 +694,11 @@
msgid "The contact email address is not a valid email address"
msgstr ""
-#: AddCustomerContacts.php:62 AddCustomerNotes.php:51
+#: AddCustomerContacts.php:63 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102
-#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:124
+#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531
@@ -696,107 +706,124 @@
msgid "has been updated"
msgstr ""
-#: AddCustomerContacts.php:77
+#: AddCustomerContacts.php:80
msgid "The contact record has been added"
msgstr ""
-#: AddCustomerContacts.php:106
+#: AddCustomerContacts.php:109
msgid "The contact record has been deleted"
msgstr ""
-#: AddCustomerContacts.php:129 CompanyPreferences.php:173
+#: AddCustomerContacts.php:133 CompanyPreferences.php:171
#: CustomerBranches.php:409 Customers.php:1118 Customers.php:1126
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
-#: SelectCustomer.php:728 StockDispatch.php:277 StockDispatch.php:288
+#: SelectCustomer.php:727 StockDispatch.php:277 StockDispatch.php:288
#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
-#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:161
+#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:164
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr ""
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:238 Customers.php:1119
-#: Customers.php:1127 SelectCustomer.php:729 WWW_Access.php:113
+#: AddCustomerContacts.php:134 AddCustomerContacts.php:245 Customers.php:1119
+#: Customers.php:1127 SelectCustomer.php:728 WWW_Access.php:113
#: WWW_Access.php:179
msgid "Role"
msgstr ""
-#: AddCustomerContacts.php:131
+#: AddCustomerContacts.php:135
msgid "Phone no"
msgstr ""
-#: AddCustomerContacts.php:132 AddCustomerContacts.php:256
+#: AddCustomerContacts.php:136 AddCustomerContacts.php:263
#: CustomerAccount.php:313 CustomerAccount.php:337 CustomerBranches.php:415
-#: CustomerBranches.php:858 CustomerInquiry.php:324 CustomerInquiry.php:370
-#: CustomerInquiry.php:409 CustomerInquiry.php:444 CustomerInquiry.php:490
+#: CustomerBranches.php:858 CustomerInquiry.php:325 CustomerInquiry.php:371
+#: CustomerInquiry.php:410 CustomerInquiry.php:445 CustomerInquiry.php:491
#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:16
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
-#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
+#: OrderDetails.php:127 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
-#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
-#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
-#: PrintCustTransPortrait.php:1095 SelectCustomer.php:409
-#: SelectCustomer.php:731 SelectSupplier.php:290 SupplierContacts.php:156
+#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403
+#: PrintCustStatements.php:99 PrintCustTrans.php:740
+#: PrintCustTransPortrait.php:788 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 includes/PDFStatementPageHeader.inc:67
+#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:76
#: includes/PDFTransPageHeader.inc:85
-#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
-#: ../webSHOP/Register.php:608
+#: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
+#: ../webSHOP/Register.php:595
msgid "Email"
msgstr ""
-#: AddCustomerContacts.php:133 AddCustomerContacts.php:265
+#: AddCustomerContacts.php:137 SelectCustomer.php:731
+#: includes/PDFStatementPageHeader.inc:23
+msgid "Statement"
+msgstr ""
+
+#: AddCustomerContacts.php:138 AddCustomerContacts.php:289
#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:123
-#: Customers.php:1122 Customers.php:1130 PcAssignCashToTab.php:256
+#: Customers.php:1122 Customers.php:1130 PcAssignCashTabToTab.php:242
+#: PcAssignCashTabToTab.php:365 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
-#: PcClaimExpensesFromTab.php:238 PcClaimExpensesFromTab.php:405
+#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
#: PcReportTab.php:333 PDFQuotation.php:252 PDFQuotationPortrait.php:249
#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411
#: WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
-#: AddCustomerContacts.php:153 SupplierContacts.php:166
+#: AddCustomerContacts.php:159 SupplierContacts.php:166
#, php-format
msgid "Are you sure you wish to delete this contact?"
msgstr ""
-#: AddCustomerContacts.php:172
+#: AddCustomerContacts.php:179
msgid "Review all contacts for this Customer"
msgstr ""
-#: AddCustomerContacts.php:210
+#: AddCustomerContacts.php:217
msgid "Edit Customer Contact Details"
msgstr ""
-#: AddCustomerContacts.php:215
+#: AddCustomerContacts.php:222
msgid "Contact Code"
msgstr ""
-#: AddCustomerContacts.php:222
+#: AddCustomerContacts.php:229
msgid "New Customer Contact Details"
msgstr ""
-#: AddCustomerContacts.php:229 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623
+#: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239
+#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
msgid "Contact Name"
msgstr ""
-#: AddCustomerContacts.php:247 Contracts.php:788 PDFRemittanceAdvice.php:247
+#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:407 SelectOrderItems.php:597
-#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
+#: SelectCustomer.php:406 SelectOrderItems.php:597
+#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72
#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:537
-#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737
+#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
+#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
msgid "Phone"
msgstr ""
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:806
-#: SelectCustomer.php:839
+#: AddCustomerContacts.php:271
+msgid "Send Statement"
+msgstr ""
+
+#: AddCustomerContacts.php:272
+msgid ""
+"This flag identifies the contact as one who should receive an email "
+"cusstomer statement"
+msgstr ""
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:807
+#: SelectCustomer.php:840
msgid "Customer Notes"
msgstr ""
@@ -833,29 +860,31 @@
#: AgedControlledInventory.php:47 BankMatching.php:281
#: BankReconciliation.php:212 BankReconciliation.php:289
#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
-#: CustomerAllocations.php:378 CustomerInquiry.php:251
-#: CustomerTransInquiry.php:100 GLAccountReport.php:347 GLTransInquiry.php:47
-#: GoodsReceived.php:130 MRPCalendar.php:219 PaymentAllocations.php:66
+#: CustomerAllocations.php:378 CustomerInquiry.php:252
+#: CustomerTransInquiry.php:100 CustWhereAlloc.php:133 GLAccountReport.php:347
+#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
+#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:238
#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:93
-#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:450 PrintCustTrans.php:822
-#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
-#: SelectCustomer.php:809 SelectCustomer.php:851 ShipmentCosting.php:538
-#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:279
-#: StockDispatch.php:290 StockDispatch.php:301 StockLocMovements.php:92
-#: StockMovements.php:105 StockSerialItemResearch.php:82
-#: SupplierAllocations.php:455 SupplierAllocations.php:568
-#: SupplierAllocations.php:643 SupplierInquiry.php:210
-#: SupplierTransInquiry.php:111 Tax.php:408
-#: includes/PDFQuotationPageHeader.inc:23
+#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
+#: PrintCustTrans.php:822 PrintCustTransPortrait.php:902
+#: PrintWOItemSlip.php:186 PrintWOItemSlip.php:197 PrintWOItemSlip.php:208
+#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
+#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
+#: StockLocMovements.php:92 StockMovements.php:105
+#: StockSerialItemResearch.php:82 SupplierAllocations.php:455
+#: SupplierAllocations.php:569 SupplierAllocations.php:644
+#: SupplierInquiry.php:210 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132
+#: Tax.php:408 includes/PDFQuotationPageHeader.inc:31
#: includes/PDFQuotationPortraitPageHeader.inc:80
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
-#: includes/PDFTransPageHeaderPortrait.inc:63
+#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
+#: includes/PDFTransPageHeaderPortrait.inc:62
+#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
-#: SelectCustomer.php:810 SelectCustomer.php:852 StockClone.php:942
+#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
#: Stocks.php:1270 UpgradeDatabase.php:246 UpgradeDatabase.php:249
#: UpgradeDatabase.php:252 UpgradeDatabase.php:255 UpgradeDatabase.php:258
#: UpgradeDatabase.php:261 UpgradeDatabase.php:264 UpgradeDatabase.php:267
@@ -874,7 +903,7 @@
#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
-#: SelectCustomer.php:812 SelectCustomer.php:854
+#: SelectCustomer.php:813 SelectCustomer.php:855
msgid "Priority"
msgstr ""
@@ -895,7 +924,7 @@
msgid "Contact Note"
msgstr ""
-#: AddCustomerTypeNotes.php:5 SelectCustomer.php:848
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:849
msgid "Customer Type (Group) Notes"
msgstr ""
@@ -911,7 +940,7 @@
msgid "The contacts notes may not be empty"
msgstr ""
-#: AddCustomerTypeNotes.php:48 SelectCustomer.php:880
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:881
msgid "Customer Group Notes"
msgstr ""
@@ -961,6 +990,7 @@
#: StockReorderLevel.php:20 StockSerialItemResearch.php:9
#: StockSerialItems.php:9 StockStatus.php:45 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:15 includes/MainMenuLinksArray.php:26
+#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -970,63 +1000,65 @@
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
#: StockClone.php:53 Stocks.php:63
+#: reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:646 BOMs.php:1005 BOMs_SingleLevel.php:558
-#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:45
-#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
-#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
-#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
-#: CustomerPurchases.php:81 EmailConfirmation.php:219
-#: EmailConfirmation.php:349 FixedAssetCategories.php:167
-#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
-#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
-#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
-#: GLTransInquiry.php:49 GoodsReceived.php:122
-#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345
-#: InternalStockRequest.php:559 InternalStockRequest.php:629
-#: InventoryPlanning.php:419 InventoryQuantities.php:246
-#: InventoryValuation.php:197 Labels.php:290 MaintenanceTasks.php:95
-#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 MRPDemands.php:92
-#: MRPDemands.php:295 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258
-#: MRPReport.php:564 MRPReport.php:778 MRPReschedules.php:192
-#: MRPShortages.php:350 NoSalesItems.php:194 PaymentTerms.php:182
-#: PcExpenses.php:190 PcExpenses.php:296 PcExpensesTypeTab.php:171
-#: PcReportTab.php:178 PcTypeTabs.php:164 PDFCOA.php:64
-#: PDFOrdersInvoiced.php:335 PDFOrderStatus.php:337
-#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
-#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
-#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73
-#: ReorderLevel.php:298 ReverseGRN.php:400 SalesCategories.php:549
-#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
-#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1019 SelectOrderItems.php:1479
-#: SelectOrderItems.php:1641 SelectProduct.php:542 SelectProduct.php:830
-#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015
+#: CollectiveWorkOrderCost.php:45 CollectiveWorkOrderCost.php:317
+#: ContractBOM.php:242 ContractBOM.php:354 ContractOtherReqts.php:98
+#: CounterReturns.php:1692 CounterSales.php:2102 CounterSales.php:2256
+#: CreditStatus.php:152 CreditStatus.php:243 CustomerPurchases.php:81
+#: EmailConfirmation.php:219 EmailConfirmation.php:349
+#: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91
+#: FixedAssetRegister.php:87 FixedAssetRegister.php:388
+#: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63
+#: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122
+#: InternalStockCategoriesByRole.php:168 InternalStockRequestInquiry.php:222
+#: InternalStockRequestInquiry.php:268 InternalStockRequestInquiry.php:405
+#: InternalStockRequest.php:350 InternalStockRequest.php:564
+#: InternalStockRequest.php:634 InventoryPlanning.php:419
+#: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290
+#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
+#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295
+#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258 MRPReport.php:564
+#: MRPReport.php:778 MRPReschedules.php:192 MRPShortages.php:350
+#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190
+#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
+#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335
+#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82
+#: PO_Items.php:716 PO_Items.php:1194 PO_SelectOSPurchOrder.php:310
+#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154
+#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:400
+#: SalesCategories.php:549 SecurityTokens.php:107 SecurityTokens.php:167
+#: SelectAsset.php:264 SelectCompletedOrder.php:506 SelectContract.php:147
+#: SelectCreditItems.php:1019 SelectOrderItems.php:1482
+#: SelectOrderItems.php:1644 SelectProduct.php:542 SelectProduct.php:830
+#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
-#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:122
-#: SuppInvGRNs.php:264 SupplierCredit.php:317 SupplierCredit.php:385
-#: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:39
-#: SupplierPriceList.php:271 SupplierPriceList.php:533
+#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120
+#: SuppInvGRNs.php:263 SupplierCredit.php:317 SupplierCredit.php:385
+#: SupplierInvoice.php:668 SupplierInvoice.php:750 SupplierPriceList.php:41
+#: SupplierPriceList.php:273 SupplierPriceList.php:535
#: SupplierTenderCreate.php:434 SupplierTenderCreate.php:695
#: SupplierTenderCreate.php:853 SupplierTenders.php:326
#: SupplierTenders.php:421 SupplierTenders.php:687 SuppPriceList.php:309
#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
-#: WorkOrderEntry.php:735 WorkOrderIssue.php:785 Z_ItemsWithoutPicture.php:35
-#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
-#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51
+#: WorkOrderEntry.php:972 WorkOrderIssue.php:1009 Z_ItemsWithoutPicture.php:35
+#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
+#: includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:267 api/api_xml-rpc.php:3489
-#: ../webSHOP/includes/PlaceOrder.php:250
+#: includes/PDFTransPageHeaderPortrait.inc:256
+#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
+#: ../webSHOP/includes/PlaceOrder.php:236
msgid "Description"
msgstr ""
@@ -1046,36 +1078,38 @@
msgid "Days Old"
msgstr ""
-#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:309
-#: ConfirmDispatch_Invoice.php:313 CounterReturns.php:676
+#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:310
+#: ConfirmDispatch_Invoice.php:314 CounterReturns.php:676
#: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853
-#: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302
+#: CounterSales.php:855 Credit_Invoice.php:309 Credit_Invoice.php:313
#: CustomerAllocations.php:349 CustomerAllocations.php:379
-#: CustomerInquiry.php:256 DeliveryDetails.php:884 DeliveryDetails.php:953
+#: CustomerInquiry.php:257 DeliveryDetails.php:884 DeliveryDetails.php:953
#: GLBalanceSheet.php:196 GLBalanceSheet.php:208 GLBalanceSheet.php:298
#: GLBalanceSheet.php:307 GLBudgets.php:213 GLJournal.php:436
#: GLTransInquiry.php:219 GLTrialBalance.php:225 GLTrialBalance.php:245
#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:495
#: GLTrialBalance.php:515 GLTrialBalance.php:539 GLTrialBalance.php:651
#: GLTrialBalance.php:671 GLTrialBalance.php:695 InventoryValuation.php:197
-#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177
+#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:193
#: OutstandingGRNs.php:246 PDFCustTransListing.php:137
-#: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310
+#: PDFOrdersInvoiced.php:382 PDFRemittanceAdvice.php:310
#: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
-#: SelectCreditItems.php:697 SelectOrderItems.php:1319
+#: SelectCreditItems.php:697 SelectOrderItems.php:1323
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97
-#: SupplierAllocations.php:457 SupplierAllocations.php:569
-#: SupplierAllocations.php:644 SupplierCredit.php:407 SupplierInquiry.php:215
+#: SupplierAllocations.php:457 SupplierAllocations.php:570
+#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:215
#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250
-#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109
+#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
+#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
+#: includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
-#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: ../webSHOP/includes/DisplayShoppingCart.php:8
-#: ../webSHOP/includes/PlaceOrder.php:299
+#: includes/PO_PDFOrderPageHeader.inc:81
+#: reportwriter/languages/en_US/reports.php:107
+#: ../webSHOP/includes/DisplayShoppingCart.php:7
+#: ../webSHOP/includes/PlaceOrder.php:285
#, php-format
msgid "Total"
msgstr ""
@@ -1088,47 +1122,48 @@
msgid "Aged Customer Balances"
msgstr ""
-#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
+#: AgedDebtors.php:268 AgedDebtors.php:370 AgedDebtors.php:434
msgid "Aged Customer Account Analysis"
msgstr ""
-#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
+#: AgedDebtors.php:268 AgedDebtors.php:370 AgedDebtors.php:434
#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
-#: GLTrialBalance.php:167 InternalStockRequest.php:320
-#: InventoryPlanning.php:99 InventoryPlanning.php:176
-#: InventoryPlanning.php:213 InventoryPlanning.php:262
-#: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241
-#: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301
-#: InventoryQuantities.php:84 InventoryValuation.php:64
-#: MailInventoryValuation.php:22 MailInventoryValuation.php:120
-#: MailSalesReport_csv.php:30 MailSalesReport.php:23
-#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
-#: MRPReport.php:147 MRPReport.php:536 MRPReschedules.php:45
-#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
-#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20
-#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
-#: PDFSalesBySalesperson.php:15 PDFSellThroughSupportClaim.php:17
-#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59
-#: PDFStockCheckComparison.php:267 PDFWeeklyOrders.php:15
-#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447
-#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500
-#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39
-#: SelectProduct.php:46 StockCheck.php:60 StockCheck.php:132
-#: SupplierTenderCreate.php:671 SupplierTenders.php:397 SuppPriceList.php:138
+#: GLTrialBalance.php:167 InternalStockRequestInquiry.php:251
+#: InternalStockRequest.php:325 InventoryPlanning.php:99
+#: InventoryPlanning.php:176 InventoryPlanning.php:213
+#: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183
+#: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268
+#: InventoryPlanningPrefSupplier.php:301 InventoryQuantities.php:84
+#: InventoryValuation.php:64 MailInventoryValuation.php:22
+#: MailInventoryValuation.php:120 MailSalesReport_csv.php:30
+#: MailSalesReport.php:23 MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedWorkOrders.php:106 MRPReport.php:147 MRPReport.php:536
+#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
+#: MRPShortages.php:167 OutstandingGRNs.php:46 OutstandingGRNs.php:59
+#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
+#: PDFLowGP.php:20 PDFSalesBySalesperson.php:15
+#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
+#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267
+#: PDFWeeklyOrders.php:15 PurchaseByPrefSupplier.php:399
+#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471
+#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531
+#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:46
+#: StockCheck.php:60 StockCheck.php:132 SupplierTenderCreate.php:671
+#: SupplierTenders.php:397 SuppPriceList.php:138
#: includes/PDFPaymentRun_PymtFooter.php:152
msgid "Problem Report"
msgstr ""
-#: AgedDebtors.php:269 CustomerAccount.php:210 CustomerInquiry.php:116
+#: AgedDebtors.php:270 CustomerAccount.php:210 CustomerInquiry.php:116
#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145
#: DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr ""
-#: AgedDebtors.php:270 AgedDebtors.php:372 AgedDebtors.php:436
+#: AgedDebtors.php:271 AgedDebtors.php:373 AgedDebtors.php:437
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
@@ -1152,47 +1187,48 @@
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
-#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100
-#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
-#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276
-#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
-#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
-#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
-#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
-#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209
-#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
-#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256
-#: PrintCustOrder.php:238 PrintWOItemSlip.php:122
-#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
-#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
-#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
-#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:42
-#: StockCheck.php:63 StockCheck.php:93 StockCheck.php:135 StockCheck.php:146
-#: StockCheck.php:188 StockDispatch.php:128 StockDispatch.php:141
-#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
-#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
-#: SuppPaymentRun.php:217 SuppPriceList.php:142 Tax.php:57 Tax.php:171
-#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournalCN.php:148
+#: PDFGLJournal.php:108 PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71
+#: PDFPriceList.php:147 PDFPrintLabel.php:42 PDFQALabel.php:116
+#: PDFQuotation.php:276 PDFQuotationPortrait.php:268
+#: PDFRemittanceAdvice.php:83 PDFSalesBySalesperson.php:160
+#: PDFSalesBySalesperson.php:168 PDFSellThroughSupportClaim.php:74
+#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
+#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:271
+#: PDFWeeklyOrders.php:209 PDFWeeklyOrders.php:217 PDFWOPrint.php:109
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
+#: PrintCustOrder_generic.php:256 PrintCustOrder.php:238
+#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402
+#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474
+#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534
+#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
+#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63
+#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188
+#: StockDispatch.php:128 StockDispatch.php:141 SupplierBalsAtPeriodEnd.php:54
+#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112
+#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
+#: SuppPriceList.php:142 Tax.php:57 Tax.php:171 Tax.php:310
+#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
#: includes/PDFPaymentRun_PymtFooter.php:59
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:119
#: includes/PDFPaymentRun_PymtFooter.php:156
#: includes/PDFPaymentRun_PymtFooter.php:187
#: includes/PDFPaymentRun_PymtFooter.php:218
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
msgid "Back to the menu"
msgstr ""
-#: AgedDebtors.php:371 Dashboard.php:256
+#: AgedDebtors.php:372 Dashboard.php:256
msgid "The details of outstanding transactions for customer"
msgstr ""
-#: AgedDebtors.php:371 AgedSuppliers.php:197 Dashboard.php:256
-#: GLAccountCSV.php:179 GLAccountInquiry.php:173 GLAccountReport.php:97
+#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:256
+#: GLAccountCSV.php:179 GLAccountInquiry.php:177 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
@@ -1201,20 +1237,20 @@
msgid "could not be retrieved because"
msgstr ""
-#: AgedDebtors.php:374 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:200
+#: AgedDebtors.php:375 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:200
#: Areas.php:94 ConfirmDispatch_Invoice.php:172
-#: ConfirmDispatch_Invoice.php:1005 ConfirmDispatch_Invoice.php:1019
+#: ConfirmDispatch_Invoice.php:1003 ConfirmDispatch_Invoice.php:1017
#: Contracts.php:599 CounterReturns.php:1024 CounterReturns.php:1038
-#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:754
-#: Credit_Invoice.php:775 CustItem.php:73 CustItem.php:86 CustItem.php:197
-#: CustomerReceipt.php:579 CustomerReceipt.php:732 CustomerReceipt.php:760
+#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:765
+#: Credit_Invoice.php:786 CustItem.php:73 CustItem.php:86 CustItem.php:197
+#: CustomerReceipt.php:587 CustomerReceipt.php:740 CustomerReceipt.php:768
#: CustomerTransInquiry.php:91 Dashboard.php:259 Dashboard.php:440
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
#: Payments.php:389 PDFRemittanceAdvice.php:85 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387
-#: SelectCreditItems.php:1454 SelectSalesOrder.php:209
-#: SelectSalesOrder.php:375 SellThroughSupport.php:81
+#: SelectCreditItems.php:1454 SelectSalesOrder.php:213
+#: SelectSalesOrder.php:379 SellThroughSupport.php:81
#: SellThroughSupport.php:97 SMTPServer.php:66 StockCheck.php:217
#: StockClone.php:446 StockClone.php:520 StockCostUpdate.php:78
#: StockCostUpdate.php:88 StockLocStatus.php:167
@@ -1223,90 +1259,90 @@
#: StockStatus.php:285 StockTransfers.php:202 StockTransfers.php:232
#: StockTransfers.php:388 StockUsageGra...
[truncated message content] |
|
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-10-31 15:35:31
|
Revision: 7657
http://sourceforge.net/p/web-erp/reponame/7657
Author: rchacon
Date: 2016-10-31 15:35:29 +0000 (Mon, 31 Oct 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/SecurityTokens.php
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2016-10-31 15:25:49 UTC (rev 7656)
+++ trunk/SecurityTokens.php 2016-10-31 15:35:29 UTC (rev 7657)
@@ -90,7 +90,6 @@
}
break;
default:// Unknown requested action.
- prnMsg(_('Unknown requested action'), 'error');
unset($_POST['Action']);
unset($_POST['TokenId']);
unset($_POST['TokenDescription']);
|
|
From: <rc...@us...> - 2016-10-31 15:25:51
|
Revision: 7656
http://sourceforge.net/p/web-erp/reponame/7656
Author: rchacon
Date: 2016-10-31 15:25:49 +0000 (Mon, 31 Oct 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-10-31 15:23:56 UTC (rev 7655)
+++ trunk/doc/Change.log 2016-10-31 15:25:49 UTC (rev 7656)
@@ -1,5 +1,6 @@
webERP Change Log
+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.
16/10/16 RChacon: Fix function convertDate(dS,dF).
|
15 messages has been excluded from this view by a project administrator.
