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: <dai...@us...> - 2015-03-21 22:04:31
|
Revision: 7230
http://sourceforge.net/p/web-erp/reponame/7230
Author: daintree
Date: 2015-03-21 22:04:27 +0000 (Sat, 21 Mar 2015)
Log Message:
-----------
Marathi - INDIA translation
Added Paths:
-----------
trunk/locale/mr_IN.utf8/
trunk/locale/mr_IN.utf8/LC_MESSAGES/
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po.old
Added: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Index: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo 2015-03-19 07:03:20 UTC (rev 7229)
+++ trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo 2015-03-21 22:04:27 UTC (rev 7230)
Property changes on: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po 2015-03-21 22:04:27 UTC (rev 7230)
@@ -0,0 +1,82082 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: English to Marathi Conversion\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2014-02-10 22:09+0530\n"
+"Last-Translator: Rajesh Kokil <raj...@ho...>\n"
+"Language-Team: MARATHI LANGUAGE TEAM AT KITS <raj...@ho...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.7\n"
+"Language: Marathi\n"
+
+msgid "Source"
+msgstr "मराठी"
+
+msgid "Account Groups"
+msgstr "खाते गट"
+
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"एक त्रुटी पुनरावृत्तीच्या साठी तपासताना पालक खाते गटाच्या खाते गट पुनर्प्राप्त करीत "
+"असताना आली"
+
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+"पालक खाते समूहाचे खाते गट पुनर्प्राप्त करण्यासाठी वापरले आणि त्या प्रक्रियेत अयशस्वी झाली "
+"याची SQL होते"
+
+msgid "An error occurred in moving the account group"
+msgstr "एक त्रुटी खाते गट हलवित असताना आली"
+
+msgid "The SQL that was used to move the account group was"
+msgstr "खाते गट हलविण्यासाठी वापरलेला SQL होते"
+
+msgid "Review Account Groups"
+msgstr "पुनरावलोकन खाते गट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:136
+msgid "All accounts in the account group:"
+msgstr "खाते समूहात सर्व खाती:"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:142
+msgid "have been changed to the account group:"
+msgstr "खाते गटात बदलली गेली आहेत:"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:148
+msgid "The SQL that was used to retrieve the information was"
+msgstr "माहिती पुनर्प्राप्त करण्यासाठी वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:154
+msgid "Could not check whether the group exists because"
+msgstr "गट अस्तित्वात नाही हे तपासण्यास करणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:160
+msgid "The account group name already exists in the database"
+msgstr "खाते गट नाव आधीच डेटाबेस मध्ये अस्तित्वात"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:166
+msgid "The account group name cannot contain the character"
+msgstr "खाते गट नाव वर्ण असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:172
+msgid "or the character"
+msgstr "किंवा वर्ण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:177
+msgid "The account group name must be at least one character long"
+msgstr "खाते गट नाव किमान एक वर्ण असावा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:183
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+"निवडलेले पालक खाते ग्रूप रिकर्सिव खाते रचना कारणीभूत दिसते - एक पर्यायी पालक खाते गट "
+"निवडा किंवा या गटात एक उच्च स्तर खाते गट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:192
+msgid "Could not check whether the group is recursive because"
+msgstr "गट रिकर्सिव आहे किंवा नाही हे तपासण्यास करणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:198
+msgid ""
+"Since this account group is a child group, the sequence in the trial "
+"balance, the section in the accounts and whether or not the account group "
+"appears in the balance sheet or profit and loss account are all properties "
+"inherited from the parent account group. Any changes made to these fields "
+"will have no effect."
+msgstr ""
+"हे खाते गट मूल गट, चाचणी शिल्लक मध्ये क्रम, खात्यातील विभाग आणि पालक खाते गटातून वारसा "
+"सर्व गुणधर्म आहेत खाते गट ताळेबंद किंवा नफा दिसते किंवा नाही असल्याने. हे क्षेत्र केलेले कोणतेही "
+"बदल कुठलाही प्रभाव पडणार नाही."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:210
+msgid "The section in accounts must be an integer"
+msgstr "खात्यातील विभाग पूर्णांक असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:216
+msgid "The sequence in the trial balance must be an integer"
+msgstr "चाचणी शिल्लक मध्ये क्रम पूर्णांक असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:222
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "टीबी मध्ये क्रम असावा आणि कमी असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:228
+msgid "An error occurred in renaming the account group"
+msgstr "एक त्रुटी खाते गट पुनर्नामित करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:234
+msgid "The SQL that was used to rename the account group was"
+msgstr "खाते गटाचे नाव करण्यासाठी वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:240
+msgid "An error occurred in updating the account group"
+msgstr "एक त्रुटी खाते गट अद्यतनित करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:246
+msgid "The SQL that was used to update the account group was"
+msgstr "खाते गट अद्यतनित करण्यासाठी वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:252
+msgid "Record Updated"
+msgstr "नोंद अद्यावत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:257
+msgid "An error occurred in inserting the account group"
+msgstr "एक त्रुटी खाते गट अंतर्भूत करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:263
+msgid "The SQL that was used to insert the account group was"
+msgstr "खाते गट घालण्यासाठी वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:269
+msgid "Record inserted"
+msgstr "रेकॉर्ड समाविष्ट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:274
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr "एक त्रुटी chartmaster गटात माहिती पुनर्प्राप्त करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:281
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+"हे खाते गट हटविले जाऊ शकत नाही कारण सामान्य खातेवही खाती हा गट वापरून तयार केले आहेत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:288
+msgid "There are"
+msgstr "आहेत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:293
+msgid "general ledger accounts that refer to this account group"
+msgstr "हे खाते गट संदर्भित करणारे सामान्य खातेवही खाती"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:299
+msgid "Parent Group"
+msgstr "पालक गट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:304
+msgid "Move Group"
+msgstr "गट हलवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:309
+msgid "An error occurred in retrieving the parent group information"
+msgstr "एक त्रुटी पालक समुह माहिती पुनर्प्राप्त करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:315
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr "हे खाते गट हटवणे शक्य नाही कारण इतर खाते गटांचा हा पालक खाते गट आहे "
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:322
+msgid "account groups that have this group as its/there parent account group"
+msgstr "हा खाते गट ज्यांचा पालक खाते गट आहे असे खाते गट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:329
+msgid "An error occurred in deleting the account group"
+msgstr "एक त्रुटी खाते गट काढून टाकत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:335
+msgid "The SQL that was used to delete the account group was"
+msgstr "खाते गट हटताना वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:341
+msgid "group has been deleted"
+msgstr "गट हटविला गेला आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:347
+msgid "The sql that was used to retrieve the account group information was"
+msgstr "खाते समुह माहिती पुनर्प्राप्त करण्यासाठी वापरलेला SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:354
+msgid "Could not get account groups because"
+msgstr "खाते गट मिळविणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:360
+msgid "Search"
+msgstr "शोध"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:365
+msgid "Group Name"
+msgstr "गट नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:370
+msgid "Section"
+msgstr "भाग"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:375
+msgid "Sequence In TB"
+msgstr "टीबी मध्ये क्रम"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:380
+msgid "Profit and Loss"
+msgstr "नफा, तोटा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:385
+msgid "Yes"
+msgstr "होय"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:390
+msgid "No"
+msgstr "नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:395
+msgid "Edit"
+msgstr "संपादन करणे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:400
+msgid "Are you sure you wish to delete this account group?"
+msgstr "आपण हे खाते गट हटवू इच्छिता खात्री आहे?"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:406
+msgid "Delete"
+msgstr "हटवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:411
+msgid "An error occurred in retrieving the account group information"
+msgstr "एक त्रुटी खाते समुह माहिती पुनर्प्राप्त करीत असताना आली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:413
+msgid "एक त्रुटी खाते समुह माहिती पुनर्प्राप्त करीत असताना आली"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:417
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+"खाते गट पुनर्प्राप्त करण्यासाठी वापरले आणि त्या प्रक्रियेत अयशस्वी झाली याची SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:424
+msgid "The account group name does not exist in the database"
+msgstr "खाते गट नाव डेटाबेसमध्ये अस्तित्वात नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:430
+msgid "Edit Account Group Details"
+msgstr "संपादन खाते समुह तपशील"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:436
+msgid "New Account Group Details"
+msgstr "नवीन खाते समुह तपशील"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:442
+msgid "Account Group Name"
+msgstr "खाते गट नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:447
+msgid "Enter the account group name"
+msgstr "खाते गट नाव प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:453
+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 ""
+"खाते गटासाठी एक अद्वितीय नाव प्रविष्ट करणे आवश्यक आहे - किमान 3 वर्ण लांब आणि 30 वर्ण "
+"लांब पेक्षा कमी. केवळ अल्फा अंकीय वर्ण वापरले जाऊ शकते."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:462
+msgid "Top Level Group"
+msgstr "शीर्ष स्तर गट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:467
+msgid "Section In Accounts"
+msgstr "खात्यातील विभाग"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:472
+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 ""
+"या गटात केवळ नफा आणि तोटा खात्यांचे समावेश असेल तर होय निवडाकिंवा या गटात ताळेबंद "
+"खात्यांचे समावेश असेल नाही निवडा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:481
+msgid ""
+"Enter the sequence number that this account group and its child general "
+"ledger accounts should display in the trial balance"
+msgstr ""
+"हे खाते गटासाठी आणि त्याच्या उप सामान्य खातेवही खात्यांसाठी ट्रायल बॅलेंस मध्ये दाखवण्यास "
+"क्रम नंबर प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:489
+msgid "Enter Information"
+msgstr "माहिती प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:495
+msgid "Account Sections"
+msgstr "खाते विभाग"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:500
+msgid "The account section already exists in the database"
+msgstr "खाते विभाग आधीच डेटाबेसमध्ये अस्तित्वात"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:506
+msgid "The account section name cannot contain any illegal characters"
+msgstr "खाते विभाग नावामध्ये कोणत्याही बेकायदेशीर वर्ण नसावे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:512
+msgid "The account section name must contain at least one character"
+msgstr "खाते विभाग नावामध्ये किमान एक वर्ण असावा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:518
+msgid "The section number must be an integer"
+msgstr "विभाग क्रमांक पूर्णांक असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:524
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+"हे खाते विभाग हटविले जाऊ शकत नाही कारण सामान्य खातेवही खाती हा विभाग वापरून तयार "
+"केले आहेत "
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:532
+msgid "general ledger accounts groups that refer to this account section"
+msgstr "सामान्य खातेवही हे खाते विभागाचा संदर्भ घ्या की गट खाते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:535
+msgid "सामान्य खातेवही हे खाते विभागाचा संदर्भ घ्या की गट खाते"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:539
+msgid "section has been deleted"
+msgstr "विभाग हटविला गेला आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:541
+msgid "विभाग हटविला गेला आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:545
+msgid "Could not get account group sections because"
+msgstr "खाते गट विभाग मिळविणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:547
+msgid "खाते गट विभाग मिळविणे शक्य नाही कारण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:551
+msgid "Section Number"
+msgstr "विभाग क्रमांक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:553
+msgid "विभाग क्रमांक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:556
+msgid "Section Description"
+msgstr "विभाग वर्णन"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:558
+msgid "विभाग वर्णन"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:561
+msgid "Restricted"
+msgstr "मर्यादित"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:563
+msgid "मर्यादित"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:566
+msgid "Review Account Sections"
+msgstr "पुनरावलोकन खाते विभाग"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:568
+msgid "पुनरावलोकन खाते विभाग"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:572
+msgid "Could not retrieve the requested section please try again."
+msgstr "विनंती विभाग परत मिळवू शकलो नाही कृपया पुन्हा प्रयत्न करा."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:574
+msgid "विनंती विभाग परत मिळवू शकलो नाही कृपया पुन्हा प्रयत्न करा."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:578
+msgid "Customer Contacts"
+msgstr "ग्राहक संपर्क"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:580
+msgid "ग्राहक संपर्क"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:583
+msgid "Back to Customers"
+msgstr "मागे ग्राहक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:585
+msgid "मागे ग्राहक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:588
+msgid "Contacts for Customer"
+msgstr "ग्राहकाचा संपर्क"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:590
+msgid "ग्राहकाचा संपर्क"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:593
+msgid "Edit contact for"
+msgstr "संपादित संपर्क"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:595
+msgid "संपादित संपर्क"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:598
+msgid "The Contact ID must be an integer."
+msgstr "संपर्क आयडी पूर्णांक असणे आवश्यक आहे."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:600
+msgid "संपर्क आयडी पूर्णांक असणे आवश्यक आहे."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:604
+msgid "The contact name must be forty characters or less long"
+msgstr "संपर्क नाव चाळीस किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:606
+msgid "संपर्क नाव चाळीस किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:610
+msgid "The contact name may not be empty"
+msgstr "संपर्क नाव रिक्त असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:612
+msgid "संपर्क नाव रिक्त असू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:616
+msgid "The contact email address is not a valid email address"
+msgstr "संपर्क ईमेल पत्ता वैध ईमेल पत्ता नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:618
+msgid "संपर्क ईमेल पत्ता वैध ईमेल पत्ता नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:622
+msgid "has been updated"
+msgstr "अद्यतनित केले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:624
+msgid "अद्यतनित केले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:628
+msgid "The contact record has been added"
+msgstr "संपर्क रेकॉर्ड जोडले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:630
+msgid "संपर्क रेकॉर्ड जोडले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:634
+msgid "The contact record has been deleted"
+msgstr "संपर्क रेकॉर्ड हटविले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:636
+msgid "संपर्क रेकॉर्ड हटविले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:640
+msgid "Name"
+msgstr "नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:645
+msgid "Role"
+msgstr "भूमिका"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:647
+msgid "वठवायची भूमिका"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:650
+msgid "Phone no"
+msgstr "दूरध्वनी नंबर"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:652
+msgid "फोन नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:655
+msgid "Email"
+msgstr "ईमेल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:657
+msgid "ईमेल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:660
+msgid "Notes"
+msgstr "नोट्स"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:662
+msgid "नोट्स"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:665
+msgid "Are you sure you wish to delete this contact?"
+msgstr "आपली खात्री आहे, आपण हा संपर्क हटवू इच्छिता?"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:667
+msgid "आपण हा संपर्क हटवू इच्छित खात्री आहे?"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:671
+msgid "Review all contacts for this Customer"
+msgstr "या ग्राहकासाठी सर्व संपर्क पुनरावलोकन"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:673
+msgid "या ग्राहकासाठी सर्व संपर्क पुनरावलोकन"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:677
+msgid "Contact Code"
+msgstr "संपर्क कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:679
+msgid "संपर्क कोड"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:682
+msgid "Contact Name"
+msgstr "संपर्क नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:684
+msgid "संपर्क नाव"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:687
+msgid "Phone"
+msgstr "दूरध्वनी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:689
+msgid "दूरध्वनी"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:692
+msgid "Customer Notes"
+msgstr "ग्राहक नोट्स"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:694
+msgid "ग्राहक नोट्स"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:697
+msgid "Back to Select Customer"
+msgstr "मागे ग्राहक निवडण्यासाठी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:699
+msgid "मागे ग्राहक निवडण्यासाठी"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:703
+msgid "The contact priority must be an integer."
+msgstr "संपर्क अग्रक्रम पूर्णांक असणे आवश्यक आहे."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:705
+msgid "संपर्क अग्रक्रम पूर्णांक असणे आवश्यक आहे."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:709
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr "संपर्काच्या नोट्स दोनशे वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:711
+msgid "संपर्काच्या नोट्स दोनशे वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:715
+msgid "The contact's notes may not be empty"
+msgstr "संपर्काच्या टीपा रिक्त असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:717
+msgid "संपर्काच्या टीपा रिक्त असू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:721
+msgid "The contact notes record has been added"
+msgstr "संपर्क नोट्स रेकॉर्ड जोडले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:723
+msgid "संपर्क नोट्स रेकॉर्ड जोडले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:727
+msgid "The contact note record has been deleted"
+msgstr "संपर्क टीप रेकॉर्ड हटविले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:729
+msgid "संपर्क टीप रेकॉर्ड हटविले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:733
+msgid "Notes for Customer"
+msgstr "ग्राहकाचा टिपा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:735
+msgid "ग्राहकाचा टिपा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:738
+msgid "Date"
+msgstr "तारीख"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:740
+msgid "तारीख"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:743
+msgid "Note"
+msgstr "नोंद"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:748
+msgid "WWW"
+msgstr "WWW"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:753
+msgid "Priority"
+msgstr "अग्रक्रम"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:755
+msgid "अग्रक्रम"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:758
+msgid "Are you sure you wish to delete this customer note?"
+msgstr "आपण या ग्राहक नोट हटवू इच्छित खात्री आहे?"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:760
+msgid "आपण या ग्राहक नोट हटवू इच्छित खात्री आहे?"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:764
+msgid "Review all notes for this Customer"
+msgstr "या ग्राहकासाठी सर्व नोट्स पुनरावलोकन"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:766
+msgid "या ग्राहकासाठी सर्व नोट्स पुनरावलोकन"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:770
+msgid "Note ID"
+msgstr "आयडी टीप"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:772
+msgid "आयडी टीप"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:775
+msgid "Contact Note"
+msgstr "संपर्क टीप"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:777
+msgid "संपर्क टीप"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:780
+msgid "Customer Type (Group) Notes"
+msgstr "ग्राहक प्रकार (गट) नोट्स"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:782
+msgid "ग्राहक प्रकार (गट) नोट्स"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:792
+msgid "The contacts notes must be two hundred characters or less long"
+msgstr "संपर्क नोट्स दोनशे वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:794
+msgid "संपर्क नोट्स दोनशे वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:798
+msgid "The contacts notes may not be empty"
+msgstr "संपर्क टीपा रिक्त असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:800
+msgid "संपर्क टीपा रिक्त असू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:804
+msgid "Customer Group Notes"
+msgstr "ग्राहक गट नोट्स"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:806
+msgid "ग्राहक गट नोट्स"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:809
+msgid "The contact group notes record has been added"
+msgstr "संपर्क गट रेकॉर्ड समाविष्ट केले आहे टिप"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:811
+msgid "संपर्क गट रेकॉर्ड समाविष्ट केले आहे टिप"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:815
+msgid "The contact group note record has been deleted"
+msgstr "संपर्क गट टीप रेकॉर्ड हटविले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:817
+msgid "संपर्क गट टीप रेकॉर्ड हटविले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:821
+msgid "Notes for Customer Type"
+msgstr "ग्राहक प्रकार टिपा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:823
+msgid "ग्राहक प्रकार टिपा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:827
+msgid "href"
+msgstr "href"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:832
+msgid "Review all notes for this Customer Type"
+msgstr "या ग्राहक प्रकार सर्व नोट्स पुनरावलोकन"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:834
+msgid "या ग्राहक प्रकार सर्व नोट्स पुनरावलोकन"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:838
+msgid "Contact Group Note"
+msgstr "संपर्क गट टीप"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:840
+msgid "संपर्क गट टीप"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:843
+msgid "Web site"
+msgstr "वेब साइट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:845
+msgid "वेब साइट"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:848
+msgid "Aged Customer Balance Listing"
+msgstr "वृद्ध ग्राहक शिल्लक यादी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:850
+msgid "वृद्ध ग्राहक शिल्लक यादी"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:854
+msgid "Aged Customer Balances"
+msgstr "वृद्ध ग्राहक शिल्लक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:856
+msgid "वृद्ध ग्राहक शिल्लक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:860
+msgid "Aged Customer Account Analysis"
+msgstr "वृद्ध ग्राहक खाते विश्लेषण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:862
+msgid "वृद्ध ग्राहक खाते विश्लेषण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:866
+msgid "Problem Report"
+msgstr "समस्या नोंदवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:868
+msgid "समस्या नोंदवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:871
+msgid "The customer details could not be retrieved by the SQL because"
+msgstr "ग्राहक तपशील SQL द्वारे प्राप्त केले जाऊ शकत नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:873
+msgid "ग्राहक तपशील SQL द्वारे प्राप्त केले जाऊ शकत नाही कारण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:877
+msgid "Back to the menu"
+msgstr "परत मेनूमध्ये"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:879
+msgid "मागे मेनूमध्ये"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:882
+msgid "The details of outstanding transactions for customer"
+msgstr "ग्राहक अनिर्णित व्यवहार तपशील"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:884
+msgid "ग्राहक अनिर्णित व्यवहार तपशील"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:888
+msgid "could not be retrieved because"
+msgstr "पुनर्प्राप्त करणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:890
+msgid "पुनर्प्राप्त करणे शक्य नाही कारण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:894
+msgid "The SQL that failed was"
+msgstr "SQL अयशस्वी होते की"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:896
+msgid "अयशस्वी की SQL होते"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:900
+msgid ""
+"There are no customers with balances meeting the criteria specified to list"
+msgstr "यादीसाठी निर्देशीत मानदंडाशी जुळणारे शिल्लक असलेला ग्राहक नाहीत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:903
+msgid "शिल्लक यादी निर्देशीत निकष बैठकीतील नाही ग्राहकांना आहेत"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:907
+msgid "Aged Debtor Analysis"
+msgstr "वृद्ध ऋणको विश्लेषण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:909
+msgid "वृद्ध ऋणको विश्लेषण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:913
+msgid "From Customer Code"
+msgstr "ग्राहक कोड पासून"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:915
+msgid "ग्राहक कोड पासून"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:918
+msgid "Enter the first customer code alphabetically to include in the report"
+msgstr "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने प्रथम ग्राहक कोड प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:921
+msgid "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने प्रथम ग्राहक कोड प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:925
+msgid "To Customer Code"
+msgstr "ग्राहक कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:930
+msgid "Enter the last customer code alphabetically to include in the report"
+msgstr "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने गेल्या ग्राहक कोड प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:933
+msgid "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने गेल्या ग्राहक कोड प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:937
+msgid "All balances or overdues only"
+msgstr "सर्व शिल्लक किंवा overdues केवळ"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:939
+msgid "सर्व शिल्लक किंवा overdues केवळ"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:943
+msgid "All customers with balances"
+msgstr "शिल्लक असलेल्या सर्व ग्राहकांना"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:945
+msgid "शिल्लक असलेल्या सर्व ग्राहकांना"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:949
+msgid "Overdue accounts only"
+msgstr "मुदत संपलेला खाती केवळ"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:951
+msgid "मुदत संपलेला खाती केवळ"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:955
+msgid "Held accounts only"
+msgstr "आयोजित खाती केवळ"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:957
+msgid "आयोजित खाती केवळ"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:960
+msgid "Only Show Customers Of"
+msgstr "केवळ दर्शवा ग्राहकांच्या"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:962
+msgid "केवळ दर्शवा ग्राहकांच्या"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:966
+msgid "All Sales people"
+msgstr "सर्व विक्री लोक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:968
+msgid "सर्व विक्री लोक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:971
+msgid "Only show customers trading in"
+msgstr "केवळ ग्राहकांना मध्ये ट्रेडिंग दाखवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:973
+msgid "केवळ ग्राहकांना मध्ये ट्रेडिंग दाखवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:977
+msgid "Summary or detailed report"
+msgstr "सारांश किंवा विस्तृत अहवाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:979
+msgid "सारांश किंवा विस्तृत अहवाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:983
+msgid "Summary Report"
+msgstr "सारांश अहवाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:985
+msgid "सारांश अहवाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:988
+msgid "Detailed Report"
+msgstr "तपशीलवार अहवाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:990
+msgid "तपशीलवार अहवाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:993
+msgid "Print PDF"
+msgstr "प्रिंट पीडीएफ़"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:995
+msgid "प्रिंट पीडीएफ़"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:998
+msgid "Aged Supplier Listing"
+msgstr "वृद्ध पुरवठादार यादी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1000
+msgid "वृद्ध पुरवठादार यादी"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1004
+msgid "Aged Suppliers"
+msgstr "वृद्ध पुरवठादार"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1006
+msgid "वृद्ध पुरवठादार"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1009
+msgid "Aged Supplier Account Analysis"
+msgstr "वृद्ध पुरवठादार खाते विश्लेषण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1011
+msgid "वृद्ध पुरवठादार खाते विश्लेषण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1015
+msgid "The Supplier details could not be retrieved by the SQL because"
+msgstr "पुरवठादार तपशील SQL द्वारे प्राप्त केले जाऊ शकत नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1017
+msgid "पुरवठादार तपशील SQL द्वारे प्राप्त केले जाऊ शकत नाही कारण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1021
+msgid "Aged Supplier Account Analysis - Problem Report"
+msgstr "वृद्ध पुरवठादार खाते विश्लेषण - समस्या नोंदवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1023
+msgid "वृद्ध पुरवठादार खाते विश्लेषण - समस्या नोंदवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1027
+msgid "The details of outstanding transactions for Supplier"
+msgstr "पुरवठादार अनिर्णित व्यवहार तपशील"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1029
+msgid "पुरवठादार अनिर्णित व्यवहार तपशील"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1033
+msgid "Aged Supplier Analysis"
+msgstr "वृद्ध पुरवठादार विश्लेषण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1035
+msgid "वृद्ध पुरवठादार विश्लेषण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1039
+msgid "There are no results so the PDF is empty"
+msgstr "कोणतेही परिणाम आहेत म्हणून पीडीएफ रिक्त आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1041
+msgid "कोणतेही परिणाम आहेत म्हणून पीडीएफ रिक्त आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1045
+msgid "From Supplier Code"
+msgstr "पुरवठादार कोड पासून"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1047
+msgid "पुरवठादार कोड पासून"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1051
+msgid "Enter the first supplier code alphabetially to include in the report"
+msgstr "अहवालात समाविष्ट करण्यासाठी alphabetially प्रथम पुरवठादार कोड प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1054
+msgid "अहवालात समाविष्ट करण्यासाठी alphabetially प्रथम पुरवठादार कोड प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1058
+msgid "To Supplier Code"
+msgstr "पुरवठादार कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1063
+msgid "Enter the last supplier code alphabetically to include in the report"
+msgstr "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने गेल्या पुरवठादार कोड प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1066
+msgid "अहवालात समाविष्ट करण्यासाठी अक्षरानुक्रमाने गेल्या पुरवठादार कोड प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1070
+msgid "All suppliers with balances"
+msgstr "शिल्लक असलेल्या सर्व पुरवठादार"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1072
+msgid "शिल्लक असलेल्या सर्व पुरवठादार"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1076
+msgid "For suppliers trading in"
+msgstr "मध्ये ट्रेडिंग पुरवठादार साठी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1078
+msgid "मध्ये ट्रेडिंग पुरवठादार साठी"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1082
+msgid "Summary or Detailed Report"
+msgstr "सारांश किंवा तपशीलवार अहवाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1084
+msgid "सारांश किंवा तपशीलवार अहवाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1088
+msgid "Sales Area Maintenance"
+msgstr "विक्री क्षेत्र देखभाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1090
+msgid "विक्री क्षेत्र देखभाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1094
+msgid "The area code must be three characters or less long"
+msgstr "क्षेत्र कोड तीन वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1096
+msgid "क्षेत्र कोड तीन वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1100
+msgid "The area code entered already exists"
+msgstr "क्षेत्र कोड विद्यमान आधीच प्रविष्ट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1102
+msgid "क्षेत्र कोड विद्यमान आधीच प्रविष्ट"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1106
+msgid "The area description must be twenty five characters or less long"
+msgstr "क्षेत्र वर्णन पंचवीस वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1108
+msgid "क्षेत्र वर्णन पंचवीस वर्ण किंवा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1112
+msgid "The area code may not be empty"
+msgstr "क्षेत्र कोड रिक्त असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1114
+msgid "क्षेत्र कोड रिक्त असू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1118
+msgid "The area description may not be empty"
+msgstr "क्षेत्र वर्णन रिक्त असू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1120
+msgid "क्षेत्र वर्णन रिक्त असू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1124
+msgid "Area code"
+msgstr "क्षेत्र कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1129
+msgid "New area code"
+msgstr "नवीन क्षेत्र कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1131
+msgid "नवीन क्षेत्र कोड"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1134
+msgid "has been inserted"
+msgstr "घातले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1136
+msgid "घातले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1139
+msgid "The area could not be added or updated because"
+msgstr "क्षेत्र जोडला किंवा अद्यतनित करणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1141
+msgid "क्षेत्र जोडला किंवा अद्यतनित करणे शक्य नाही कारण"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1145
+msgid ""
+"Cannot delete this area because customer branches have been created using "
+"this area"
+msgstr "ग्राहक शाखा या क्षेत्रात वापरून तयार केले गेले आहेत कारण या क्षेत्रात हटवू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1148
+msgid "ग्राहक शाखा या क्षेत्रात वापरून तयार केले गेले आहेत कारण या क्षेत्रात हटवू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1152
+msgid "branches using this area code"
+msgstr "या क्षेत्रात कोड वापरून शाखा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1154
+msgid "या क्षेत्रात कोड वापरून शाखा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1158
+msgid ""
+"Cannot delete this area because sales analysis records exist that use this "
+"area"
+msgstr "विक्री विश्लेषण रेकॉर्ड की वापर या भागात विद्यमान कारण हे क्षेत्र हटवू शकत नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1161
+msgid "विक्री विश्लेषण रेकॉर्ड की वापर या भागात विद्यमान कारण हे क्षेत्र हटवू शकत नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1165
+msgid "sales analysis records referring this area code"
+msgstr "विक्री विश्लेषण रेकॉर्ड या क्षेत्रात कोड संदर्भित"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1167
+msgid "विक्री विश्लेषण रेकॉर्ड या क्षेत्रात कोड संदर्भित"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1176
+msgid "has been deleted"
+msgstr "हटविले गेले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1178
+msgid "हटविले गेले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1181
+msgid "Area Name"
+msgstr "क्षेत्र नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1183
+msgid "क्षेत्र नाव"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1186
+msgid "View Customers from this Area"
+msgstr "या क्षेत्र पहा ग्राहक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1188
+msgid "या क्षेत्र पहा ग्राहक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1192
+msgid "Review Areas Defined"
+msgstr "परिभाषित पुनरावलोकन क्षेत्रे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1194
+msgid "परिभाषित पुनरावलोकन क्षेत्रे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1198
+msgid "Enter the sales area code - up to 3 characters are allowed"
+msgstr "विक्री क्षेत्र कोड प्रविष्ट करा - 3 अक्षरांपर्यंत परवानगी आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1200
+msgid "विक्री क्षेत्र कोड प्रविष्ट करा - 3 अक्षरांपर्यंत परवानगी आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1204
+msgid "Enter the description of the sales area"
+msgstr "विक्री क्षेत्र वर्णन प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1206
+msgid "विक्री क्षेत्र वर्णन प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1210
+msgid "Audit Trail"
+msgstr "लेखा माग"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1212
+msgid "लेखा माग"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1215
+msgid "Incorrect date format used, please re-enter"
+msgstr "वापरले अयोग्य तारीख स्वरूप, पुन्हा प्रविष्ट करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1217
+msgid "वापरले अयोग्य तारीख स्वरूप, पुन्हा प्रविष्ट करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1221
+msgid "From Date"
+msgstr "तारखेपासून"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1223
+msgid "तारखेपासून"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1226
+msgid "To Date"
+msgstr "आत्तापर्यंत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1228
+msgid "आत्तापर्यंत"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1231
+msgid "User ID"
+msgstr "वापरकर्ता आयडी"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1236
+msgid "All"
+msgstr "सर्व"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1238
+msgid "सर्व"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1241
+msgid "Table"
+msgstr "टेबल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1243
+msgid "टेबल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1246
+msgid "Containing text"
+msgstr "मजकूर असलेली"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1248
+msgid "मजकूर असलेली"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1251
+msgid "View"
+msgstr "दृश्य"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1253
+msgid "दृश्य"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1256
+msgid "Date/Time"
+msgstr "दिनांक / वेळ"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1258
+msgid "दिनांक / वेळ"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1261
+msgid "User"
+msgstr "वापरकर्ता"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1266
+msgid "Type"
+msgstr "प्रकार"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1268
+msgid "प्रकार"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1276
+msgid "Field Name"
+msgstr "फील्ड नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1278
+msgid "फील्ड नाव"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1281
+msgid "Value"
+msgstr "किंमत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1283
+msgid "किंमत"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1286
+msgid "Backup webERP Database"
+msgstr "बॅकअप webERP डेटाबेस"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1288
+msgid "बॅकअप webERP डेटाबेस"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1292
+msgid "Deleted"
+msgstr "हटवले"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1294
+msgid "हटवले"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1297
+msgid "Unable to delete"
+msgstr "हटविण्यात अक्षम"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1299
+msgid "हटविण्यात अक्षम"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1302
+msgid "All backup files on the server have been deleted"
+msgstr "सर्व्हरवर सर्व बॅकअप फाइल्स काढून टाकले आहेत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1304
+msgid "सर्व्हरवर सर्व बॅकअप फाइल्स काढून टाकले आहेत"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1308
+msgid "No backup files on the server were deleted"
+msgstr "सर्व्हरवर बॅकअप नाही फाइल्स हटविले गेले"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1310
+msgid "सर्व्हरवर नाही बॅकअप फाइल्स हटविले गेले"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1314
+msgid "Backup"
+msgstr "बॅकअप"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1316
+msgid "टेकू देणे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1319
+msgid ""
+"The backup file has now been created. You must now download this to your "
+"computer because in case the web-server has a disk failure the backup would "
+"then not on the same machine. Use the link below"
+msgstr ""
+"बॅकअप फाइल आता तयार केले गेले आहे. आपण आता आपल्या संगणकावर हे डाउनलोड करणे आवश्यक आहे "
+"कारण वेब सर्व्हर डिस्क अपयशी झाल्यास, समान मशीनवर बॅकअप नंतर असणार नाही. अशावेळेस "
+"खालील दुवा वापरा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1323
+msgid ""
+"बॅकअप फाइल आता तयार केले गेले आहे. बाबतीत वेब सर्व्हर डिस्क अपयशी बॅकअप आहे कारण आपण आता "
+"आपल्या संगणकावर हे डाउनलोड करणे आवश्यक आहे असे नंतर नाही समान मशीनवर. खालील दुवा वापरा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1329
+msgid "Download the backup file to your locale machine"
+msgstr "आपल्या लोकल मशीनवर बॅकअप फाइल डाउनलोड करा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1331
+msgid "आपल्या लोकॅल मशीनवर बॅकअप फाइल डाउनलोड करा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1335
+msgid ""
+"Once you have downloaded the database backup file to your local machine you "
+"should use the link below to delete it - backup files can consume a lot of "
+"space on your hosting account and will accumulate if not deleted - they also "
+"contain sensitive information which would otherwise be available for others "
+"to download!"
+msgstr ""
+"आपण आपल्या स्थानिक मशीनवर डेटाबेस बॅकअप फाइल डाउनलोड केल्यावर आपण हे हटविण्यासाठी "
+"खालील दुवा वापरणे आवश्यक आहे - बॅकअप फाइल्स तुमच्या होस्टिंग खात्यावर जागा भरपूर खाऊ "
+"शकतात आणि हटविले नाही तर साठवणे होईल - अन्यथा संवेदनशील माहिती देखील इतरांना "
+"डाउनलोड करण्यासाठी उपलब्ध होईल!"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1341
+msgid ""
+"आपण आपल्या स्थानिक मशीनवर डेटाबेस बॅकअप फाइल डाउनलोड केल्यावर आपण हे हटवू खालील दुवा "
+"वापरू नये - बॅकअप फाइल्स तुमच्या होस्टिंग खात्यावर जागा भरपूर खाऊ शकतात आणि हटविले नाही "
+"तर साठवणे होईल - ते देखील अन्यथा होईल जे संवेदनशील माहिती असू डाउनलोड इतरांना उपलब्ध!"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1348
+msgid "Delete the backup file off the server"
+msgstr "सर्व्हर पासून बॅकअप फाइल हटवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1350
+msgid "सर्व्हर बंद बॅकअप फाइल हटवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1354
+msgid ""
+"There was some problem producing a backup using mysqldump. Normally this "
+"relates to a permissions issue - the web-server user must have permission to "
+"write to the companies directory"
+msgstr ""
+"Mysqldump वापरून बॅकअप तयार करताना काही समस्या आली. सामान्यपणे हा एक परवानग्या "
+"समस्या संबंधित आहे - वेब सर्व्हर वापरकर्त्यास कंपन्या निर्देशिकेत लिहिण्याची परवानगी असणे "
+"आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1358
+msgid ""
+"Mysqldump वापरून बॅकअप उत्पादन काही समस्या आली. सामान्यपणे हा एक परवानग्या समस्या "
+"संबंधित - वेब सर्व्हर वापरकर्ता कंपन्या निर्देशिकेत लिहिण्याची परवानगी असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1363
+msgid "Bank Accounts Maintenance"
+msgstr "बँक खाते देखभाल"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1365
+msgid "बँक खाते देखभाल"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1368
+msgid "Bank"
+msgstr "बँक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1370
+msgid "बँक"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1373
+msgid ""
+"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
+"Codes. Set Default for Invoices to Currency Default or Fallback Default to "
+"print Account details on Invoices (only one account should be set to Fall "
+"Back Default)."
+msgstr ""
+"अद्यतनित बँक खात्याचा तपशील. खाते कोड स्विफ्ट किंवा BSB प्रकार बँक कोडसाठी आहे. "
+"चलनासंबंधी डीफॉल्ट किंवा पावत्या (केवळ एक खाते डीफॉल्ट मागे रंगछटा सेट करावे) वर खाते "
+"तपशील मुद्रित फॉलबॅक डीफॉल्ट पावत्या पूर्वनिर्धारीत."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1378
+msgid ""
+"अद्यतनित बँक खात्याचा तपशील. खाते कोड स्विफ्ट किंवा BSB प्रकार बँक कोडसाठी आहे. "
+"चलनासंबंधी डीफॉल्ट किंवा पावत्या (केवळ एक खाते डीफॉल्ट मागे रंगछटा सेट करावे) वर खाते "
+"तपशील मुद्रित फॉलबॅक डीफॉल्ट पावत्या पूर्वनिर्धारीत."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1384
+msgid "The bank account code already exists in the database"
+msgstr "बँक खाते कोड आधीच डेटाबेस अस्तित्वात"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1386
+msgid "बँक खाते कोड आधीच डेटाबेस अस्तित्वात"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1390
+msgid "The bank account name must be fifty characters or less long"
+msgstr "बँक खाते नाव पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1392
+msgid "बँक खाते नाव पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1396
+msgid "The bank account name may not be empty."
+msgstr "बँक खाते नाव रिक्त असू शकत नाही."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1398
+msgid "बँक खाते नाव रिक्त असू शकत नाही."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1402
+msgid "The bank account number may not be empty."
+msgstr "बँक खाते क्रमांक रिक्त असू शकत नाही."
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1404
+msgid "बँक खाते क्रमांक रिक्त असू शकत नाही."
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1408
+msgid "The bank account number must be fifty characters or less long"
+msgstr "बँक खाते क्रमांक पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1410
+msgid "बँक खाते क्रमांक पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1414
+msgid "The bank address must be fifty characters or less long"
+msgstr "बँक पत्ता पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1416
+msgid "बँक पत्ता पन्नास किंवा त्यापेक्षा कमी लांब असणे आवश्यक आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1420
+msgid ""
+"Note that it is not possible to change the currency of the account once "
+"there are transactions against it"
+msgstr ""
+"एकदा या खात्याशी संबंधित व्यवहार झाला तर या खात्याचे चलन बदलणे शक्य नाही हे लक्षात ठेवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1423
+msgid "तो व्यवहार तो विरुद्ध आहेत एकदा खाते चलन बदलणे शक्य नाही हे लक्षात ठेवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1427
+msgid "The bank account details have been updated"
+msgstr "बँक खाते तपशील अद्यतनित केले गेले आहेत"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1429
+msgid "बँक खाते तपशील अद्यतनित केले गेले आहेत"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1433
+msgid "The new bank account has been entered"
+msgstr "नवीन बँक खाते प्रविष्ट केले आहे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1435
+msgid "नवीन बँक खाते प्रविष्ट केले आहे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1439
+msgid "The bank account could not be inserted or modified because"
+msgstr "बँक खाते प्रविष्ट किंवा कारण सुधारित केले जाऊ शकले नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1441
+msgid "बँक खाते घातलेले किंवा कारण सुधारित केले जाऊ शकले नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1445
+msgid "The SQL used to insert/modify the bank account details was"
+msgstr "सुधारित / बँक खात्याचा तपशील घालण्यासाठी वापरले SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1447
+msgid "सुधारित / बँक खात्याचा तपशील घालण्यासाठी वापरले SQL होते"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1451
+msgid ""
+"Cannot delete this bank account because transactions have been created using "
+"this account"
+msgstr "व्यवहार हे खाते वापरून तयार केले गेले आहेत कारण या बँक खाते हटवणे शक्य नाही"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1454
+msgid "व्यवहार हे खाते वापरून तयार केले गेले आहेत कारण या बँक खाते हटवणे शक्य नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1458
+msgid "transactions with this bank account code"
+msgstr "या बँक खाते कोडसह व्यवहार"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1460
+msgid "या बँक खाते कोडसह व्यवहार"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1464
+msgid "Bank account deleted"
+msgstr "हटविले बँक खाते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1466
+msgid "हटविले बँक खाते"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1469
+msgid "The bank accounts set up could not be retrieved because"
+msgstr "सेट बँक खाती पुनर्प्राप्त करणे शक्य नाही कारण"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1471
+msgid "सेट बँक खाती कारण पुनर्प्राप्त करणे शक्य नाही"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1475
+msgid "The SQL used to retrieve the bank account details was"
+msgstr "बँक खाते माहिती पुनर्प्राप्त करण्यासाठी वापरले SQL होते"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1477
+msgid "बँक खाते माहिती पुनर्प्राप्त करण्यासाठी वापरले SQL होते"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1481
+msgid "GL Account Code"
+msgstr "जी.एल. खाते कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1486
+msgid "Bank Account Name"
+msgstr "बँक खाते नाव"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1488
+msgid "बँक खाते नाव"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1491
+msgid "Bank Account Code"
+msgstr "बँक खाते कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1493
+msgid "बँक खाते कोड"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1496
+msgid "Bank Account Number"
+msgstr "बँक खाते क्रमांक"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1501
+msgid "Bank Address"
+msgstr "बँक पत्ता"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1503
+msgid "बँक पत्ता"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1506
+msgid "Currency"
+msgstr "चलन"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1508
+msgid "चलन"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1511
+msgid "Default for Invoices"
+msgstr "पावत्या डीफॉल्ट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1513
+msgid "पावत्या डीफॉल्ट"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1516
+msgid "Fall Back Default"
+msgstr "डीफॉल्ट मागे पडणे"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1518
+msgid "डीफॉल्ट मागे पडणे"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1521
+msgid "Currency Default"
+msgstr "चलन डीफॉल्ट"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1523
+msgid "चलन डीफॉल्ट"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1526
+msgid "Are you sure you wish to delete this bank account?"
+msgstr "आपण हे बँक खाते हटवू इच्छिता खात्री आहे?"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1528
+msgid "आपण या बँक खाते हटवू इच्छित खात्री आहे?"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1532
+msgid "Show All Bank Accounts Defined"
+msgstr "सर्व परिभाषित बँक खाती दाखवा"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1534
+msgid "परिभाषित सर्व बँक खाती दाखवा"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1538
+msgid "Bank Account GL Code"
+msgstr "बँक खाते जी.एल. कोड"
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1540
+msgid "बँक खाते जी.एल. कोड"
+msgstr ""
+
+#: e:\acerd\MarathiMessage.html+html.body.div.table.tr.td:1544
+msgid "Currency Of Account"
+msgstr "खाते ठरविणे"
+
+#: e:\acerd\MarathiMessage.h...
[truncated message content] |
|
From: <dai...@us...> - 2015-03-19 07:03:23
|
Revision: 7229
http://sourceforge.net/p/web-erp/reponame/7229
Author: daintree
Date: 2015-03-19 07:03:20 +0000 (Thu, 19 Mar 2015)
Log Message:
-----------
remove duplicate sql upgrade files
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.12.2-4.13.sql
Removed Paths:
-------------
trunk/locale/mr_IN.utf8/
trunk/sql/mysql/upgrade4.12-4.13.sql
Deleted: trunk/sql/mysql/upgrade4.12-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12-4.13.sql 2015-03-14 10:00:31 UTC (rev 7228)
+++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-03-19 07:03:20 UTC (rev 7229)
@@ -1,3 +0,0 @@
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
------UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.12.2-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.2-4.13.sql 2015-03-14 10:00:31 UTC (rev 7228)
+++ trunk/sql/mysql/upgrade4.12.2-4.13.sql 2015-03-19 07:03:20 UTC (rev 7229)
@@ -1,10 +1,6 @@
--- webERP 4.13.
--- Release date: yyyy-mm-dd.
---
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items');
-
-
-
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <ex...@us...> - 2015-03-14 10:00:34
|
Revision: 7228
http://sourceforge.net/p/web-erp/reponame/7228
Author: exsonqu
Date: 2015-03-14 10:00:31 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-14 09:59:55 UTC (rev 7227)
+++ trunk/doc/Change.log 2015-03-14 10:00:31 UTC (rev 7228)
@@ -1,5 +1,6 @@
webERP Change Log
+14/03/15 Exson: Fixed undefined index noise in Credit_Invoice.php.
13/03/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
|
|
From: <ex...@us...> - 2015-03-14 10:00:02
|
Revision: 7227
http://sourceforge.net/p/web-erp/reponame/7227
Author: exsonqu
Date: 2015-03-14 09:59:55 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
14/03/15 Exson: Fixed undefined index noise in Credit_Invoice.php.
Modified Paths:
--------------
trunk/Credit_Invoice.php
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-03-13 02:42:53 UTC (rev 7226)
+++ trunk/Credit_Invoice.php 2015-03-14 09:59:55 UTC (rev 7227)
@@ -1609,6 +1609,9 @@
echo '</select></td>';
}
echo '</tr>';
+ if(!isset($_POST['CreditText'])){
+ $_POST['CreditText'] = '';
+ }
echo '<tr>
<td>' . _('Credit note text') . '</td>
<td><textarea name="CreditText" cols="31" rows="5" tabindex="'.$tabindex++.'">' . $_POST['CreditText'] . '</textarea></td>
|
|
From: <ex...@us...> - 2015-03-13 02:42:55
|
Revision: 7226
http://sourceforge.net/p/web-erp/reponame/7226
Author: exsonqu
Date: 2015-03-13 02:42:53 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-13 02:42:14 UTC (rev 7225)
+++ trunk/doc/Change.log 2015-03-13 02:42:53 UTC (rev 7226)
@@ -1,4 +1,6 @@
webERP Change Log
+
+13/03/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
|
|
From: <ex...@us...> - 2015-03-13 02:42:21
|
Revision: 7225
http://sourceforge.net/p/web-erp/reponame/7225
Author: exsonqu
Date: 2015-03-13 02:42:14 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
13/03/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
Modified Paths:
--------------
trunk/WorkOrderReceive.php
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2015-03-13 02:32:31 UTC (rev 7224)
+++ trunk/WorkOrderReceive.php 2015-03-13 02:42:14 UTC (rev 7225)
@@ -977,6 +977,8 @@
<td><input type="textbox" name="BatchRef' . $i .'" placeholder="'._('Batch/Lot No').'" ';
if ($i==0){
+ $StringBitOfLotSNRef = isset($StringBitOfLotSNRef)?$StringBitOfLotSNRef:'';
+ $LotSNRefNumeric = isset($LotSNRefNumeric)?$LotSNRefNumeric:'';
echo 'value="' . $StringBitOfLotSNRef . ($LotSNRefNumeric + 1) . '"';
}
echo ' /></td>
@@ -1009,4 +1011,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-13 02:32:33
|
Revision: 7224
http://sourceforge.net/p/web-erp/reponame/7224
Author: exsonqu
Date: 2015-03-13 02:32:31 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-13 02:31:54 UTC (rev 7223)
+++ trunk/doc/Change.log 2015-03-13 02:32:31 UTC (rev 7224)
@@ -1,5 +1,5 @@
webERP Change Log
-
+13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
|
|
From: <ex...@us...> - 2015-03-13 02:32:01
|
Revision: 7223
http://sourceforge.net/p/web-erp/reponame/7223
Author: exsonqu
Date: 2015-03-13 02:31:54 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
Modified Paths:
--------------
trunk/SelectWorkOrder.php
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2015-03-13 02:30:47 UTC (rev 7222)
+++ trunk/SelectWorkOrder.php 2015-03-13 02:31:54 UTC (rev 7223)
@@ -158,11 +158,11 @@
echo '</select>
<select name="ClosedOrOpen">';
- if ($_GET['ClosedOrOpen']=='Closed_Only'){
+ if (isset($_GET['ClosedOrOpen']) AND $_GET['ClosedOrOpen']=='Closed_Only'){
$_POST['ClosedOrOpen']='Closed_Only';
}
- if ($_POST['ClosedOrOpen']=='Closed_Only'){
+ if (isset($_POST['ClosedOrOpen']) AND $_POST['ClosedOrOpen']=='Closed_Only'){
echo '<option selected="selected" value="Closed_Only">' . _('Closed Work Orders Only') . '</option>';
echo '<option value="Open_Only">' . _('Open Work Orders Only') . '</option>';
} else {
@@ -400,4 +400,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-13 02:30:54
|
Revision: 7222
http://sourceforge.net/p/web-erp/reponame/7222
Author: exsonqu
Date: 2015-03-13 02:30:47 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-13 02:30:07 UTC (rev 7221)
+++ trunk/doc/Change.log 2015-03-13 02:30:47 UTC (rev 7222)
@@ -1,4 +1,6 @@
webERP Change Log
+
+13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
|
|
From: <ex...@us...> - 2015-03-13 02:30:15
|
Revision: 7221
http://sourceforge.net/p/web-erp/reponame/7221
Author: exsonqu
Date: 2015-03-13 02:30:07 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
Modified Paths:
--------------
trunk/WorkOrderIssue.php
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2015-03-12 01:04:06 UTC (rev 7220)
+++ trunk/WorkOrderIssue.php 2015-03-13 02:30:07 UTC (rev 7221)
@@ -77,7 +77,7 @@
$InputError=true;
}
$QuantityIssued =0;
- if (is_array($_POST['SerialNos'])){ //then we are issuing a serialised item
+ if (isset($_POST['SerialNos']) AND is_array($_POST['SerialNos'])){ //then we are issuing a serialised item
$QuantityIssued = count($_POST['SerialNos']); // the total quantity issued as 1 per serial no
} elseif (isset($_POST['Qty'])){ //then its a plain non-controlled item
$QuantityIssued = filter_number_format($_POST['Qty']);
@@ -705,7 +705,7 @@
$SQL="SELECT categoryid,
categorydescription
FROM stockcategory
- WHERE stocktype='F' OR stocktype='D'
+ WHERE stocktype='F' OR stocktype='D' OR stocktype='L'
ORDER BY categorydescription";
$result1 = DB_query($SQL);
@@ -902,4 +902,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-12 01:04:08
|
Revision: 7220
http://sourceforge.net/p/web-erp/reponame/7220
Author: exsonqu
Date: 2015-03-12 01:04:06 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-12 01:03:30 UTC (rev 7219)
+++ trunk/doc/Change.log 2015-03-12 01:04:06 UTC (rev 7220)
@@ -1,5 +1,5 @@
webERP Change Log
-
+12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
|
|
From: <ex...@us...> - 2015-03-12 01:03:37
|
Revision: 7219
http://sourceforge.net/p/web-erp/reponame/7219
Author: exsonqu
Date: 2015-03-12 01:03:30 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2015-03-12 00:56:27 UTC (rev 7218)
+++ trunk/SelectSalesOrder.php 2015-03-12 01:03:30 UTC (rev 7219)
@@ -695,7 +695,7 @@
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
$TableHeader = '<tr>
- <th>' . _('Modify') . '</th>
+ <th class="ascending" >' . _('Modify') . '</th>
<th>' . _('Invoice') . '</th>
<th>' . _('Dispatch Note') . '</th>
<th class="ascending" >' . _('Customer') . '</th>
|
|
From: <ex...@us...> - 2015-03-12 00:56:34
|
Revision: 7218
http://sourceforge.net/p/web-erp/reponame/7218
Author: exsonqu
Date: 2015-03-12 00:56:27 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-12 00:55:44 UTC (rev 7217)
+++ trunk/doc/Change.log 2015-03-12 00:56:27 UTC (rev 7218)
@@ -1,5 +1,6 @@
webERP Change Log
+12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
|
|
From: <ex...@us...> - 2015-03-12 00:55:52
|
Revision: 7217
http://sourceforge.net/p/web-erp/reponame/7217
Author: exsonqu
Date: 2015-03-12 00:55:44 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
Modified Paths:
--------------
trunk/PO_SelectPurchOrder.php
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2015-03-11 02:47:38 UTC (rev 7216)
+++ trunk/PO_SelectPurchOrder.php 2015-03-12 00:55:44 UTC (rev 7217)
@@ -137,27 +137,27 @@
} else {
echo '<option value="Pending_Authorised_Completed">' . _('Pending/Authorised/Completed') . '</option>';
}
- if ($_POST['Status']=='Pending'){
+ if (isset($_POST['Status']) AND $_POST['Status']=='Pending'){
echo '<option selected="selected" value="Pending">' . _('Pending') . '</option>';
} else {
echo '<option value="Pending">' . _('Pending') . '</option>';
}
- if ($_POST['Status']=='Authorised'){
+ if (isset($_POST['Status']) AND $_POST['Status']=='Authorised'){
echo '<option selected="selected" value="Authorised">' . _('Authorised') . '</option>';
} else {
echo '<option value="Authorised">' . _('Authorised') . '</option>';
}
- if ($_POST['Status']=='Completed'){
+ if (isset($_POST['Status']) AND $_POST['Status']=='Completed'){
echo '<option selected="selected" value="Completed">' . _('Completed') . '</option>';
} else {
echo '<option value="Completed">' . _('Completed') . '</option>';
}
- if ($_POST['Status']=='Cancelled'){
+ if (isset($_POST['Status']) AND $_POST['Status']=='Cancelled'){
echo '<option selected="selected" value="Cancelled">' . _('Cancelled') . '</option>';
} else {
echo '<option value="Cancelled">' . _('Cancelled') . '</option>';
}
- if ($_POST['Status']=='Rejected'){
+ if (isset($_POST['Status']) AND $_POST['Status']=='Rejected'){
echo '<option selected="selected" value="Rejected">' . _('Rejected') . '</option>';
} else {
echo '<option value="Rejected">' . _('Rejected') . '</option>';
|
|
From: <ex...@us...> - 2015-03-11 02:47:45
|
Revision: 7216
http://sourceforge.net/p/web-erp/reponame/7216
Author: exsonqu
Date: 2015-03-11 02:47:38 +0000 (Wed, 11 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-11 02:45:48 UTC (rev 7215)
+++ trunk/doc/Change.log 2015-03-11 02:47:38 UTC (rev 7216)
@@ -1,5 +1,6 @@
webERP Change Log
+11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
|
|
From: <ex...@us...> - 2015-03-11 02:45:55
|
Revision: 7215
http://sourceforge.net/p/web-erp/reponame/7215
Author: exsonqu
Date: 2015-03-11 02:45:48 +0000 (Wed, 11 Mar 2015)
Log Message:
-----------
11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
Modified Paths:
--------------
trunk/GoodsReceived.php
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2015-03-10 15:28:27 UTC (rev 7214)
+++ trunk/GoodsReceived.php 2015-03-11 02:45:48 UTC (rev 7215)
@@ -403,7 +403,7 @@
if ($OrderLine->StockID!='') { //Its a stock item line
/*Need to get the current standard cost as it is now so we can process GL jorunals later*/
- $SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
+ $SQL = "SELECT materialcost + labourcost + overheadcost as stdcost,mbflag
FROM stockmaster
WHERE stockid='" . $OrderLine->StockID . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The standard cost of the item being received cannot be retrieved because');
@@ -411,24 +411,29 @@
$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
$myrow = DB_fetch_row($Result);
-
- if ($OrderLine->QtyReceived==0){ //its the first receipt against this line
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $myrow[0];
+ if($myrow[1] != 'D') {
+ if ($OrderLine->QtyReceived==0){ //its the first receipt against this line
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $myrow[0];
+ }
+ $CurrentStandardCost = $myrow[0];
+ /*Set the purchase order line stdcostunit = weighted average / standard cost used for all receipts of this line
+ This assures that the quantity received against the purchase order line multiplied by the weighted average of standard
+ costs received = the total of standard cost posted to GRN suspense*/
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost * $OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
+ } elseif ($myrow[1] == 'D') { //it's a dummy part which without stock.
+ $Dummy = true;
+ if($OrderLine->QtyReceived == 0){//There is
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
+ }
}
- $CurrentStandardCost = $myrow[0];
- /*Set the purchase order line stdcostunit = weighted average / standard cost used for all receipts of this line
- This assures that the quantity received against the purchase order line multiplied by the weighted average of standard
- costs received = the total of standard cost posted to GRN suspense*/
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost *$OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
-
} elseif ($OrderLine->QtyReceived==0 AND $OrderLine->StockID=='') {
/*Its a nominal item being received */
/*Need to record the value of the order per unit in the standard cost field to ensure GRN account entries clear */
$_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
}
- if ($OrderLine->StockID=='') { /*Its a NOMINAL item line */
+ if ($OrderLine->StockID=='' OR !empty($Dummy)) { /*Its a NOMINAL item line */
$CurrentStandardCost = $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost;
}
@@ -452,7 +457,7 @@
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
- if ($OrderLine->StockID !=''){ /*Its a stock item so use the standard cost for the journals */
+ if ($OrderLine->StockID !='' AND !isset($Dummy)){ /*Its a stock item so use the standard cost for the journals */
$UnitCost = $CurrentStandardCost;
} else { /*otherwise its a nominal PO item so use the purchase cost converted to local currency */
$UnitCost = $OrderLine->Price / $_SESSION['PO'.$identifier]->ExRate;
|
|
From: <rc...@us...> - 2015-03-10 15:28:34
|
Revision: 7214
http://sourceforge.net/p/web-erp/reponame/7214
Author: rchacon
Date: 2015-03-10 15:28:27 +0000 (Tue, 10 Mar 2015)
Log Message:
-----------
Spanish translation improvements.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
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 2015-03-09 20:53:48 UTC (rev 7213)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-03-10 15:28:27 UTC (rev 7214)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-24 17:34-0600\n"
-"PO-Revision-Date: 2015-03-02 09:36-0600\n"
+"PO-Revision-Date: 2015-03-09 16:56-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -18,6 +18,7 @@
"X-Generator: Poedit 1.5.4\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"
#: AccountGroups.php:6 includes/MainMenuLinksArray.php:391
msgid "Account Groups"
@@ -3145,7 +3146,7 @@
#: BankMatching.php:146 BankMatching.php:149
msgid "Show unmatched"
-msgstr "Mostrar no conciliados:"
+msgstr "Mostrar no conciliados"
#: BankMatching.php:146 BankMatching.php:149 PrintCheque.php:52
#: ReverseGRN.php:105 includes/PDFCustomerListPageHeader.inc:46
@@ -3465,11 +3466,11 @@
#: BankReconciliation.php:389 BankReconciliation.php:397
msgid "Match off cleared payments"
-msgstr "Conciliar los Pagos pasados por el banco"
+msgstr "Conciliar los pagos pasados por el banco"
#: BankReconciliation.php:392 BankReconciliation.php:400
msgid "Match off cleared deposits"
-msgstr "Conciliar los ingresos pasados por el banco"
+msgstr "Conciliar los depósitos pasados por el banco"
#: COGSGLPostings.php:7
msgid "Cost Of Sales GL Postings Set Up"
@@ -5384,7 +5385,7 @@
#: WorkOrderIssue.php:778 reportwriter/languages/en_US/reports.php:270
#, php-format
msgid "No Image"
-msgstr "Sin Imagen"
+msgstr "Sin imagen"
#: ContractBOM.php:383
msgid "Enter the quantity required of this item to complete the contract"
@@ -7714,7 +7715,7 @@
#: Currencies.php:33
msgid "Currencies"
-msgstr ""
+msgstr "Monedas"
#: Currencies.php:56
msgid "The currency already exists in the database"
@@ -7766,11 +7767,11 @@
#: Currencies.php:199 Currencies.php:217
msgid "currency rate adjustment to"
-msgstr ""
+msgstr "ajuste en tipo de cambio de"
#: Currencies.php:221
msgid "Currency Rate difference of"
-msgstr ""
+msgstr "Diferencia en tasa de cambio de"
#: Currencies.php:246
msgid ""
@@ -10502,11 +10503,11 @@
#: DailyBankTransactions.php:73
msgid "Unmatched"
-msgstr ""
+msgstr "Sin conciliar"
#: DailyBankTransactions.php:74
msgid "Matched"
-msgstr ""
+msgstr "Conciliado"
#: DailyBankTransactions.php:80 GLJournalInquiry.php:49
msgid "Show transactions"
@@ -10523,7 +10524,7 @@
#: DailyBankTransactions.php:123
msgid "Account Transactions For"
-msgstr "Transacciones de Cuenta para"
+msgstr "Transacciones de cuenta para"
#: DailyBankTransactions.php:123 GLJournalInquiry.php:26
msgid "Between"
@@ -10564,11 +10565,11 @@
#: DailyBankTransactions.php:132 DailyBankTransactions.php:134
msgid "Running Total"
-msgstr "Corriendo Total"
+msgstr "Acumulado en"
#: DailyBankTransactions.php:135
msgid "Cleared"
-msgstr ""
+msgstr "Compensado"
#: DailyBankTransactions.php:173 GLJournalInquiry.php:126
msgid "Select Another Date"
@@ -26454,7 +26455,7 @@
#: SalesCategories.php:541
msgid "No Inventory items in this category"
-msgstr "No hay artículos de Inventario en esta categoría"
+msgstr "No hay artículos de inventario en esta categoría"
#: SalesCategoryPeriodInquiry.php:6 SalesCategoryPeriodInquiry.php:9
msgid "Sales Category Report"
@@ -30441,10 +30442,12 @@
"Enter up to six alphanumeric characters or underscore as a code for this "
"stock category"
msgstr ""
+"Introduzca hasta seis caracteres alfanuméricos o guión_bajo como un código "
+"para esta categoría de inventario"
#: StockCategories.php:408
msgid "A description of the inventory category is required"
-msgstr ""
+msgstr "Se requiere una descripción de la categoría inventario"
#: StockCategories.php:444
msgid "Recovery GL Code"
@@ -30522,11 +30525,11 @@
#: StockCategorySalesInquiry.php:122
msgid "Qty Sold"
-msgstr ""
+msgstr "Cantidad vendida"
#: StockCategorySalesInquiry.php:123
msgid "Sales Revenue"
-msgstr ""
+msgstr "Ingresos por ventas"
#: StockCategorySalesInquiry.php:124
msgid "COGS"
@@ -30534,7 +30537,7 @@
#: StockCategorySalesInquiry.php:125
msgid "Gross Margin"
-msgstr ""
+msgstr "Margen bruto"
#: StockCategorySalesInquiry.php:126 StockCategorySalesInquiry.php:127
msgid "Avg Unit"
@@ -30542,7 +30545,7 @@
#: StockCategorySalesInquiry.php:126
msgid "Sale Price"
-msgstr ""
+msgstr "Precio de venta"
#: StockCategorySalesInquiry.php:128
msgid "Margin %"
@@ -30550,7 +30553,7 @@
#: StockCategorySalesInquiry.php:145 StockCategorySalesInquiry.php:208
msgid "Category Total"
-msgstr ""
+msgstr "Total de la categoría"
#: StockCheck.php:10 StockCheck.php:11
msgid "Stock Count Sheets"
@@ -30750,7 +30753,7 @@
#: StockClone.php:179 Stocks.php:168
msgid "The weight of the packaged item in Gross Weight must be numeric"
-msgstr ""
+msgstr "El peso del artículo empaquetado en peso bruto debe ser numérico"
#: StockClone.php:185 Stocks.php:174 Z_ImportStocks.php:149
msgid "The weight of the packaged item must be a positive number"
@@ -30758,7 +30761,7 @@
#: StockClone.php:191 Stocks.php:180
msgid "The net weight of the item in Net Weight must be numeric"
-msgstr ""
+msgstr "El peso neto del producto en peso neto debe ser numérico"
#: StockClone.php:197 Stocks.php:186
msgid "The net weight of the item must be a positive number"
@@ -38390,7 +38393,7 @@
#: WWW_Users.php:492
msgid "A valid email address is required"
-msgstr ""
+msgstr "Se requiere una dirección de correo-e válida"
#: WWW_Users.php:511
msgid "User Can Create Tenders"
@@ -40269,7 +40272,7 @@
#: Z_ChangeStockCode.php:172
msgid "no image to rename"
-msgstr ""
+msgstr "sin imagen para renombrar"
#: Z_ChangeStockCode.php:191
msgid "Deleting the old stock master record"
@@ -49210,7 +49213,7 @@
#: includes/MainMenuLinksArray.php:365
msgid "Account Inquiry"
-msgstr "Consulta de cuentas"
+msgstr "Consulta de cuenta"
#: includes/MainMenuLinksArray.php:366
msgid "Account Listing"
@@ -51327,7 +51330,7 @@
#: ../webSHOP/CreditCardPayFlowPro.php:167
#: ../webSHOP/CreditCardPayPalPro.php:176
msgid "A valid credit card number must be entered"
-msgstr ""
+msgstr "Se debe introducir un número de tarjeta de crédito válido"
#: ../webSHOP/CreditCardPayFlowPro.php:170
#: ../webSHOP/CreditCardPayFlowPro.php:171
|
|
From: <vv...@us...> - 2015-03-09 20:53:55
|
Revision: 7213
http://sourceforge.net/p/web-erp/reponame/7213
Author: vvs2012
Date: 2015-03-09 20:53:48 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Page refresh when credit type changes in Credit_Invoce.php
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-03-09 04:20:16 UTC (rev 7212)
+++ trunk/Credit_Invoice.php 2015-03-09 20:53:48 UTC (rev 7213)
@@ -166,7 +166,7 @@
$myrow['controlled'],
$myrow['serialised'],
$myrow['decimalplaces'],
- $myrow['narrative'],
+ str_replace("\\r\\n", " ", $myrow['narrative']),
'No',
-1,
$myrow['taxcatid'],
@@ -275,13 +275,12 @@
NB QtyDispatched in the LineItems array is used for the quantity to credit */
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.png" title="' . _('Search') . '" alt="" />' . $Title . '</p>';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+echo '<div>';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
if(!isset($_POST['ProcessCredit'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-
echo '<table cellpadding="2" class="selection">';
echo '<tr><th colspan="13">';
echo '<div class="centre"><b>' . _('Credit Invoice') . ' ' . $_SESSION['ProcessingCredit'] . '</b>
@@ -1517,7 +1516,7 @@
<table class="selection">
<tr>
<td>' . _('Credit Note Type') . '</td>
- <td><select name="CreditType" tabindex="'.$tabindex++.'">';
+ <td><select name="CreditType" tabindex="'.$tabindex++.'" onchange="ReloadForm(Update)">';
if(!isset($_POST['CreditType']) OR $_POST['CreditType']=='Return') {
echo '<option selected="selected" value="Return">' . _('Goods returned to store') . '</option>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-09 04:20:16 UTC (rev 7212)
+++ trunk/doc/Change.log 2015-03-09 20:53:48 UTC (rev 7213)
@@ -1,5 +1,6 @@
webERP Change Log
+09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
08/03/15 Vitaly: Fit HTML view of invoices to one screen
|
|
From: <rc...@us...> - 2015-03-09 04:20:19
|
Revision: 7212
http://sourceforge.net/p/web-erp/reponame/7212
Author: rchacon
Date: 2015-03-09 04:20:16 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
Modified Paths:
--------------
trunk/DailyBankTransactions.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/print.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
trunk/doc/Change.log
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/DailyBankTransactions.php 2015-03-09 04:20:16 UTC (rev 7212)
@@ -1,24 +1,14 @@
<?php
-/* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $ */
-/* This script allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen. */
+/* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $*/
+/* Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen. */
include('includes/session.inc');
-$Title = _('Daily Bank Transactions');// Screen identificator.
+$Title = _('Daily Bank Transactions');// Screen identification.
$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'DailyBankTransactions';// 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/bank.png" title="' .
- _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
- _('Bank Transactions Inquiry') . '</p>';// Page title.
if (!isset($_POST['Show'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- echo '<table class="selection">';
-
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
bankaccounts.currcode
@@ -33,6 +23,16 @@
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
$AccountsResults = DB_query($SQL,$ErrMsg,$DbgMsg);
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Bank Transactions Inquiry') . '</p>';// Page title.
+
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<table class="selection">';
echo '<tr>
<td>' . _('Bank Account') . ':</td>
<td><select name="BankAccount">';
@@ -68,11 +68,11 @@
</tr>
<tr>
<td>' . _('Show Transactions') . '</td>
- <td><select name="ShowType">
- <option value="All">' . _('All') . '</option>
- <option value="Unmatched">' . _('Unmatched') . '</option>
- <option value="Matched">' . _('Matched') . '</option>
- </select></td>
+ <td><select name="ShowType">
+ <option value="All">' . _('All') . '</option>
+ <option value="Unmatched">' . _('Unmatched') . '</option>
+ <option value="Matched">' . _('Matched') . '</option>
+ </select></td>
</tr>
</table>
<br />
@@ -91,7 +91,6 @@
WHERE bankaccounts.accountcode='" . $_POST['BankAccount'] . "'";
$BankResult = DB_query($SQL,_('Could not retrieve the bank account details'));
-
$sql="SELECT banktrans.currcode,
banktrans.amount,
banktrans.amountcleared,
@@ -112,28 +111,38 @@
WHERE bankact='".$_POST['BankAccount']."'
AND transdate>='" . FormatDateForSQL($_POST['FromTransDate']) . "'
AND transdate<='" . FormatDateForSQL($_POST['ToTransDate']) . "'
- ORDER BY banktrans.transdate";
+ ORDER BY banktrans.transdate ASC, banktrans.banktransid ASC";
$result = DB_query($sql);
+
if (DB_num_rows($result)==0) {
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('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');
} else {
$BankDetailRow = DB_fetch_array($BankResult);
+ echo '<div id="Report">';// Division to identify the report block.
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Account Transactions For').'<br />'.$BankDetailRow['bankaccountname'].'<br />'.
+ _('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</p>';// Page title.*/
echo '<table class="selection">
+ <thead>
<tr>
- <th colspan="10"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
+ <th>' . ('Date') . '</th>
+ <th class="text">' . _('Transaction type') . '</th>
+ <th class="number">' . _('Number') . '</th>
+ <th class="text">' . _('Type') . '</th>
+ <th class="text">' . _('Reference') . '</th>
+ <th class="number">' . _('Amount in').' '.$BankDetailRow['currcode'] . '</th>
+ <th class="number">' . _('Running Total').' '.$BankDetailRow['currcode'] . '</th>
+ <th class="number">' . _('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
+ <th class="number">' . _('Running Total').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
+ <th class="number">' . _('Cleared') . '</th>
</tr>
- <tr>
- <th>' . ('Date') . '</th>
- <th>' . _('Transaction type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Amount in').' '.$BankDetailRow['currcode'] . '</th>
- <th>' . _('Running Total').' '.$BankDetailRow['currcode'] . '</th>
- <th>' . _('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
- <th>' . _('Running Total').' '.$_SESSION['CompanyRecord']['currencydefault'] . '</th>
- <th>' . _('Cleared') . '</th>
- </tr>';
+ </thead><tbody>';
$AccountCurrTotal=0;
$LocalCurrTotal =0;
@@ -143,14 +152,14 @@
$AccountCurrTotal += $myrow['amount'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
- if ($myrow['amount']==$myrow['amountcleared']) {
- $Matched=_('Yes');
- } else {
- $Matched=_('No');
- }
+ if ($myrow['amount']==$myrow['amountcleared']) {
+ $Matched=_('Yes');
+ } else {
+ $Matched=_('No');
+ }
echo '<tr>
- <td>' . ConvertSQLDate($myrow['transdate']) . '</td>
+ <td class="centre">' . ConvertSQLDate($myrow['transdate']) . '</td>
<td>' . _($myrow['typename']) . '</td>
<td class="number"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['typeid'] . '&TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td>
<td>' . $myrow['banktranstype'] . '</td>
@@ -162,18 +171,25 @@
<td class="number">' . $Matched . '</td>
</tr>';
}
- echo '</table>';
+ echo '</tbody></table>';
+ echo '</div>';// div id="Report".
} //end if no bank trans in the range to show
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <br />
- <div class="centre">
- <input type="submit" name="Return" value="' . _('Select Another Date'). '" />
- </div>
- </div>
- </form>';
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <br />
+ <div class="centre noprint">'.
+ '<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 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.
+ '</div>
+ </form>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/aguapop/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -97,10 +97,16 @@
visibility: visible;
}
th.number {
+ background-color: skyblue;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: skyblue;
color: white;
+ font-weight: normal;
+ text-align: left;
}
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
@@ -481,12 +487,12 @@
#FooterTimeDiv{
float:right;
margin-top:15px;
-}
-#Report {
- /* Division id for reports. */}
-#Report table {
- /* Body of a report formatted with table tag. */
-}
+}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/default/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -81,10 +81,16 @@
visibility: visible;
}
th.number{
+ background-color:#B06161;
+ color:white;
+ font-weight:normal;
text-align:right;
- font-weight:normal;
+}
+th.text{
background-color:#B06161;
color:white;
+ font-weight:normal;
+ text-align:left;
}
td {
text-align:left;
@@ -457,4 +463,4 @@
.centre {
text-align:center;
/* centre class (general). */
-}
\ No newline at end of file
+}
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/fluid/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -52,11 +52,17 @@
text-align:center;
}
th.number{
- font-weight:normal;
background-color:#cccce5;
color:#330000;
+ font-weight:normal;
text-align:right;
}
+th.text{
+ background-color:#cccce5;
+ color:#330000;
+ font-weight:normal;
+ text-align:left;
+}
th.ascending {
cursor: s-resize;
}
@@ -92,6 +98,9 @@
td.number{
text-align:right;
}
+td.text{
+ text-align:left;
+}
.centre{ /* used */
margin:0 auto;
text-align:center;
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/fresh/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -71,10 +71,16 @@
text-align: center;
}
th.number {
+ background-color: #800000;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #800000;
color: white;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/gel/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -70,10 +70,16 @@
text-align: center;
}
th.number {
+ background-color: #ccc;
+ color: #330000;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #ccc;
color: #330000;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
Modified: trunk/css/print.css
===================================================================
--- trunk/css/print.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/print.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -60,6 +60,11 @@
/* number class (general). */
}
+.text {
+ text-align:left;
+ /* number class (general). */
+}
+
.page_title_text {
font-weight:bold;
font-size: 207%;
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/professional/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -121,11 +121,17 @@
visibility: visible;
}
th.number {
- font-weight: normal;
background-color: #cccce5;
color: #330000;
+ font-weight: normal;
text-align: right;
}
+th.text {
+ background-color: #cccce5;
+ color: #330000;
+ font-weight: normal;
+ text-align: left;
+}
div.error {
background-color:#fddbdb;
color: red;
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/professional-rtl/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -100,12 +100,19 @@
text-align: center;
}
th.number {
- font-weight: normal;
- font-size: 10px;
background-color: #cccce5;
color: #330000;
+ font-size: 10px;
+ font-weight: normal;
text-align: right;
}
+th.text {
+ background-color: #cccce5;
+ color: #330000;
+ font-size: 10px;
+ font-weight: normal;
+ text-align: left;
+}
th.ascending {
cursor: s-resize;
}
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/silverwolf/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -70,13 +70,21 @@
vertical-align:middle;
}
th.number{
- font-weight:normal;
background-color:#cccce5;
+ color:#300;
font-size:100%;
- color:#300;
+ font-weight:normal;
text-align:right;
vertical-align:middle;
}
+th.text{
+ background-color:#cccce5;
+ color:#300;
+ font-size:100%;
+ font-weight:normal;
+ text-align:left;
+ vertical-align:middle;
+}
th.ascending {
cursor: s-resize;
}
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/wood/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -81,10 +81,16 @@
text-align: center;
}
th.number {
+ background-color: #800000;
+ color: white;
+ font-weight: normal;
text-align: right;
- font-weight: normal;
+}
+th.text {
background-color: #800000;
color: white;
+ font-weight: normal;
+ text-align: left;
}
th.ascending {
cursor: s-resize;
@@ -571,15 +577,15 @@
#FooterTimeDiv{
float:right;
margin-top:17px;
-}
-#Report {
- /* Division id for reports. */}
-#Report table {
- /* Body of a report formatted with table tag. */
-}
-.centre {
- text-align:center;
- /* centre class (general). */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
+.centre {
+ text-align:center;
+ /* centre class (general). */
+}
/* END */
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/css/xenos/default.css 2015-03-09 04:20:16 UTC (rev 7212)
@@ -75,10 +75,16 @@
border-bottom:thin solid #B3B3B3;
}
th.number {
+ background-color:#800000;
+ color:white;
+ font-weight:normal;
text-align:right;
- font-weight:normal;
+}
+th.text {
background-color:#800000;
color:white;
+ font-weight:normal;
+ text-align:left;
}
th.ascending {
cursor:s-resize;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-09 02:32:27 UTC (rev 7211)
+++ trunk/doc/Change.log 2015-03-09 04:20:16 UTC (rev 7212)
@@ -1,5 +1,6 @@
webERP Change Log
+09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
08/03/15 Vitaly: Fit HTML view of invoices to one screen
08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
|
|
From: <ex...@us...> - 2015-03-09 02:32:29
|
Revision: 7211
http://sourceforge.net/p/web-erp/reponame/7211
Author: exsonqu
Date: 2015-03-09 02:32:27 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-09 02:30:52 UTC (rev 7210)
+++ trunk/doc/Change.log 2015-03-09 02:32:27 UTC (rev 7211)
@@ -1,5 +1,6 @@
webERP Change Log
+09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
08/03/15 Vitaly: Fit HTML view of invoices to one screen
08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
|
|
From: <ex...@us...> - 2015-03-09 02:30:59
|
Revision: 7210
http://sourceforge.net/p/web-erp/reponame/7210
Author: exsonqu
Date: 2015-03-09 02:30:52 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2015-03-08 22:44:47 UTC (rev 7209)
+++ trunk/PO_Header.php 2015-03-09 02:30:52 UTC (rev 7210)
@@ -195,7 +195,7 @@
* ensure session variables updated then meta refresh to PO_Items.php*/
$_SESSION['PO' . $identifier]->Location = $_POST['StkLocation'];
- $_SESSION['PO' . $identifier]->SupplierContact = $_POST['SupplierContact'];
+ $_SESSION['PO' . $identifier]->SupplierContact = isset($_POST['SupplierContact'])?$_POST['SupplierContact']:'';
$_SESSION['PO' . $identifier]->DelAdd1 = $_POST['DelAdd1'];
$_SESSION['PO' . $identifier]->DelAdd2 = $_POST['DelAdd2'];
$_SESSION['PO' . $identifier]->DelAdd3 = $_POST['DelAdd3'];
|
|
From: <vv...@us...> - 2015-03-08 22:44:55
|
Revision: 7209
http://sourceforge.net/p/web-erp/reponame/7209
Author: vvs2012
Date: 2015-03-08 22:44:47 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
Fit HTML view of invoices to one screen
Modified Paths:
--------------
trunk/PrintCustTrans.php
trunk/doc/Change.log
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2015-03-08 04:45:50 UTC (rev 7208)
+++ trunk/PrintCustTrans.php 2015-03-08 22:44:47 UTC (rev 7209)
@@ -566,8 +566,10 @@
echo '<tr><td>' . _('End invoice/credit note number to print') . '</td>
<td><input type="text" class="number" maxlength="6" size="7" name="ToTransNo" /></td></tr>
</table>';
- echo '<div class="centre"><input type="submit" name="Print" value="' . _('Print') . '" /><br />';
- echo '<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
+ echo '<div class="centre">';
+ echo '<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /><br /><br /></div>';
+ echo '</div>
+ </form>';
$sql = "SELECT typeno FROM systypes WHERE typeid=10";
@@ -584,8 +586,6 @@
echo '<br /><b>' . _('The last credit note created was number') . ' ' . $myrow[0] . '</b>
<br />' . _('A sequential range can be printed using the same method as for invoices above') . '. ' . _('A single credit note can be printed by only entering a start transaction number') .
'</div>';
- echo '</div>
- </form>';
} else {
@@ -721,106 +721,90 @@
$ExchRate = $myrow['rate'];
$PageNumber = 1;
- echo '<table class="table1">
- <tr><td valign="top" style="width:10%"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
- <td style="background-color:#BBBBBB">';
+ /* Now print out the logo and company name and address */
+ echo '<table style="width:100%">';
+ /* Now the customer charged to details in a sub table within a cell of the main table*/
+ echo '<tr><td><b>' . _('Charge To') . ':</b>';
+ echo '<br />' . $myrow['name'] .
+ '<br />' . $myrow['address1'] .
+ '<br />' . $myrow['address2'] .
+ '<br />' . $myrow['address3'] .
+ '<br />' . $myrow['address4'] .
+ '<br />' . $myrow['address5'] .
+ '<br />' . $myrow['address6'];
+ echo '</td>';
+
+ echo '<td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
+ echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
+ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
+ echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
+ echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
+ echo '</td>';
+
+ echo '<td align="right">';
+ if ($InvOrCredit=='Invoice') {
+ echo '<h2>' . _('TAX INVOICE') . '</h2>';
+ } else {
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . '</h2>';
+ }
+ echo '<br />' . _('Number') . ' ' . $FromTransNo . '<br />' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ </tr>';
- if ($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') . ' ';
- } else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
- }
- echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
- </tr>
- </table>';
+ echo '<tr><td align="left"><b>' . _('Charge Branch') . ':</b>';
+ echo '<br />' . $myrow['brname'] .
+ '<br />' . $myrow['braddress1'] .
+ '<br />' . $myrow['braddress2'] .
+ '<br />' . $myrow['braddress3'] .
+ '<br />' . $myrow['braddress4'] .
+ '<br />' . $myrow['braddress5'] .
+ '<br />' . $myrow['braddress6'] . '</td>';
- /* Now print out the logo and company name and address */
- echo '<table class="table1">
- <tr><td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
- echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
- echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
- echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
- echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
+ if ($InvOrCredit=='Invoice') {
+ echo '<td align="left"><b>' . _('Delivered To') . ':</b>';
+ echo '<br />' . $myrow['deliverto'] .
+ '<br />' . $myrow['deladd1'] .
+ '<br />' . $myrow['deladd2'] .
+ '<br />' . $myrow['deladd3'] .
+ '<br />' . $myrow['deladd4'] .
+ '<br />' . $myrow['deladd5'] .
+ '<br />' . $myrow['deladd6'] . '</td>';
+ }
+ else {
+ echo '<td></td>';
+ }
- echo '</td><td style="width:50%" class="number">';
-
- /* Now the customer charged to details in a sub table within a cell of the main table*/
-
- echo '<table class="table1">
- <tr>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Charge To') . ':</b></td>
- </tr>
- <tr>
- <td style="background-color:#EEEEEE">';
- echo $myrow['name'] .
- '<br />' . $myrow['address1'] .
- '<br />' . $myrow['address2'] .
- '<br />' . $myrow['address3'] .
- '<br />' . $myrow['address4'] .
- '<br />' . $myrow['address5'] .
- '<br />' . $myrow['address6'];
+ echo '<td align="right">';
+ echo '<br /><b>' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</b>';
echo '</td>
</tr>
- </table>';
- /*end of the small table showing charge to account details */
- echo _('Page') . ': ' . $PageNumber;
- echo '</td>
- </tr>
- </table>';
+ </table>';
/*end of the main table showing the company name and charge to details */
if ($InvOrCredit=='Invoice') {
- echo '<table class="table1">
- <tr>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Charge Branch') . ':</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Delivered To') . ':</b></td>
- </tr>';
- echo '<tr>
- <td style="background-color:#EEEEEE">' .$myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] . '</td>';
-
- echo '<td style="background-color:#EEEEEE">' . $myrow['deliverto'] .
- '<br />' . $myrow['deladd1'] .
- '<br />' . $myrow['deladd2'] .
- '<br />' . $myrow['deladd3'] .
- '<br />' . $myrow['deladd4'] .
- '<br />' . $myrow['deladd5'] .
- '<br />' . $myrow['deladd6'] . '</td>
- </tr>
- </table>
- <hr />';
-
- echo '<table class="table1">
- <tr>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Your Order Ref') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Our Order No') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Order Date') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Invoice Date') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Shipper') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Consignment Ref') . '</b></td>
+ echo '<table style="width:100%"><tr>
+ <th><b>' . _('Your Order Ref') . '</b></th>
+ <th><b>' . _('Our Order No') . '</b></th>
+ <th><b>' . _('Order Date') . '</b></th>
+ <th><b>' . _('Invoice Date') . '</b></th>
+ <th><b>' . _('Sales Person') . '</b></th>
+ <th><b>' . _('Shipper') . '</b></th>
+ <th><b>' . _('Consignment Ref') . '</b></th>
</tr>';
echo '<tr>
- <td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
- <td style="background-color:#EEEEEE">' .$myrow['orderno'] . '</td>
- <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
- <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
- <td style="background-color:#EEEEEE">' . $myrow['shippername'] . '</td>
- <td style="background-color:#EEEEEE">' . $myrow['consignment'] . '</td>
- </tr>
- </table>';
+ <td>' . $myrow['customerref'] . '</td>
+ <td>' .$myrow['orderno'] . '</td>
+ <td>' . ConvertSQLDate($myrow['orddate']) . '</td>
+ <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td>' . $myrow['salesmanname'] . '</td>
+ <td>' . $myrow['shippername'] . '</td>
+ <td>' . $myrow['consignment'] . '</td>
+ </tr></table>';
$sql ="SELECT stockmoves.stockid,
stockmaster.description,
@@ -840,25 +824,13 @@
} else { /* then its a credit note */
- echo '<table width="50%"><tr>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
- </tr>';
- echo '<tr>
- <td style="background-color:#EEEEEE">' .$myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] . '</td>
- </tr></table>';
- echo '<hr /><table class="table1"><tr>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Date') . '</b></td>
- <td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
+ echo '<table><tr>
+ <td><b>' . _('Date') . '</b></td>
+ <td><b>' . _('Sales Person') . '</b></td>
</tr>';
echo '<tr>
- <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
+ <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td>' . $myrow['salesmanname'] . '</td>
</tr></table>';
$sql ="SELECT stockmoves.stockid,
@@ -877,9 +849,6 @@
AND stockmoves.show_on_inv_crds=1";
}
- echo '<hr />';
- echo '<div class="centre"><h4>' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</h4></div>';
-
$result=DB_query($sql);
if (DB_error_no()!=0) {
echo '<br />' . _('There was a problem retrieving the invoice or credit note stock movement details for invoice number') . ' ' . $FromTransNo . ' ' . _('from the database');
@@ -890,7 +859,7 @@
}
if (DB_num_rows($result)>0){
- echo '<table class="table1">
+ echo '<table style="width:100%">
<tr><th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
<th>' . _('Quantity') . '</th>
@@ -942,115 +911,17 @@
$DisplayNet);
if (mb_strlen($myrow2['narrative'])>1){
- echo $RowStarter . '<td></td><td colspan="6">' . $myrow2['narrative'] . '</td></tr>';
+ $narrative = str_replace(array("\r\n", "\n", "\r", "\\r\\n"), '<br />', $myrow2['narrative']);
+ echo $RowStarter . '<td></td><td colspan="6">' . $narrative . '</td></tr>';
$LineCounter++;
}
$LineCounter++;
- if ($LineCounter == ($_SESSION['PageLength'] - 2)){
-
- /* head up a new invoice/credit note page */
-
- $PageNumber++;
- echo '</table>
- <table class="table1">
- <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
- <td style="background-color:#BBBBBB">';
-
- if ($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') . ' ';
- } else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
- }
- echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr></table>';
-
- /*Now print out company name and address */
- echo '<table class="table1"><tr>
- <td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
- echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
- echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
- echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
- echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td></tr></table>';
- echo '<table class="table1">
- <tr>
- <th>' . _('Item Code') . '</th>
- <th>' . _('Item Description') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Unit') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('Net') . '</th>
- </tr>';
-
- $LineCounter = 10;
-
- } //end if need a new page headed up
} //end while there are line items to print out
echo '</table>';
} /*end if there are stock movements to show on the invoice or credit note*/
- /* check to see enough space left to print the totals/footer */
- $LinesRequiredForText = floor(mb_strlen($myrow['invtext'])/140);
-
- if ($LineCounter >= ($_SESSION['PageLength'] - 8 - $LinesRequiredForText)){
-
- /* head up a new invoice/credit note page */
- $PageNumber++;
- echo '<table class="table1">
- <tr><td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
- <td style="background-color:#BBBBBB">';
-
- if ($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') .' ';
- } else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
- }
- echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td></tr><table>';
-
- /* Print out the logo and company name and address */
- echo '<table class="table1">
- <tr><td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
- echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
- echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
- echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
- echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td></tr></table>';
- echo '<table class="table1">
- <tr>
- <th>' . _('Item Code') . '</th>
- <th>' . _('Item Description') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Unit') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('Net') . '</th>
- </tr>';
-
- $LineCounter = 10;
- }
-
- /* Space out the footer to the bottom of the page */
-
- echo '<br /><br />' . $myrow['invtext'];
-
- $LineCounter=$LineCounter+2+$LinesRequiredForText;
- while ($LineCounter < ($_SESSION['PageLength'] -6)){
- echo '<br />';
- $LineCounter++;
- }
-
/* Now print out the footer and totals */
if ($InvOrCredit=='Invoice') {
@@ -1067,25 +938,17 @@
}
/*Print out the invoice text entered */
- echo '<table class="table1"><tr>
- <td class="number">' . _('Sub Total') . '</td>
- <td class="number" style="background-color:#EEEEEE;width:15%">' . $DisplaySubTot . '</td></tr>';
- echo '<tr><td class="number">' . _('Freight') . '</td>
- <td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
- echo '<tr><td class="number">' . _('Tax') . '</td>
- <td class="number" style="background-color:#EEEEEE">' . $DisplayTax . '</td></tr>';
+ echo '<table style="width:100%"><tr>
+ <td style="width:80%">' . $myrow['invtext'] . '</td>
+ <td class="number">' . _('Sub Total') . ' ' . $DisplaySubTot . '<br />';
+ echo _('Freight') . ' ' . $DisplayFreight . '<br />';
+ echo _('Tax') . ' ' . $DisplayTax . '<br />';
if ($InvOrCredit=='Invoice'){
- echo '<tr>
- <td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td>
- </tr>';
+ echo '<b>' . _('TOTAL INVOICE') . ' ' . $DisplayTotal . '</b>';
} else {
- echo '<tr>
- <td class="number" style="color:red"><b>' . _('TOTAL CREDIT') . '</b></td>
- <td class="number" style="background-color:#EEEEEE;color:red"><b>' . $DisplayTotal . '</b></td>
- </tr>';
+ echo '<b>' . _('TOTAL CREDIT') . ' ' . $DisplayTotal . '</b>';
}
- echo '</table>';
+ echo '</td></tr></table>';
} /* end of check to see that there was an invoice record to print */
$FromTransNo++;
} /* end loop to print invoices */
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-08 04:45:50 UTC (rev 7208)
+++ trunk/doc/Change.log 2015-03-08 22:44:47 UTC (rev 7209)
@@ -1,5 +1,6 @@
webERP Change Log
+08/03/15 Vitaly: Fit HTML view of invoices to one screen
08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
@@ -10,8 +11,8 @@
07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
-3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
-3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
+04/03/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
+04/03/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.
25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth.
|
|
From: <ex...@us...> - 2015-03-08 04:45:53
|
Revision: 7208
http://sourceforge.net/p/web-erp/reponame/7208
Author: exsonqu
Date: 2015-03-08 04:45:50 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-08 04:43:26 UTC (rev 7207)
+++ trunk/doc/Change.log 2015-03-08 04:45:50 UTC (rev 7208)
@@ -1,5 +1,6 @@
webERP Change Log
+08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
|
|
From: <ex...@us...> - 2015-03-08 04:43:31
|
Revision: 7207
http://sourceforge.net/p/web-erp/reponame/7207
Author: exsonqu
Date: 2015-03-08 04:43:26 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
Modified Paths:
--------------
trunk/PO_Items.php
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2015-03-07 17:44:35 UTC (rev 7206)
+++ trunk/PO_Items.php 2015-03-08 04:43:26 UTC (rev 7207)
@@ -1023,7 +1023,7 @@
ORDER BY stockmaster.stockid ";
}
} else { // for a specific stock category
- if ($_POST['SupplierItemsOnly']=='on'){
+ if (isset($_POST['SupplierItemsOnly']) AND $_POST['SupplierItemsOnly']=='on'){
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units
@@ -1059,6 +1059,8 @@
$SQLCount = substr($sql,strpos($sql, "FROM"));
$SQLCount = substr($SQLCount,0, strpos($SQLCount, "ORDER"));
$SQLCount = 'SELECT COUNT(*) '.$SQLCount;
+ $ErrMsg = _('Failed to retrieve result count');
+ $DbgMsg = _('The SQL failed is ');
$SearchResult = DB_query($SQLCount,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_array($SearchResult);
DB_free_result($SearchResult);
|
|
From: <rc...@us...> - 2015-03-07 17:44:44
|
Revision: 7206
http://sourceforge.net/p/web-erp/reponame/7206
Author: rchacon
Date: 2015-03-07 17:44:35 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
Modified Paths:
--------------
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/print.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
trunk/doc/Change.log
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/GLBalanceSheet.php 2015-03-07 17:44:35 UTC (rev 7206)
@@ -29,7 +29,7 @@
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';// div class=?
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">
<tr>
@@ -76,7 +76,8 @@
<div class="centre">
<input type="submit" name="PrintPDF" value="'._('Produce PDF Report').'" />
</div>';
- echo '</div></form>';
+ echo '</div>';// div class=?
+ echo '</form>';
/*Now do the posting while the user is thinking about the period to select */
include ('includes/GLPostings.inc');
@@ -340,7 +341,7 @@
} else {
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';// div class=?
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="BalancePeriodEnd" value="' . $_POST['BalancePeriodEnd'] . '" />';
@@ -390,6 +391,7 @@
// Page title as IAS1 numerals 10 and 51:
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo '<div id="Report">';// Division to identify the report block.
echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" title="' .// Icon image.
_('Statement of Financial Position') . '" /> ' .// Icon title.
@@ -399,8 +401,7 @@
_('as at') . ' ' . $BalanceDate . '<br />' .// Page title, reporting period.
_('All amounts stated in').': '. _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]).'</p>';// Page title, reporting presentation currency and level of rounding used.
- echo '<div class="invoice">
- <table class="selection" width="100%">';
+ echo '<table class="selection">';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
@@ -706,18 +707,19 @@
</tr>';
/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
- echo '</div>';
+ echo '</div>';// div id="Report".
echo '<br />
<div class="centre noprint">'.
'<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 Balance Date') . '</button>'.// "Select A Different Period" button.
- '<button formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
'</div>';
- echo '</div></form>';
+ echo '</div>';// div class=?
+ echo '</form>';
}
include('includes/footer.inc');
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/GLProfit_Loss.php 2015-03-07 17:44:35 UTC (rev 7206)
@@ -33,7 +33,7 @@
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';// div class=?
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (Date('m') > $_SESSION['YearEnd']){
@@ -564,7 +564,7 @@
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<div>';// div class=?
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<input type="hidden" name="FromPeriod" value="' . $_POST['FromPeriod'] . '" />
<input type="hidden" name="ToPeriod" value="' . $_POST['ToPeriod'] . '" />';
@@ -612,6 +612,7 @@
// Page title as IAS1 numerals 10 and 51:
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo '<div id="Report">';// Division to identify the report block.
echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" title="' .// Icon image.
_('Statement of Comprehensive Income') . '" /> ' .// Icon title.
@@ -619,13 +620,13 @@
// _('Statement of Comprehensive Income') . '<br />' .// Page title, reporting statement.
stripslashes($_SESSION['CompanyRecord']['coyname']) . '<br />' .// Page title, reporting entity.
_('For') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' ' . $PeriodToDate . '<br />' .// Page title, reporting period.
-// _('From') . ' ' . $PeriodFromDate? . ' ' . _('to') . ' ' . $PeriodToDate . '<br />' .// Page title, reporting period. ??????????
+// _('From') . ' ' . $PeriodFromDate? . ' ' . _('to') . ' ' . $PeriodToDate . '<br />' .// Page title, reporting period. ???
_('All amounts stated in').': '. _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]).'</p>';// Page title, reporting presentation currency and level of rounding used.
/*show a table of the accounts info returned by the SQL
Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */
- echo '<table class="selection" width="100%">';
+ echo '<table class="selection">';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
@@ -1303,17 +1304,18 @@
</tr>';
/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
+ echo '</div>';// div id="Report".
echo '<br />
<div class="centre noprint">'.
'<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
'</div>';
}
-echo '</div>';
+echo '</div>';// div class=?
echo '</form>';
include('includes/footer.inc');
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/aguapop/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -481,7 +481,12 @@
#FooterTimeDiv{
float:right;
margin-top:15px;
-}
+}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/default/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -275,7 +275,7 @@
/*** CANVAS ***/
#CanvasDiv{
- background:#588BB6;
+ background:#588BB6;
}
/*** HEADER ***/
@@ -344,11 +344,11 @@
white-space:nowrap;
}
#MainMenuDiv ul{
- margin:0;
+ margin:0;
padding:0;
}
#MainMenuDiv li{
- list-style:none;
+ list-style:none;
}
#MainMenuDiv li a{
@@ -449,7 +449,12 @@
float:right;
margin-top:15px;
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
-}
+}
\ No newline at end of file
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/fluid/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id: default.css 7166 2015-02-21 21:18:59Z Joshua $*/
-/*
+/*
"Fluid Tabs" theme for webERP
by Hindra Joshua
@@ -390,6 +390,11 @@
}
#FooterVersionDiv{}
#FooterTimeDiv{}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/fresh/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id$*/
-/***
+/***
New "Fresh" Theme for WebERP
@@ -10,10 +10,10 @@
Based from the previous theme "SilverWolf"
Credits to the original authors.
-NOTE:
+NOTE:
This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
but for the obvious one it will be cleaned up.
-To optimized the rest we should examined the whole codes! That would be for
+To optimized the rest we should examined the whole codes! That would be for
the next project. :)
***/
@@ -330,14 +330,14 @@
display:inline; /* items are inline */
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
background:#B4BB86;
border:thin outset #5A5F00;
color:#5A5F00;
- padding:8px;
+ padding:8px;
}
#QuickMenuDiv li a:hover{
background:#B4BB86;
@@ -377,7 +377,7 @@
#MainMenuDiv{
float:left; /* REQUIRED: to the left side */
white-space:nowrap; /* don't break text */
- text-align:center;
+ text-align:center;
width:11%;
background:#617C4F;
}
@@ -400,12 +400,12 @@
text-decoration:none;
padding:3px;
border:thin inset #617C4F;
- background:#5A5F00;
+ background:#5A5F00;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
- border:thin inset #5A5F00;
+ border:thin inset #5A5F00;
background:#5A5F00;
- color:white;
+ color:white;
}
/*** BODY - SUB MENU ***/
@@ -435,7 +435,7 @@
#SubMenuDiv li{
/*list-style:none;*/ /* REQUIRED: hide the bullets */
padding:2px;
- background:#E0F3B1;
+ background:#E0F3B1;
}
#SubMenuDiv li img{
vertical-align:middle; /* verticall align icon with the text */
@@ -468,7 +468,7 @@
/* float:left;*/
/* width:32.5%;
border:thin solid black;*/
-
+
}
.menu_group_item p {
color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
@@ -480,14 +480,14 @@
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
+ overflow:hidden;
background:#C9D392;
}
#FooterWrapDiv{
overflow:hidden;
padding:3px;
}
-#FooterLogoDiv{
+#FooterLogoDiv{
float:right; /* right side */
background:white;
border-radius:8px;
@@ -503,6 +503,11 @@
#FooterTimeDiv{
clear:left; /* below */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/gel/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id$*/
-/***
+/***
New "Gel" Theme for WebERP
@@ -8,10 +8,10 @@
Based from the previous theme "Gel"
Credits to the original authors.
-NOTE:
+NOTE:
This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
but for the obvious one it will be cleaned up.
-To optimized the rest we should examined the whole codes! That would be for
+To optimized the rest we should examined the whole codes! That would be for
the next project. :)
***/
@@ -168,11 +168,11 @@
div.error { /*** is this used??? ***/
background-color:red;
color: white;
- font-style: italic;
+ font-style: italic;
font-weight:bold;
border: 3px solid red;
}
-div.warn {
+div.warn {
background-color:#fa0;
color: black;
border: 1px solid black;
@@ -358,9 +358,9 @@
display:inline; /* items are inline */
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
padding:5px; /* links as button */
border:2px outset transparent; /* un-pressed state */
@@ -373,7 +373,7 @@
border:2px inset steelblue; /* pressed state */
text-decoration:none; /* no underline */
color:whie;
- border-radius:15px;
+ border-radius:15px;
}
/*** BODY ***/
@@ -400,7 +400,7 @@
#MainMenuDiv{
float:left; /* REQUIRED: to the left side */
white-space:nowrap; /* don't break text */
- text-align:center;
+ text-align:center;
width:11%;
background:url(images/gelbluev.png) repeat-y blue;
background-size:contain;
@@ -408,7 +408,7 @@
border-radius:20px;
margin-top:5px;
padding:3px;
-
+
}
#MainMenuDiv ul{
list-style:none; /* REQUIRED: hide bullets */
@@ -431,14 +431,14 @@
text-decoration:none;
padding:3px;
border:2px inset steelblue;
- background:none;
+ background:none;
border-radius:15px;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
text-decoration:none;
padding:3px;
border:2px inset steelblue;
- background:none;
+ background:none;
border-radius:15px;
}
@@ -455,7 +455,7 @@
#SubMenuDiv ul{
list-style-type:none; /* REQUIRED: hide bullets */
padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
- margin:0;
+ margin:0;
border:thin solid black;
margin-left:3px;
}
@@ -495,10 +495,10 @@
background:#bfd8ff;
}
#TransactionsDiv{
- display:table-cell;
+ display:table-cell;
}
#InquiriesDiv{
- display:table-cell;
+ display:table-cell;
}
#InquiriesDiv div{ /* default div, used for custom report header */
background:#dddddd;
@@ -507,14 +507,14 @@
/* border:thin outset silver;*/
}
#MaintenanceDiv{
- display:table-cell;
+ display:table-cell;
}
/*** FOOTER ***/
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
+ overflow:hidden;
color:gray;
background:url(images/bar.png) repeat-x lightgray;
border:thin solid lightgray;
@@ -540,6 +540,11 @@
line-height:2.8em; /* Center the text vertically.
[vertical-align has no effect on text alone] */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/print.css
===================================================================
--- trunk/css/print.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/print.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -100,4 +100,11 @@
padding:0;
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ width:100%;
+ /* Expands the body of the report to use the full width of the page. */
}
+
+}
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/professional/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id$*/
-/***
+/***
New "Professional" Theme for WebERP
@@ -10,10 +10,10 @@
Based from the previous theme "SilverWolf"
Credits to the original authors.
-NOTE:
+NOTE:
This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
but for the obvious one it will be cleaned up.
-To optimized the rest we should examined the whole codes! That would be for
+To optimized the rest we should examined the whole codes! That would be for
the next project. :)
***/
@@ -150,7 +150,7 @@
/* input as button or text */
/* NOTE: input for button should have different class, one for 'normal' and one for 'input button inside a table,
-which should have the same width as the column where it is located
+which should have the same width as the column where it is located
e.g.: class input_button, input_column_button, input_text */
input {
}
@@ -374,9 +374,9 @@
display:inline; /* items are inline */
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
padding:3px; /* links as button */
border:thin outset #ddd; /* un-pressed state */
@@ -418,7 +418,7 @@
#MainMenuDiv{
float:left; /* REQUIRED: to the left side */
white-space:nowrap; /* don't break text */
- text-align:center;
+ text-align:center;
width:11%;
background:#ddd;
}
@@ -441,12 +441,12 @@
text-decoration:none;
padding:3px;
border:thin inset #ddd;
- background:#ddd;
+ background:#ddd;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
- border:thin inset #ccc;
+ border:thin inset #ccc;
background:#ccc;
- color:blue;
+ color:blue;
text-decoration:none;
}
@@ -460,7 +460,7 @@
#SubMenuDiv ul{
list-style-type:none; /* REQUIRED: hide bullets */
padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
- margin-top:0px;
+ margin-top:0px;
margin-left:3px;
border:thin outset #ddd;
}
@@ -500,7 +500,7 @@
/* float:left;*/
/* width:32.5%;
border:thin solid black;*/
-
+
}
.menu_group_item p {
color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
@@ -512,14 +512,14 @@
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
+ overflow:hidden;
color:gray;
}
#FooterWrapDiv{
overflow:hidden;
padding:3px;
}
-#FooterLogoDiv{
+#FooterLogoDiv{
float:right; /* right side */
}
#FooterVersionDiv{
@@ -528,6 +528,11 @@
#FooterTimeDiv{
clear:left; /* below */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/professional-rtl/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id$*/
-/***
+/***
New "Professional RTL" Theme for WebERP
For Right-To-Left Languages
@@ -11,10 +11,10 @@
Based from the previous theme "SilverWolf"
Credits to the original authors.
-NOTE:
+NOTE:
This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
but for the obvious one it will be cleaned up.
-To optimized the rest we should examined the whole codes! That would be for
+To optimized the rest we should examined the whole codes! That would be for
the next project. :)
***/
@@ -155,7 +155,7 @@
/* input as button or text */
/* NOTE: input for button should have different class, one for 'normal' and one for 'input button inside a table,
-which should have the same width as the column where it is located
+which should have the same width as the column where it is located
e.g.: class input_button, input_column_button, input_text */
input {
font-family: Arial, Verdana, Helvetica;
@@ -394,9 +394,9 @@
float:right; /* right to left */
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
padding:3px; /* links as button */
border:thin outset #ddd; /* un-pressed state */
@@ -438,7 +438,7 @@
#MainMenuDiv{
float:right; /* REQUIRED: to the RIGHT side */
white-space:nowrap; /* don't break text */
- text-align:center;
+ text-align:center;
width:11%;
background:#ddd;
}
@@ -461,12 +461,12 @@
text-decoration:none;
padding:3px;
border:thin inset #ddd;
- background:#ddd;
+ background:#ddd;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
- border:thin inset #ccc;
+ border:thin inset #ccc;
background:#ccc;
- color:blue;
+ color:blue;
text-decoration:none;
}
@@ -480,7 +480,7 @@
#SubMenuDiv ul{
list-style-type:none; /* REQUIRED: hide bullets */
padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
- margin-top:0px;
+ margin-top:0px;
margin-left:3px;
border:thin outset #ddd;
}
@@ -520,7 +520,7 @@
/* float:left;*/
/* width:32.5%;
border:thin solid black;*/
-
+
}
.menu_group_item p {
color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
@@ -532,14 +532,14 @@
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
+ overflow:hidden;
color:gray;
}
#FooterWrapDiv{
overflow:hidden;
padding:3px;
}
-#FooterLogoDiv{
+#FooterLogoDiv{
float:left; /* right side */
}
#FooterVersionDiv{
@@ -548,6 +548,11 @@
#FooterTimeDiv{
clear:right; /* below */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/silverwolf/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,5 +1,5 @@
/* $Id$*/
-/***
+/***
New "SilverWolf" Theme for WebERP
@@ -11,7 +11,7 @@
NOTE:
This CSS is not yet optimized. Some styles maybe 'redundant' or 'unused',
but for the obvious one it will be cleaned up.
-To optimized the rest we should examined the whole codes! That would be for
+To optimized the rest we should examined the whole codes! That would be for
the next project. :)
***/
@@ -363,9 +363,9 @@
display:inline; /* items are inline */
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
padding:9px; /* links as button */
border:thin outset lightgray; /* un-pressed state */
@@ -394,7 +394,7 @@
#MainMenuDiv{
float:left; /* REQUIRED:to the left side */
white-space:nowrap; /* don't break text */
- text-align:center;
+ text-align:center;
width:12%;
margin-top:3px;
}
@@ -501,6 +501,11 @@
line-height:2.8em; /* Center the text vertically.
[vertical-align has no effect on text alone] */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/wood/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -571,10 +571,15 @@
#FooterTimeDiv{
float:right;
margin-top:17px;
+}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
+.centre {
+ text-align:center;
+ /* centre class (general). */
}
-.centre {
- text-align:center;
- /* centre class (general). */
-}
/* END */
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/css/xenos/default.css 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,12 +1,12 @@
/* $Id: default.css 7166 2015-02-21 21:18:59Z Khwunchai $*/
-/***
+/***
Xenos Theme
by Khwunchai J.
Xenos is a very clean and classy looking theme design for WebERP.
-NOTE:
+NOTE:
This CSS is not yet fully optimized. Some styles maybe redundant and not supported by some browser.
***/
@@ -56,7 +56,7 @@
width:100%;
/*border-collapse: collapse;*/
border:thin outset #B3B3B3;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -173,7 +173,7 @@
input[type='text'], input[type='tel'], input[type='password'], input[type='email'] {
border:thin solid #C3C3C3;
padding:4px 8px;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -184,7 +184,7 @@
input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus {
outline:none;
border-color:#2380CD;
-
+
-moz-box-shadow: 0px 0px 5px #55B1EA;
-webkit-box-shadow: 0px 0px 5px #55B1EA;
box-shadow: 0px 0px 5px #55B1EA;
@@ -197,7 +197,7 @@
font-weight:bold;
color:#FFFFFF;
cursor: pointer;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -211,7 +211,7 @@
textarea{
border:thin solid #C3C3C3;
padding:4px 8px;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -411,9 +411,9 @@
height:38px;
}
-/*** links as buttons!!! clicking anywhere in the button will activate
+/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
-
+
#QuickMenuDiv li a{
color:white;
font-weight:bold;
@@ -455,7 +455,7 @@
width:auto; /* automatic width */
margin:0 auto;
margin-bottom:10px;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -469,7 +469,7 @@
background-color:white;
border:thin outset #D2D2D2;
padding:5px;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -491,7 +491,7 @@
width:14%;
border:thin inset #5D5D5D;
background:#686868;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -528,7 +528,7 @@
border-bottom:thin solid #444444;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
- /*border:thin inset #191919;*/
+ /*border:thin inset #191919;*/
background:#2A2A2A;
border-bottom:thin solid #191919;
}
@@ -545,7 +545,7 @@
border:thin outset #D2D2D2;
background-color:white; /* for custom reports */
min-height:400px;
-
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -609,7 +609,7 @@
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
+ overflow:hidden;
color:#999999;
width: 98.6%;
margin: auto;
@@ -622,7 +622,7 @@
overflow:hidden;
padding:3px;
}
-#FooterLogoDiv{
+#FooterLogoDiv{
float:right; /* right side */
padding:2px;
}
@@ -636,6 +636,11 @@
#FooterTimeDiv{
clear:left; /* below */
}
+#Report {
+ /* Division id for reports. */}
+#Report table {
+ /* Body of a report formatted with table tag. */
+}
.centre {
text-align:center;
/* centre class (general). */
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 16:13:57 UTC (rev 7205)
+++ trunk/doc/Change.log 2015-03-07 17:44:35 UTC (rev 7206)
@@ -1,4 +1,6 @@
webERP Change Log
+
+07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
|
15 messages has been excluded from this view by a project administrator.
