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: <ex...@us...> - 2016-05-06 03:07:18
|
Revision: 7505
http://sourceforge.net/p/web-erp/reponame/7505
Author: exsonqu
Date: 2016-05-06 03:07:16 +0000 (Fri, 06 May 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-06 03:06:34 UTC (rev 7504)
+++ trunk/doc/Change.log 2016-05-06 03:07:16 UTC (rev 7505)
@@ -1,5 +1,6 @@
webERP Change Log
+05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
01/05/2016 RChacon: In Z_poAddLanguage.php, fix directory name and default language file name.
29/4/16 RChacon: In includes/DateFunctions.inc, add year in long date and time in locale format.
26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
|
|
From: <ex...@us...> - 2016-05-06 03:06:36
|
Revision: 7504
http://sourceforge.net/p/web-erp/reponame/7504
Author: exsonqu
Date: 2016-05-06 03:06:34 +0000 (Fri, 06 May 2016)
Log Message:
-----------
05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
Modified Paths:
--------------
trunk/BOMs.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-05-01 15:17:08 UTC (rev 7503)
+++ trunk/BOMs.php 2016-05-06 03:06:34 UTC (rev 7504)
@@ -73,6 +73,7 @@
global $ParentMBflag;
$sql = "SELECT bom.sequence,
bom.component,
+ stockcategory.categorydescription,
stockmaster.description as itemdescription,
stockmaster.units,
locations.locationname,
@@ -90,6 +91,8 @@
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockcategory.categoryid = stockmaster.categoryid
INNER JOIN locations ON
bom.loccode = locations.loccode
INNER JOIN workcentres
@@ -143,26 +146,55 @@
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
}
$TextIndent= $Level . 'em';
+ if (!empty($myrow['remark'])) {
+ $myrow['remark'] = ' **' . ' ' . $myrow['remark'];
+ }
+ $StockID = $myrow['component'];
+ if (function_exists('imagecreatefromjpeg')){
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=100'.
+ '&eight=100'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ }
+ } else {
+ if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
- printf('<td class="number" style="text-align:left;text-indent:' . $textindent . ';" >%s</td>
+ printf('<td class="number" style="text-align:left;text-indent:' . $Textindent . ';" >%s</td>
<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
+ <td class="noprint">%s</td>
+ <td class="noprint">%s</td>
+ <td class="noprint">%s</td>
<td class="number noprint">%s</td>
<td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
<td class="noprint">' . $DrillText . '</td>
<td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
- </tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td>
+ </tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td><td>%s</td>
</tr>',
$Level1,
$myrow['sequence'],
+ $myrow['categorydescription'],
$myrow['component'],
$myrow['itemdescription'],
$myrow['locationname'],
@@ -184,7 +216,8 @@
$UltimateParent,
$myrow['loccode'],
$myrow['workcentrecode'],
- $myrow['remark']
+ $myrow['remark'],
+ $StockImgLink
);
} //END WHILE LIST LOOP
@@ -268,12 +301,14 @@
$Errors[$i] = 'Quantity';
$i++;
}
+ /* Comment this out to make substittute material can be recorded in the BOM
if (filter_number_format($_POST['Quantity'])==0) {
$InputError = 1;
prnMsg(_('The quantity entered cannot be zero'),'error');
$Errors[$i] = 'Quantity';
$i++;
}
+ */
if(!Date1GreaterThanDate2($_POST['EffectiveTo'], $_POST['EffectiveAfter'])){
$InputError = 1;
prnMsg(_('The effective to date must be a date after the effective after date') . '<br />' . _('The effective to date is') . ' ' . DateDiff($_POST['EffectiveTo'], $_POST['EffectiveAfter'], 'd') . ' ' . _('days before the effective after date') . '! ' . _('No updates have been performed') . '.<br />' . _('Effective after was') . ': ' . $_POST['EffectiveAfter'] . ' ' . _('and effective to was') . ': ' . $_POST['EffectiveTo'],'error');
@@ -556,10 +591,34 @@
</tr>
</table>';
}
+ $StockID = $SelectedParent;
+ if (function_exists('imagecreatefromjpeg')){
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=100'.
+ '&eight=100'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ }
+ } else {
+ if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
+ <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b>' . $StockImgLink . '</div></th>
</tr>';
echo '</table><div id="Report"><table class="selection">';
@@ -572,15 +631,16 @@
$TableHeader = '<tr>
<th>' . _('Level') . '</th>
<th>' . _('Sequence') . '</th>
+ <th>' . _('Category Description') . '</th>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Location') . '</th>
<th>' . _('Work Centre') . '</th>
<th>' . _('Quantity') . '</th>
<th>' . _('UOM') . '</th>
- <th>' . _('Effective After') . '</th>
- <th>' . _('Effective To') . '</th>
- <th>' . _('Auto Issue') . '</th>
+ <th class="noprint">' . _('Effective After') . '</th>
+ <th class="noprint">' . _('Effective To') . '</th>
+ <th class="noprint">' . _('Auto Issue') . '</th>
<th class="noprint">' . _('Qty On Hand') . '</th>
</tr>';
echo $TableHeader;
@@ -607,7 +667,9 @@
DisplayBOMItems($UltimateParent, $Parent, $Component, $Level, $db);
}
}
- echo '</table></div>
+ echo '</table>
+ </div>
+ <div class="onlyprint1;">' . _('Print Date') . ' :' . date($_SESSION['DefaultDateFormat']) . '</div>
<br />';
/* We do want to show the new component entry form in any case - it is a lot of work to get back to it otherwise if we need to add */
@@ -712,7 +774,7 @@
}
echo '<tr>
<td>' . _('Sequence in BOM') . ':</td>
- <td><input type="text" class="integer" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
+ <td><input type="text" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('Location') . ': </td>
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-01 15:17:08 UTC (rev 7503)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-06 03:06:34 UTC (rev 7504)
@@ -55,6 +55,7 @@
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
INSERT INTO securitytokens VALUES(18,'Cost authority');
+ALTER table bom change sequence sequence double not null default 0;
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2016-05-01 15:17:11
|
Revision: 7503
http://sourceforge.net/p/web-erp/reponame/7503
Author: rchacon
Date: 2016-05-01 15:17:08 +0000 (Sun, 01 May 2016)
Log Message:
-----------
Add file for he_IL translation.
Added Paths:
-----------
trunk/locale/he_IL.utf8/
trunk/locale/he_IL.utf8/LC_MESSAGES/
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
Added: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Index: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo 2016-05-01 15:05:34 UTC (rev 7502)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo 2016-05-01 15:17:08 UTC (rev 7503)
Property changes on: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po 2016-05-01 15:17:08 UTC (rev 7503)
@@ -0,0 +1,49733 @@
+# webERP - HEBREW Translation File.
+# Copyright (C) 2004 weberp.org
+# This file is distributed under the same license as the webERP package.
+# Hagay Mandel <ma...@ne...>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: webERP 4.12.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-01 08:48-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"Language: he_IL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
+msgid "Account Groups"
+msgstr ""
+
+#: AccountGroups.php:19
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+
+#: AccountGroups.php:20
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+
+#: AccountGroups.php:46
+msgid "An error occurred in moving the account group"
+msgstr ""
+
+#: AccountGroups.php:47
+msgid "The SQL that was used to move the account group was"
+msgstr ""
+
+#: AccountGroups.php:49 AccountGroups.php:331
+msgid "Review Account Groups"
+msgstr ""
+
+#: AccountGroups.php:50
+msgid "All accounts in the account group:"
+msgstr ""
+
+#: AccountGroups.php:50
+msgid "have been changed to the account group:"
+msgstr ""
+
+#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:208
+#: AccountGroups.php:243
+msgid "The SQL that was used to retrieve the information was"
+msgstr ""
+
+#: AccountGroups.php:70
+msgid "Could not check whether the group exists because"
+msgstr ""
+
+#: AccountGroups.php:77
+msgid "The account group name already exists in the database"
+msgstr ""
+
+#: AccountGroups.php:83
+msgid "The account group name cannot contain the character"
+msgstr ""
+
+#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:32
+msgid "or the character"
+msgstr ""
+
+#: AccountGroups.php:89
+msgid "The account group name must be at least one character long"
+msgstr ""
+
+#: AccountGroups.php:96
+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 ""
+
+#: AccountGroups.php:107
+msgid "Could not check whether the group is recursive because"
+msgstr ""
+
+#: AccountGroups.php:115
+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 ""
+
+#: AccountGroups.php:120
+msgid "The section in accounts must be an integer"
+msgstr ""
+
+#: AccountGroups.php:126
+msgid "The sequence in the trial balance must be an integer"
+msgstr ""
+
+#: AccountGroups.php:132
+msgid "The sequence in the TB must be numeric and less than"
+msgstr ""
+
+#: AccountGroups.php:148
+msgid "An error occurred in renaming the account group"
+msgstr ""
+
+#: AccountGroups.php:149
+msgid "The SQL that was used to rename the account group was"
+msgstr ""
+
+#: AccountGroups.php:168
+msgid "An error occurred in updating the account group"
+msgstr ""
+
+#: AccountGroups.php:169
+msgid "The SQL that was used to update the account group was"
+msgstr ""
+
+#: AccountGroups.php:171 AccountSections.php:98 PaymentMethods.php:84
+msgid "Record Updated"
+msgstr ""
+
+#: AccountGroups.php:187
+msgid "An error occurred in inserting the account group"
+msgstr ""
+
+#: AccountGroups.php:188
+msgid "The SQL that was used to insert the account group was"
+msgstr ""
+
+#: AccountGroups.php:189 AccountSections.php:108
+msgid "Record inserted"
+msgstr ""
+
+#: AccountGroups.php:207
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+
+#: AccountGroups.php:212
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+
+#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
+#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
+#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
+#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
+#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
+#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
+#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
+#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
+#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
+#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
+#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
+#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
+#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
+#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
+#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
+#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
+#: WorkCentres.php:91 WorkCentres.php:97
+msgid "There are"
+msgstr ""
+
+#: AccountGroups.php:213
+msgid "general ledger accounts that refer to this account group"
+msgstr ""
+
+#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:404
+msgid "Parent Group"
+msgstr ""
+
+#: AccountGroups.php:236
+msgid "Move Group"
+msgstr ""
+
+#: AccountGroups.php:242
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+
+#: AccountGroups.php:247
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+
+#: AccountGroups.php:248
+msgid "account groups that have this group as its/there parent account group"
+msgstr ""
+
+#: AccountGroups.php:252
+msgid "An error occurred in deleting the account group"
+msgstr ""
+
+#: AccountGroups.php:253
+msgid "The SQL that was used to delete the account group was"
+msgstr ""
+
+#: AccountGroups.php:255
+msgid "group has been deleted"
+msgstr ""
+
+#: AccountGroups.php:279
+msgid "The sql that was used to retrieve the account group information was "
+msgstr ""
+
+#: AccountGroups.php:280
+msgid "Could not get account groups because"
+msgstr ""
+
+#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
+#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
+#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:244 BOMs.php:908
+#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
+#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
+#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
+#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
+#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
+#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
+#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: HistoricalTestResults.php:42 InternalStockRequest.php:311
+#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
+#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
+#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: POReport.php:60 POReport.php:64 POReport.php:68
+#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PriceMatrix.php:16
+#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
+#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
+#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
+#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
+#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
+#: SelectCreditItems.php:292 SelectCustomer.php:331 SelectGLAccount.php:77
+#: SelectOrderItems.php:559 SelectOrderItems.php:1469
+#: SelectOrderItems.php:1569 SelectProduct.php:522 SelectQASamples.php:45
+#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: SupplierPriceList.php:14 SupplierPriceList.php:224
+#: SupplierPriceList.php:394 SupplierPriceList.php:398
+#: SupplierPriceList.php:449 SupplierPriceList.php:499
+#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
+#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
+#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
+#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
+#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
+#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+msgid "Search"
+msgstr ""
+
+#: AccountGroups.php:286
+msgid "Group Name"
+msgstr ""
+
+#: AccountGroups.php:287 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+msgid "Section"
+msgstr ""
+
+#: AccountGroups.php:288 AccountGroups.php:458
+msgid "Sequence In TB"
+msgstr ""
+
+#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
+#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
+msgid "Profit and Loss"
+msgstr ""
+
+#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
+#: AccountGroups.php:447 BOMs.php:129 BOMs.php:813 BOMs.php:815
+#: CompanyPreferences.php:425 CompanyPreferences.php:427
+#: CompanyPreferences.php:440 CompanyPreferences.php:442
+#: CompanyPreferences.php:455 CompanyPreferences.php:457
+#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
+#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
+#: Customers.php:1049 Customers.php:1055 Customers.php:1058
+#: DailyBankTransactions.php:212 DeliveryDetails.php:1158
+#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
+#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
+#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
+#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
+#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
+#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
+#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
+#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
+#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
+#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
+#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
+#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
+#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
+#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
+#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
+#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
+#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
+#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:230
+#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
+#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
+#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
+#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
+#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
+#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
+#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
+#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
+#: SystemParameters.php:945 SystemParameters.php:1088
+#: SystemParameters.php:1090 SystemParameters.php:1100
+#: SystemParameters.php:1102 SystemParameters.php:1156
+#: SystemParameters.php:1168 SystemParameters.php:1170
+#: SystemParameters.php:1208 SystemParameters.php:1210
+#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
+#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
+#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
+#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
+#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536
+#: WWW_Users.php:707 WWW_Users.php:709 WWW_Users.php:722 WWW_Users.php:724
+#: reportwriter/languages/en_US/reports.php:114
+msgid "Yes"
+msgstr ""
+
+#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
+#: BOMs.php:131 BOMs.php:812 BOMs.php:816 BankAccounts.php:218
+#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
+#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: CompanyPreferences.php:439 CompanyPreferences.php:443
+#: CompanyPreferences.php:454 CompanyPreferences.php:458
+#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
+#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: DailyBankTransactions.php:214 DeliveryDetails.php:1159
+#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
+#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
+#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
+#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
+#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
+#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75
+#: PDFWOPrint.php:603 PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
+#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
+#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
+#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
+#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
+#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
+#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
+#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
+#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
+#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
+#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
+#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
+#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
+#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492
+#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
+#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
+#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
+#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304
+#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:232
+#: SelectProduct.php:370 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
+#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
+#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
+#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
+#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
+#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
+#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
+#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
+#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
+#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
+#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
+#: SystemParameters.php:946 SystemParameters.php:1087
+#: SystemParameters.php:1091 SystemParameters.php:1099
+#: SystemParameters.php:1103 SystemParameters.php:1157
+#: SystemParameters.php:1167 SystemParameters.php:1171
+#: SystemParameters.php:1207 SystemParameters.php:1211
+#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
+#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
+#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
+#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
+#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537
+#: WWW_Users.php:706 WWW_Users.php:710 WWW_Users.php:721 WWW_Users.php:725
+#: includes/PDFLowGPPageHeader.inc:44
+#: reportwriter/languages/en_US/reports.php:82
+msgid "No"
+msgstr ""
+
+#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
+#: BOMs.php:159 BankAccounts.php:243 COGSGLPostings.php:112
+#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
+#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
+#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
+#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
+#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
+#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
+#: PaymentTerms.php:205 PcAssignCashToTab.php:291
+#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:256
+#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
+#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
+#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
+#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
+#: SecurityTokens.php:130 SelectCustomer.php:680 SelectCustomer.php:699
+#: SelectCustomer.php:746 SelectCustomer.php:764 SelectCustomer.php:788
+#: SelectCustomer.php:805 SelectGLAccount.php:130 SelectGLAccount.php:145
+#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
+#: StockCategories.php:296 SuppTransGLAnalysis.php:126
+#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
+#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:191
+#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
+#: WWW_Users.php:368 WorkCentres.php:145 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
+#, php-format
+msgid "Edit"
+msgstr ""
+
+#: AccountGroups.php:323
+msgid "Are you sure you wish to delete this account group?"
+msgstr ""
+
+#: AccountGroups.php:323 AccountSections.php:200 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
+#: BOMs.php:161 BankAccounts.php:244 COGSGLPostings.php:113
+#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
+#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
+#: Credit_Invoice.php:409 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:993 CustomerTypes.php:206 Customers.php:1166
+#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
+#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
+#: GLAccounts.php:318 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
+#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
+#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
+#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
+#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1156
+#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
+#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
+#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
+#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
+#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
+#: SelectCustomer.php:681 SelectCustomer.php:700 SelectCustomer.php:747
+#: SelectCustomer.php:765 SelectCustomer.php:789 SelectCustomer.php:806
+#: SelectOrderItems.php:1381 SelectQASamples.php:418
+#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
+#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
+#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:127 SupplierContacts.php:166
+#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
+#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
+#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
+#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:369 WorkCentres.php:146 includes/InputSerialItemsKeyed.php:60
+#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
+#, php-format
+msgid "Delete"
+msgstr ""
+
+#: AccountGroups.php:351
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+
+#: AccountGroups.php:352
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+
+#: AccountGroups.php:355
+msgid "The account group name does not exist in the database"
+msgstr ""
+
+#: AccountGroups.php:369
+msgid "Edit Account Group Details"
+msgstr ""
+
+#: AccountGroups.php:393
+msgid "New Account Group Details"
+msgstr ""
+
+#: AccountGroups.php:400
+msgid "Account Group Name"
+msgstr ""
+
+#: AccountGroups.php:401
+msgid "Enter the account group name"
+msgstr ""
+
+#: AccountGroups.php:401
+msgid ""
+"A unique name for the account group must be entered - at least 3 characters "
+"long and less than 30 characters long. Only alpha numeric characters can be "
+"used."
+msgstr ""
+
+#: AccountGroups.php:410 AccountGroups.php:412
+msgid "Top Level Group"
+msgstr ""
+
+#: AccountGroups.php:426
+msgid "Section In Accounts"
+msgstr ""
+
+#: AccountGroups.php:442
+msgid ""
+"Select YES if this account group will contain accounts that will consist of "
+"only profit and loss accounts or NO if the group will contain balance sheet "
+"account"
+msgstr ""
+
+#: AccountGroups.php:459
+msgid ""
+"Enter the sequence number that this account group and its child general "
+"ledger accounts should display in the trial balance"
+msgstr ""
+
+#: AccountGroups.php:462 AccountSections.php:268 AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
+#: BOMs.php:833 BankAccounts.php:433 COGSGLPostings.php:368
+#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
+#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
+#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:647
+#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424
+#: Manufacturers.php:375 OffersReceived.php:57 OffersReceived.php:146
+#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
+#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
+#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
+#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
+#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
+#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
+#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
+#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:289
+msgid "Enter Information"
+msgstr ""
+
+#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
+#: includes/MainMenuLinksArray.php:398
+msgid "Account Sections"
+msgstr ""
+
+#: AccountSections.php:61
+msgid "The account section already exists in the database"
+msgstr ""
+
+#: AccountSections.php:68
+msgid "The account section name cannot contain any illegal characters"
+msgstr ""
+
+#: AccountSections.php:74
+msgid "The account section name must contain at least one character"
+msgstr ""
+
+#: AccountSections.php:80 AccountSections.php:86
+msgid "The section number must be an integer"
+msgstr ""
+
+#: AccountSections.php:128
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+
+#: AccountSections.php:130
+msgid "general ledger accounts groups that refer to this account section"
+msgstr ""
+
+#: AccountSections.php:142
+msgid "section has been deleted"
+msgstr ""
+
+#: AccountSections.php:167
+msgid "Could not get account group sections because"
+msgstr ""
+
+#: AccountSections.php:178 AccountSections.php:240 AccountSections.php:258
+msgid "Section Number"
+msgstr ""
+
+#: AccountSections.php:179 AccountSections.php:263
+msgid "Section Description"
+msgstr ""
+
+#: AccountSections.php:198
+msgid "Restricted"
+msgstr ""
+
+#: AccountSections.php:210
+msgid "Review Account Sections"
+msgstr ""
+
+#: AccountSections.php:229
+msgid "Could not retrieve the requested section please try again."
+msgstr ""
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:672
+#: SelectCustomer.php:724
+msgid "Customer Contacts"
+msgstr ""
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:21
+#: Z_CheckDebtorsControl.php:14
+msgid "Back to Customers"
+msgstr ""
+
+#: AddCustomerContacts.php:25
+msgid "Contacts for Customer"
+msgstr ""
+
+#: AddCustomerContacts.php:27
+msgid "Edit contact for"
+msgstr ""
+
+#: AddCustomerContacts.php:39
+msgid "The Contact ID must be an integer."
+msgstr ""
+
+#: AddCustomerContacts.php:42
+msgid "The contact name must be forty characters or less long"
+msgstr ""
+
+#: AddCustomerContacts.php:45
+msgid "The contact name may not be empty"
+msgstr ""
+
+#: AddCustomerContacts.php:48
+msgid "The contact email address is not a valid email address"
+msgstr ""
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
+#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
+#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PO_Items.php:380
+#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
+#: PcTabs.php:124 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
+#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
+#: SelectQASamples.php:85 Stocks.php:594 SupplierTypes.php:68
+#: Suppliers.php:531
+msgid "has been updated"
+msgstr ""
+
+#: AddCustomerContacts.php:74
+msgid "The contact record has been added"
+msgstr ""
+
+#: AddCustomerContacts.php:103
+msgid "The contact record has been deleted"
+msgstr ""
+
+#: AddCustomerContacts.php:126 CompanyPreferences.php:173
+#: CustomerBranches.php:409 Customers.php:1118 Customers.php:1126
+#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
+#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
+#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
+#: SelectCustomer.php:675 StockDispatch.php:277 StockDispatch.php:288
+#: StockDispatch.php:299 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
+#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:161
+#: UserGLAccounts.php:157 UserLocations.php:176
+#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
+msgid "Name"
+msgstr ""
+
+#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1119
+#: Customers.php:1127 SelectCustomer.php:676 WWW_Access.php:113
+#: WWW_Access.php:179
+msgid "Role"
+msgstr ""
+
+#: AddCustomerContacts.php:128
+msgid "Phone no"
+msgstr ""
+
+#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
+#: CustomerAccount.php:313 CustomerAccount.php:337 CustomerBranches.php:415
+#: CustomerBranches.php:858 CustomerInquiry.php:324 CustomerInquiry.php:370
+#: CustomerInquiry.php:409 CustomerInquiry.php:444 CustomerInquiry.php:490
+#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:16
+#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
+#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
+#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
+#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
+#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
+#: PrintCustTransPortrait.php:1095 SelectCustomer.php:493
+#: SelectCustomer.php:678 SelectSupplier.php:290 SupplierContacts.php:156
+#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:322
+#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
+#: includes/PDFTransPageHeader.inc:85
+#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
+#: ../webSHOP/Register.php:595
+msgid "Email"
+msgstr ""
+
+#: AddCustomerContacts.php:130 AddCustomerContacts.php:250
+#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:123
+#: Customers.php:1122 Customers.php:1130 PDFQuotation.php:252
+#: PDFQuotationPortrait.php:249 PcAssignCashToTab.php:256
+#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
+#: PcClaimExpensesFromTab.php:238 PcClaimExpensesFromTab.php:405
+#: PcReportTab.php:333 SelectCustomer.php:679 ShopParameters.php:198
+#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
+msgid "Notes"
+msgstr ""
+
+#: AddCustomerContacts.php:149 SupplierContacts.php:166
+#, php-format
+msgid "Are you sure you wish to delete this contact?"
+msgstr ""
+
+#: AddCustomerContacts.php:168
+msgid "Review all contacts for this Customer"
+msgstr ""
+
+#: AddCustomerContacts.php:206
+msgid "Contact Code"
+msgstr ""
+
+#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
+#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+msgid "Contact Name"
+msgstr ""
+
+#: AddCustomerContacts.php:232 Contracts.php:788 PDFRemittanceAdvice.php:247
+#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
+#: SelectCustomer.php:491 SelectOrderItems.php:597
+#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
+#: includes/PDFTransPageHeader.inc:84
+#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
+#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+msgid "Phone"
+msgstr ""
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:739
+#: SelectCustomer.php:772
+msgid "Customer Notes"
+msgstr ""
+
+#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
+msgid "Back to Select Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:34
+msgid "The contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerNotes.php:37
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr ""
+
+#: AddCustomerNotes.php:40
+msgid "The contact's notes may not be empty"
+msgstr ""
+
+#: AddCustomerNotes.php:64
+msgid "The contact notes record has been added"
+msgstr ""
+
+#: AddCustomerNotes.php:91
+msgid "The contact note record has been deleted"
+msgstr ""
+
+#: AddCustomerNotes.php:101
+msgid "Notes for Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
+#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
+#: AgedControlledInventory.php:47 BankMatching.php:281
+#: BankReconciliation.php:212 BankReconciliation.php:289
+#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
+#: CustomerAllocations.php:378 CustomerInquiry.php:251
+#: CustomerTransInquiry.php:100 GLAccountReport.php:347 GLTransInquiry.php:47
+#: GoodsReceived.php:130 MRPCalendar.php:219 PDFRemittanceAdvice.php:308
+#: PDFWOPrint.php:450 PaymentAllocations.php:66 PcAssignCashToTab.php:252
+#: PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
+#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
+#: SelectCustomer.php:742 SelectCustomer.php:784 ShipmentCosting.php:538
+#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:279
+#: StockDispatch.php:290 StockDispatch.php:301 StockLocMovements.php:92
+#: StockMovements.php:105 StockSerialItemResearch.php:82
+#: SupplierAllocations.php:456 SupplierAllocations.php:569
+#: SupplierAllocations.php:644 SupplierInquiry.php:210
+#: SupplierTransInquiry.php:111 Tax.php:408
+#: includes/PDFQuotationPageHeader.inc:23
+#: includes/PDFQuotationPortraitPageHeader.inc:80
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
+#: includes/PDFTransPageHeaderPortrait.inc:63
+#: reportwriter/languages/en_US/reports.php:64
+msgid "Date"
+msgstr ""
+
+#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
+#: SelectCustomer.php:743 SelectCustomer.php:785 StockClone.php:942
+#: Stocks.php:1270 UpgradeDatabase.php:244 UpgradeDatabase.php:247
+#: UpgradeDatabase.php:250 UpgradeDatabase.php:253 UpgradeDatabase.php:256
+#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
+#: UpgradeDatabase.php:268 Z_Upgrade_3.10-3.11.php:62
+#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
+#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
+#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
+#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74
+#: Z_Upgrade_3.11-4.00.php:78
+msgid "Note"
+msgstr ""
+
+#: AddCustomerNotes.php:119 AddCustomerNotes.php:213
+msgid "WWW"
+msgstr ""
+
+#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
+#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
+#: SelectCustomer.php:745 SelectCustomer.php:787
+msgid "Priority"
+msgstr ""
+
+#: AddCustomerNotes.php:138
+#, php-format
+msgid "Are you sure you wish to delete this customer note?"
+msgstr ""
+
+#: AddCustomerNotes.php:157
+msgid "Review all notes for this Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:196 AddCustomerTypeNotes.php:189
+msgid "Note ID"
+msgstr ""
+
+#: AddCustomerNotes.php:204
+msgid "Contact Note"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:781
+msgid "Customer Type (Group) Notes"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:31
+msgid "The Contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerTypeNotes.php:34
+msgid "The contacts notes must be two hundred characters or less long"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:37
+msgid "The contacts notes may not be empty"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:813
+msgid "Customer Group Notes"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:61
+msgid "The contact group notes record has been added"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:84
+msgid "The contact group note record has been deleted"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:94
+msgid "Notes for Customer Type"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:113
+msgid "href"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:150
+msgid "Review all notes for this Customer Type"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:203
+msgid "Contact Group Note"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:207
+msgid "Web site"
+msgstr ""
+
+#: AgedControlledInventory.php:8
+msgid "Aged Controlled Inventory"
+msgstr ""
+
+#: AgedControlledInventory.php:8
+msgid "as-of"
+msgstr ""
+
+#: AgedControlledInventory.php:12 InventoryQuantities.php:155
+#: InventoryValuation.php:217 Locations.php:12 MRP.php:542 MRPCalendar.php:21
+#: MRPCreateDemands.php:193 MRPDemandTypes.php:17 MRPDemands.php:27
+#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
+#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevel.php:194
+#: ReorderLevelLocation.php:12 SelectProduct.php:90 StockDispatch.php:321
+#: StockMovements.php:22 StockQties_csv.php:8 StockQuantityByDate.php:10
+#: StockReorderLevel.php:20 StockSerialItemResearch.php:9
+#: StockSerialItems.php:9 StockStatus.php:45 StockTransferControlled.php:14
+#: SuppLoginSetup.php:24 WWW_Users.php:15 includes/MainMenuLinksArray.php:26
+#: reportwriter/languages/en_US/reports.php:243
+msgid "Inventory"
+msgstr ""
+
+#: AgedControlledInventory.php:32
+msgid "The stock held could not be retrieved because"
+msgstr ""
+
+#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
+#: StockClone.php:53 Stocks.php:63
+#: reportwriter/languages/en_US/reports.php:103
+msgid "Stock"
+msgstr ""
+
+#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
+#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
+#: BOMInquiry.php:198 BOMs.php:576 BOMs.php:932 CollectiveWorkOrderCost.php:45
+#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
+#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
+#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219
+#: EmailConfirmation.php:349 FixedAssetCategories.php:167
+#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
+#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
+#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
+#: GLTransInquiry.php:49 GoodsReceived.php:122
+#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345
+#: InternalStockRequest.php:559 InternalStockRequest.php:629
+#: InventoryPlanning.php:419 InventoryQuantities.php:246
+#: InventoryValuation.php:197 Labels.php:290 MRPDemandTypes.php:113
+#: MRPDemands.php:92 MRPDemands.php:295 MRPPlannedWorkOrders.php:258
+#: MRPReport.php:564 MRPReport.php:778 MRPReschedules.php:192
+#: MRPShortages.php:350 MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50
+#: MaterialsNotUsed.php:35 NoSalesItems.php:194 PDFCOA.php:64
+#: PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
+#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
+#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
+#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
+#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
+#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
+#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:549
+#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
+#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
+#: SelectCreditItems.php:1019 SelectOrderItems.php:1479
+#: SelectOrderItems.php:1641 SelectProduct.php:542 SelectProduct.php:830
+#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
+#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
+#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
+#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
+#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:122
+#: SuppInvGRNs.php:264 SuppPriceList.php:309 SupplierCredit.php:317
+#: SupplierCredit.php:385 SupplierInvoice.php:668 SupplierInvoice.php:750
+#: SupplierPriceList.php:39 SupplierPriceList.php:271
+#: SupplierPriceList.php:533 SupplierTenderCreate.php:434
+#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853
+#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687
+#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
+#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
+#: WorkOrderEntry.php:735 WorkOrderIssue.php:785 Z_ItemsWithoutPicture.php:35
+#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
+#: includes/PDFInventoryPlanPageHeader.inc:51
+#: includes/PDFOstdgGRNsPageHeader.inc:38
+#: includes/PDFStockLocTransferHeader.inc:65
+#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
+#: includes/PDFTransPageHeader.inc:211
+#: includes/PDFTransPageHeaderPortrait.inc:267
+#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
+#: ../webSHOP/includes/PlaceOrder.php:236
+msgid "Description"
+msgstr ""
+
+#: AgedControlledInventory.php:44 PDFBankingSummary.php:39
+msgid "Batch"
+msgstr ""
+
+#: AgedControlledInventory.php:45
+msgid "Quantity Remaining"
+msgstr ""
+
+#: AgedControlledInventory.php:46
+msgid "Inventory Value"
+msgstr ""
+
+#: AgedControlledInventory.php:48
+msgid "Days Old"
+msgstr ""
+
+#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:309
+#: ConfirmDispatch_Invoice.php:313 CounterReturns.php:676
+#: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853
+#: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302
+#: CustomerAllocations.php:349 CustomerAllocations.php:379
+#: CustomerInquiry.php:256 DeliveryDetails.php:884 DeliveryDetails.php:953
+#: GLBalanceSheet.php:196 GLBalanceSheet.php:208 GLBalanceSheet.php:298
+#: GLBalanceSheet.php:307 GLBudgets.php:213 GLJournal.php:436
+#: GLTransInquiry.php:219 GLTrialBalance.php:225 GLTrialBalance.php:245
+#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:495
+#: GLTrialBalance.php:515 GLTrialBalance.php:539 GLTrialBalance.php:651
+#: GLTrialBalance.php:671 GLTrialBalance.php:695 InventoryValuation.php:197
+#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177
+#: OutstandingGRNs.php:246 PDFCustTransListing.php:137
+#: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310
+#: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335
+#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
+#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
+#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
+#: SelectCreditItems.php:697 SelectOrderItems.php:1319
+#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
+#: SuppTransGLAnalysis.php:140 SupplierAllocations.php:458
+#: SupplierAllocations.php:570 SupplierAllocations.php:645
+#: SupplierCredit.php:407 SupplierInquiry.php:215 Tax.php:250
+#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
+#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
+#: includes/PDFQuotationPageHeader.inc:109
+#: includes/PDFQuotationPortraitPageHeader.inc:100
+#: includes/PO_PDFOrderPageHeader.inc:81
+#: reportwriter/languages/en_US/reports.php:107
+#: ../webSHOP/includes/DisplayShoppingCart.php:7
+#: ../webSHOP/includes/PlaceOrder.php:285
+#, php-format
+msgid "Total"
+msgstr ""
+
+#: AgedDebtors.php:14
+msgid "Aged Customer Balance Listing"
+msgstr ""
+
+#: AgedDebtors.php:15
+msgid "Aged Customer Balances"
+msgstr ""
+
+#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
+msgid "Aged Customer Account Analysis"
+msgstr ""
+
+#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
+#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
+#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
+#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
+#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
+#: GLTrialBalance.php:167 InternalStockRequest.php:320
+#: InventoryPlanning.php:99 InventoryPlanning.php:176
+#: InventoryPlanning.php:213 InventoryPlanning.php:262
+#: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241
+#: InventoryPlanningPrefSupplier.php:268 InventoryPlanningPrefSupplier.php:301
+#: InventoryQuantities.php:84 InventoryValuation.php:64
+#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
+#: MRPReport.php:147 MRPReport.php:536 MRPReschedules.php:45
+#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
+#: MailInventoryValuation.php:22 MailInventoryValuation.php:120
+#: MailSalesReport.php:23 MailSalesReport_csv.php:30 OutstandingGRNs.php:46
+#: OutstandingGRNs.php:59 PDFCustomerList.php:20 PDFCustomerList.php:232
+#: PDFCustomerList.php:244 PDFLowGP.php:20 PDFSalesBySalesperson.php:15
+#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
+#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267
+#: PDFWeeklyOrders.php:15 PurchaseByPrefSupplier.php:399
+#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471
+#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531
+#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:46
+#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138
+#: SupplierTenderCreate.php:671 SupplierTenders.php:397
+#: includes/PDFPaymentRun_PymtFooter.php:152
+msgid "Problem Report"
+msgstr ""
+
+#: AgedDebtors.php:269 CustomerAccount.php:210 CustomerInquiry.php:116
+#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145
+#: DebtorsAtPeriodEnd.php:59
+msgid "The customer details could not be retrieved by the SQL because"
+msgstr ""
+
+#: AgedDebtors.php:270 AgedDebtors.php:372 AgedDebtors.php:436
+#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
+#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
+#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
+#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
+#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
+#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:155
+#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203
+#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170
+#: GLTrialBalance.php:182 GetStockImage.php:143 InventoryPlanning.php:102
+#: InventoryPlanning.php:179 InventoryPlanning.php:216
+#: InventoryPlanning.php:265 InventoryPlanning.php:340
+#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
+#: InventoryPlanningPrefSupplier.php:271 InventoryPlanningPrefSupplier.php:304
+#: InventoryPlanningPrefSupplier.php:372 InventoryQuantities.php:87
+#: InventoryQuantities.php:98 InventoryValuation.php:67
+#: InventoryValuation.php:92 MRPPlannedPurchaseOrders.php:117
+#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
+#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
+#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
+#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
+#: MailInventoryValuation.php:123 MailInventoryValuation.php:219
+#: MailInventoryValuation.php:243 MailInventoryValuation.php:251
+#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
+#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100
+#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
+#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276
+#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
+#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
+#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
+#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
+#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PDFWeeklyOrders.php:209
+#: PDFWeeklyOrders.php:217 PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:156
+#: PrintCustOrder.php:238 PrintCustOrder_generic.php:256
+#: PrintWOItemSlip.php:122 PurchaseByPrefSupplier.php:402
+#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474
+#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534
+#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
+#: SelectCreditItems.php:32 StockCheck.php:42 StockCheck.php:63
+#: StockCheck.php:93 StockCheck.php:135 StockCheck.php:146 StockCheck.php:188
+#: StockDispatch.php:128 StockDispatch.php:141 SuppPaymentRun.php:112
+#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
+#: SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54
+#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310
+#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
+#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
+#: includes/PDFPaymentRun_PymtFooter.php:59
+#: includes/PDFPaymentRun_PymtFooter.php:89
+#: includes/PDFPaymentRun_PymtFooter.php:119
+#: includes/PDFPaymentRun_PymtFooter.php:156
+#: includes/PDFPaymentRun_PymtFooter.php:187
+#: includes/PDFPaymentRun_PymtFooter.php:218
+msgid "Back to the menu"
+msgstr ""
+
+#: AgedDebtors.php:371 Dashboard.php:256
+msgid "The details of outstanding transactions for customer"
+msgstr ""
+
+#: AgedDebtors.php:371 AgedSuppliers.php:197 Dashboard.php:256
+#: GLAccountCSV.php:179 GLAccountInquiry.php:173 GLAccountReport.php:97
+#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
+#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
+#: SalesAnalReptCols.php:365 SpecialOrder.php:448
+#: StockLocTransferReceive.php:481 StockQuantityByDate.php:124
+#: includes/SelectOrderItems_IntoCart.inc:55
+msgid "could not be retrieved because"
+msgstr ""
+
+#: AgedDebtors.php:374 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:200
+#: Areas.php:94 ConfirmDispatch_Invoice.php:172
+#: ConfirmDispatch_Invoice.php:1005 ConfirmDispatch_Invoice.php:1019
+#: Contracts.php:599 CounterReturns.php:1024 CounterReturns.php:1038
+#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:754
+#: Credit_Invoice.php:775 CustItem.php:73 CustItem.php:86 CustItem.php:197
+#: CustomerReceipt.php:579 CustomerReceipt.php:732 CustomerReceipt.php:760
+#: CustomerTransInquiry.php:91 Dashboard.php:259 Dashboard.php:440
+#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
+#: PDFRemittanceAdvice.php:85 Payments.php:389 PurchData.php:114
+#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
+#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387 SMTPServer.php:66
+#: SelectCreditItems.php:1454 SelectSalesOrder.php:209
+#: SelectSalesOrder.php:375 SellThroughSupport.php:81
+#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:446
+#: StockClone.php:520 StockCostUpdate.php:78 StockCostUpdate.php:88
+#: StockLocStatus.php:167 StockLocTransferReceive.php:215
+#: StockLocTransferReceive.php:368 StockMovements.php:98
+#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285
+#: StockTransfers.php:202 StockTransfers.php:232 StockTransfers.php:388
+#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114
+#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:79
+#: SupplierInquiry.php:101 SupplierInquiry.php:139 SupplierInquiry.php:195
+#: SupplierPriceList.php:382 SupplierTransInquiry.php:103 WOSerialNos.php:49
+#: WorkOrderCosting.php:427 WorkOrderReceive.php:305
+#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
+#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
+#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
+#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:93
+#: includes/ConnectDB_mysql.inc:66 includes/ConnectDB_mysqli.inc:74
+#: includes/PDFPaymentRun_PymtFooter.php:61
+#: includes/PDFPaymentRun_PymtFooter.php:91
+#: includes/PDFPaymentRun_PymtFooter.php:121
+#: includes/PDFPaymentRun_PymtFooter.php:158
+#: includes/PDFPaymentRun_PymtFooter.php:189
+#: ../webSHOP/includes/DatabaseFunctions.php:60
+#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70
+msgid "The SQL that failed was"
+msgstr ""
+
+#: AgedDebtors.php:435
+msgid ""
+"There are no customers with balances meeting the criteria specified to list"
+msgstr ""
+
+#: AgedDebtors.php:446
+msgid "Aged Debtor Analysis"
+msgstr ""
+
+#: AgedDebtors.php:464 DebtorsAtPeriodEnd.php:142
+msgid "From Customer Code"
+msgstr ""
+
+#: AgedDebtors.php:465
+msgid "Enter the first customer code alphabetically to include in the report"
+msgstr ""
+
+#: AgedDebtors.php:468 DebtorsAtPeriodEnd.php:146
+msgid "To Customer Code"
+msgstr ""
+
+#: AgedDebtors.php:469
+msgid "Enter the last customer code alphabetically to include in the report"
+msgstr ""
+
+#: AgedDebtors.php:472 AgedSuppliers.php:295
+msgid "All balances or overdues only"
+msgstr ""
+
+#: AgedDebtors.php:474
+msgid "All customers with balances"
+msgstr ""
+
+#: AgedDebtors.php:475 AgedSuppliers.php:298
+msgid "Overdue accounts only"
+msgstr ""
+
+#: AgedDebtors.php:476
+msgid "Held accounts only"
+msgstr ""
+
+#: AgedDebtors.php:481
+msgid "Only Show Customers Of"
+msgstr ""
+
+#: AgedDebtors.php:492
+msgid "All Sales people"
+msgstr ""
+
+#: AgedDebtors.php:500
+msgid "Only show customers trading in"
+msgstr ""
+
+#: AgedDebtors.php:516
+msgid "Summary or detailed report"
+msgstr ""
+
+#: AgedDebtors.php:518 AgedSuppliers.php:320 InventoryValuation.php:266
+msgid "Summary Report"
+msgstr ""
+
+#: AgedDebtors.php:519 AgedSuppliers.php:321 InventoryValuation.php:267
+msgid "Detailed Report"
+msgstr ""
+
+#: AgedDebtors.php:526 AgedSuppliers.php:327 BOMExtendedQty.php:289
+#: BOMIndented.php:278 BOMIndentedReverse.php:255 BOMListing.php:131
+#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:521
+#: InventoryPlanningPrefSupplier.php:437 InventoryQuantities.php:210
+#: InventoryValuation.php:273 MRPPlannedPurchaseOrders.php:294
+#: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303
+#: OutstandingGRNs.php:280 PDFCustomerList.php:421 PDFLowGP.php:146
+#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
+#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
+#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:449
+#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
+msgid "Print PDF"
+msgstr ""
+
+#: AgedSuppliers.php:14
+msgid "Aged Supplier Listing"
+msgstr ""
+
+#: AgedSuppliers.php:15
+msgid "Aged Suppliers"
+msgstr ""
+
+#: AgedSuppliers.php:108
+msgid "Aged Supplier Account Analysis"
+msgstr ""
+
+#: AgedSuppliers.php:110 SupplierBalsAtPeriodEnd.php:53
+msgid "The Supplier details could not be retrieved by the SQL because"
+msgstr ""
+
+#: AgedSuppliers.php:195
+msgid "Aged Supplier Account Analysis - Problem Report"
+msgstr ""
+
+#: AgedSuppliers.php:197
+msgid "The details of outstanding transactions for Supplier"
+msgstr ""
+
+#: AgedSuppliers.php:263 AgedSuppliers.php:273
+msgid "Aged Supplier Analysis"
+msgstr ""
+
+#: AgedSuppliers.php:265
+msgid "There are no results so the PDF is empty"
+msgstr ""
+
+#: AgedSuppliers.php:287 OutstandingGRNs.php:270 PDFRemittanceAdvice.php:153
+#: SuppPaymentRun.php:265 SupplierBalsAtPeriodEnd.php:131
+#: Z_ClearPOBackOrders.php:20
+msgid "From Supplier Code"
+msgstr ""
+
+#: AgedSuppliers.php:288
+msgid "Enter the first supplier code alphabetially to include in the report"
+msgstr ""
+
+#: AgedSuppliers.php:291 OutstandingGRNs.php:274 PDFRemittanceAdvice.php:157
+#: SuppPaymentRun.php:269 SupplierBalsAtPeriodEnd.php:135
+#: Z_ClearPOBackOrders.php:23
+msgid "To Supplier Code"
+msgstr ""
+
+#: AgedSuppliers.php:292
+msgid "Enter the last supplier code alphabetically to include in the report"
+msgstr ""
+
+#: AgedSuppliers.php:297
+msgid "All suppliers with balances"
+msgstr ""
+
+#: AgedSuppliers.php:302
+msgid "For suppliers trading in"
+msgstr ""
+
+#: AgedSuppliers.php:318 InventoryValuation.php:264
+msgid "Summary or Detailed Report"
+msgstr ""
+
+#: AnalysisHorizontalIncome.php:10 AnalysisHorizontalPosition.php:10
+#: BOMs.php:127 BOMs.php:133 BOMs.php:141 BOMs.php:950 BankAccounts.php:369
+#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:651
+#: PaymentTerms.php:190 PaymentTerms.php:196 SalesAnalReptCols.php:285
+#: SelectProduct.php:136 SelectProduct.php:186 SelectProduct.php:247
+#: SelectProduct.php:248 SelectProduct.php:850
+#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
+#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
+#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
+#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:41
+msgid "N/A"
+msgstr ""
+
+#: AnalysisHorizontalIncome.php:15 AnalysisHorizontalIncome.php:31
+#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
+#: includes/MainMenuLinksArray.php:378
+msgid "Horizontal Analysis of Statement of Comp...
[truncated message content] |
|
From: <rc...@us...> - 2016-05-01 15:05:37
|
Revision: 7502
http://sourceforge.net/p/web-erp/reponame/7502
Author: rchacon
Date: 2016-05-01 15:05:34 +0000 (Sun, 01 May 2016)
Log Message:
-----------
Fix directory name and default language file name.
Modified Paths:
--------------
trunk/Z_poAddLanguage.php
trunk/doc/Change.log
Modified: trunk/Z_poAddLanguage.php
===================================================================
--- trunk/Z_poAddLanguage.php 2016-04-29 23:57:28 UTC (rev 7501)
+++ trunk/Z_poAddLanguage.php 2016-05-01 15:05:34 UTC (rev 7502)
@@ -1,5 +1,6 @@
<?php
/* $Id$*/
+/* Allows a new language po file to be created */
/* Steve Kitchen/Kaill */
@@ -20,9 +21,9 @@
$ViewTopic = "SpecialUtilities";
$BookMark = "Z_poAddLanguage";// 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/maintenance.png" title="' .
- _('Add a New Language to the System') . '" />' . ' ' .
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Add a New Language to the System') . '" />' . ' ' .
_('Add a New Language to the System') . '</p>';
/* Your webserver user MUST have read/write access to here, otherwise you'll be wasting your time */
@@ -32,7 +33,7 @@
echo '<br /> ' . _('Current language is') . ' ' . $_SESSION['Language'];
$DefaultLanguage = 'en_GB';// The default language is English-United Kingdom (British English).
-$PathToDefault = './locale/' . $DefaultLanguage . '/LC_MESSAGES/messages.po';
+$PathToDefault = './locale/' . $DefaultLanguage . '.utf8/LC_MESSAGES/messages.pot';
if (isset($_POST['submit']) AND isset($_POST['NewLanguage'])) {
@@ -57,8 +58,8 @@
if (!file_exists('./locale/' . $_POST['NewLanguage'])) {
prnMsg (_('Attempting to create the new language file') . '.....<br />', 'info', ' ');
- $Result = mkdir('./locale/' . $_POST['NewLanguage']);
- $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '/LC_MESSAGES');
+ $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '.utf8');
+ $Result = mkdir('./locale/' . $_POST['NewLanguage'] . '.utf8/LC_MESSAGES');
} else {
prnMsg(_('This language cannot be added because it already exists!'),'error');
echo '</form>';
@@ -67,7 +68,7 @@
exit;
}
- $PathToNewLanguage = './locale/' . $_POST['NewLanguage'] . '/LC_MESSAGES/messages.po';
+ $PathToNewLanguage = './locale/' . $_POST['NewLanguage'] . '.utf8/LC_MESSAGES/messages.po';
$Result = copy($PathToDefault, $PathToNewLanguage);
prnMsg (_('Done. You should now change to your newly created language from the user settings link above. Then you can edit the new language file header and use the language module editor to translate the system strings'), 'info');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-29 23:57:28 UTC (rev 7501)
+++ trunk/doc/Change.log 2016-05-01 15:05:34 UTC (rev 7502)
@@ -1,5 +1,6 @@
webERP Change Log
+01/05/2016 RChacon: In Z_poAddLanguage.php, fix directory name and default language file name.
29/4/16 RChacon: In includes/DateFunctions.inc, add year in long date and time in locale format.
26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext.
|
|
From: <rc...@us...> - 2016-04-29 23:57:31
|
Revision: 7501
http://sourceforge.net/p/web-erp/reponame/7501
Author: rchacon
Date: 2016-04-29 23:57:28 +0000 (Fri, 29 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-29 23:51:49 UTC (rev 7500)
+++ trunk/doc/Change.log 2016-04-29 23:57:28 UTC (rev 7501)
@@ -1,5 +1,6 @@
webERP Change Log
+29/4/16 RChacon: In includes/DateFunctions.inc, add year in long date and time in locale format.
26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext.
25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-(
|
|
From: <rc...@us...> - 2016-04-29 23:51:51
|
Revision: 7500
http://sourceforge.net/p/web-erp/reponame/7500
Author: rchacon
Date: 2016-04-29 23:51:49 +0000 (Fri, 29 Apr 2016)
Log Message:
-----------
Add year in long date and time in locale format.
Modified Paths:
--------------
trunk/includes/DateFunctions.inc
Modified: trunk/includes/DateFunctions.inc
===================================================================
--- trunk/includes/DateFunctions.inc 2016-04-28 02:53:14 UTC (rev 7499)
+++ trunk/includes/DateFunctions.inc 2016-04-29 23:51:49 UTC (rev 7500)
@@ -173,8 +173,28 @@
return $Day;
}
-function DisplayDateTime () {
- return GetWeekDayText(date('w')) . ' ' . date('j') . ' ' . GetMonthText(date('n')) . ' ' . date('G:i') ;
+function DisplayDateTime() {
+ // Long date and time in locale format.
+ // Could be replace by IntlDateFormatter (available on PHP 5.3.0 or later). See http://php.net/manual/en/class.intldateformatter.php
+ switch ($_SESSION['Language']) {
+ case 'en_GB.utf8':
+ $long_datetime = GetWeekDayText(date('w')) . ' ' . date('j') . ' ' . GetMonthText(date('n')) . ' ' . date('Y') . ' ' . date('G:i');
+ break;
+ case 'en_US.utf8':
+ $long_datetime = GetWeekDayText(date('w')) . ', ' . GetMonthText(date('n')) . ' ' . date('j') . ', '. date('Y') . ' ' . date('G:i');
+ break;
+ case 'es_ES.utf8':
+ $long_datetime = GetWeekDayText(date('w')) . ' ' . date('j') . ' de ' . GetMonthText(date('n')) . ' de ' . date('Y') . ' ' . date('G:i');
+ break;
+ case 'fr_FR.utf8':
+ $long_datetime = GetWeekDayText(date('w')) . ' ' . date('j') . ' ' . GetMonthText(date('n')) . ' ' . date('Y') . ' ' . date('G:i');
+ break;
+ default:
+ $long_datetime = GetWeekDayText(date('w')) . ' ' . date('j') . ' ' . GetMonthText(date('n')) . ' ' . date('Y') . ' ' . date('G:i');
+ break;
+ }
+ return $long_datetime;
+/* return GetWeekDayText(date('w')) . ' ' . date('j') . ' ' . GetMonthText(date('n')) . ' ' . date('G:i') ;*/
}
function DayOfWeekFromSQLDate($DateEntry) {
|
|
From: <rc...@us...> - 2016-04-28 02:53:17
|
Revision: 7499
http://sourceforge.net/p/web-erp/reponame/7499
Author: rchacon
Date: 2016-04-28 02:53:14 +0000 (Thu, 28 Apr 2016)
Log Message:
-----------
Code improvement: Replace with cal_days_in_month().
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/reportwriter/WriteReport.inc
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-26 16:24:36 UTC (rev 7498)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-28 02:53:14 UTC (rev 7499)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-04-26 09:51-0600\n"
-"PO-Revision-Date: 2016-04-26 10:00-0600\n"
+"PO-Revision-Date: 2016-04-26 10:53-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15568,7 +15568,7 @@
#: GoodsReceived.php:107
msgid "Supplier's Reference"
-msgstr ""
+msgstr "Referencia del proveedor"
#: GoodsReceived.php:115 PO_Items.php:721
msgid "Supplier Units"
@@ -22863,7 +22863,7 @@
#: Payments.php:976
msgid "Narrative in general ledger transactions"
-msgstr ""
+msgstr "Descripción en las transacciones del libro mayor"
#: Payments.php:993
msgid "General Ledger Payment Analysis Entry"
@@ -22915,32 +22915,38 @@
#: Payments.php:1187
msgid "Supplier Narrative"
-msgstr ""
+msgstr "Descripción de proveedores"
#: Payments.php:1188
msgid ""
"Supplier narrative in general ledger transactions. If blank, it uses the "
"bank narrative."
msgstr ""
+"Descripción de proveedores en las transacciones del libro mayor. Si está en "
+"blanco, se usa la descripción de bancos."
#: Payments.php:1195
msgid "Supplier Reference"
-msgstr ""
+msgstr "Referencia de proveedores"
#: Payments.php:1196
msgid ""
"Supplier reference in supplier transactions. If blank, it uses the payment "
"type."
msgstr ""
+"Referencia de proveedores en las transacciones con los proveedores. Si está "
+"en blanco, se usa el tipo de pago."
#: Payments.php:1203
msgid "Transaction Text"
-msgstr ""
+msgstr "Texto de la transacción"
#: Payments.php:1204
msgid ""
"Transaction text in supplier transactions. If blank, it uses the narrative."
msgstr ""
+"Texto de la transacción en las transacciones con los proveedores. Si está en "
+"blanco, se usa la descripción de bancos."
#: Payments.php:1209
msgid "Amount of Payment"
@@ -26255,7 +26261,7 @@
#: ReverseGRN.php:398
msgid "Supplier' Ref"
-msgstr ""
+msgstr "Referencia del proveedor"
#: ReverseGRN.php:404
msgid "Quantity To"
@@ -33672,7 +33678,7 @@
#: SuppInvGRNs.php:120 SuppInvGRNs.php:261 includes/PDFGrnHeader.inc:21
msgid "Supplier's Ref"
-msgstr ""
+msgstr "Referencia del proveedor"
#: SuppInvGRNs.php:123
msgid "Quantity Yet To Inv"
@@ -35085,7 +35091,7 @@
#: SupplierInvoice.php:666
msgid "Supplier Ref"
-msgstr ""
+msgstr "Referencia de proveedores"
#: SupplierInvoice.php:669
msgid "Quantity Charged"
@@ -51600,7 +51606,7 @@
#: reportwriter/languages/en_US/reports.php:215
msgid "Name to Display"
-msgstr ""
+msgstr "Nombre a mostrar"
#: reportwriter/languages/en_US/reports.php:217
msgid "Report Filter Description"
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-04-26 16:24:36 UTC (rev 7498)
+++ trunk/reportwriter/WriteReport.inc 2016-04-28 02:53:14 UTC (rev 7499)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
require_once($PathPrefix .'/includes/class.pdf.php');
class PDF extends Cpdf {
@@ -303,7 +305,7 @@
$ThisMonth = mb_substr($Today,5,2);
$ThisYear = mb_substr($Today,0,4);
// find total number of days in this month
- if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
+/* if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
$TotalDays=30;
} elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year
$TotalDays=29;
@@ -311,7 +313,8 @@
$TotalDays=28;
} else {
$TotalDays=31;
- }
+ }//********** To replace. */
+ $TotalDays = cal_days_in_month(CAL_GREGORIAN, $ThisMonth, $ThisYear);//********** To test !
// Calculate date range
$DateArray=explode(':',$Prefs['DateListings']['params']);
switch ($DateArray[0]) { // based on the date choice selected
|
|
From: <rc...@us...> - 2016-04-26 16:24:40
|
Revision: 7498
http://sourceforge.net/p/web-erp/reponame/7498
Author: rchacon
Date: 2016-04-26 16:24:36 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-04-26 07:59:21 UTC (rev 7497)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-04-26 16:24:36 UTC (rev 7498)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-29 12:33-0600\n"
+"POT-Creation-Date: 2016-04-26 09:51-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -18,7 +18,7 @@
"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:397
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -165,17 +165,17 @@
#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:154
+#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
+#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779
-#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
+#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
+#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
+#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:89 WorkCentres.php:95
+#: WorkCentres.php:91 WorkCentres.php:97
msgid "There are"
msgstr "يوجد"
@@ -226,10 +226,10 @@
msgstr "لم يتمكن الحصول على مجموات العضو لان"
#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27
-#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
+#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:453
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
-#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:239 BOMs.php:890
+#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:244 BOMs.php:908
#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
@@ -247,17 +247,17 @@
#: POReport.php:60 POReport.php:64 POReport.php:68
#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:204 PriceMatrix.php:16
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PriceMatrix.php:16
#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:267 SelectGLAccount.php:77
+#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
+#: SelectCreditItems.php:292 SelectCustomer.php:331 SelectGLAccount.php:77
#: SelectOrderItems.php:559 SelectOrderItems.php:1469
-#: SelectOrderItems.php:1569 SelectProduct.php:518 SelectQASamples.php:45
+#: SelectOrderItems.php:1569 SelectProduct.php:522 SelectQASamples.php:45
#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
@@ -269,10 +269,9 @@
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
-#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
-#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:251
+#: WorkCentres.php:113 WorkOrderCosting.php:22 WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
+#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -295,7 +294,7 @@
msgstr ""
#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
-#: AccountGroups.php:447 BOMs.php:128 BOMs.php:802 BOMs.php:804
+#: AccountGroups.php:447 BOMs.php:129 BOMs.php:813 BOMs.php:815
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
@@ -328,18 +327,18 @@
#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
-#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:227
-#: SelectProduct.php:365 SelectQASamples.php:424 SelectQASamples.php:518
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
+#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:230
+#: SelectProduct.php:368 SelectQASamples.php:424 SelectQASamples.php:518
#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
-#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
-#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
+#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
+#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
+#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
@@ -349,8 +348,8 @@
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:310
-#: TaxGroups.php:313 TaxGroups.php:364 TestPlanResults.php:304
+#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
+#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536
@@ -360,7 +359,7 @@
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
+#: BOMs.php:131 BOMs.php:812 BOMs.php:816 BankAccounts.php:218
#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
@@ -394,18 +393,18 @@
#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
-#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
-#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:229
-#: SelectProduct.php:367 SelectQASamples.php:426 SelectQASamples.php:523
+#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304
+#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:232
+#: SelectProduct.php:370 SelectQASamples.php:426 SelectQASamples.php:523
#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
-#: ShopParameters.php:498 StockClone.php:917 StockClone.php:919
-#: StockClone.php:942 StockClone.php:944 Stocks.php:1251 Stocks.php:1253
-#: Stocks.php:1276 Stocks.php:1278 SuppContractChgs.php:92
+#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
+#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
+#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
@@ -415,8 +414,8 @@
#: SystemParameters.php:1103 SystemParameters.php:1157
#: SystemParameters.php:1167 SystemParameters.php:1171
#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:366 TestPlanResults.php:306
+#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
+#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537
@@ -428,7 +427,7 @@
#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
+#: BOMs.php:159 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
@@ -438,22 +437,22 @@
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:288
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
+#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
+#: PaymentTerms.php:205 PcAssignCashToTab.php:291
+#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:256
#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
-#: QATests.php:467 SalesCategories.php:272 SalesGLPostings.php:137
+#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:616 SelectCustomer.php:635
-#: SelectCustomer.php:665 SelectCustomer.php:683 SelectCustomer.php:707
-#: SelectCustomer.php:724 SelectGLAccount.php:130 SelectGLAccount.php:145
+#: SecurityTokens.php:130 SelectCustomer.php:680 SelectCustomer.php:699
+#: SelectCustomer.php:746 SelectCustomer.php:764 SelectCustomer.php:788
+#: SelectCustomer.php:805 SelectGLAccount.php:130 SelectGLAccount.php:145
#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:125
+#: StockCategories.php:296 SuppTransGLAnalysis.php:126
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
+#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:191
#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:368 WorkCentres.php:142 includes/InputSerialItems.php:110
+#: WWW_Users.php:368 WorkCentres.php:145 includes/InputSerialItems.php:110
#: includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
#, php-format
@@ -466,11 +465,11 @@
#: AccountGroups.php:323 AccountSections.php:200 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
+#: BOMs.php:161 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
#: Credit_Invoice.php:409 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:994 CustomerTypes.php:206 Customers.php:1166
+#: CustomerReceipt.php:993 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
#: GLAccounts.php:318 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
@@ -478,29 +477,29 @@
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1114
-#: PcAssignCashToTab.php:292 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
-#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
+#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1156
+#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PcExpensesTypeTab.php:187 PcTabs.php:257 PcTypeTabs.php:181
#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
-#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
-#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
-#: SelectCustomer.php:617 SelectCustomer.php:636 SelectCustomer.php:666
-#: SelectCustomer.php:684 SelectCustomer.php:708 SelectCustomer.php:725
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
+#: SelectCustomer.php:681 SelectCustomer.php:700 SelectCustomer.php:747
+#: SelectCustomer.php:765 SelectCustomer.php:789 SelectCustomer.php:806
#: SelectOrderItems.php:1381 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
+#: SuppTransGLAnalysis.php:127 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
+#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:369 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: WWW_Users.php:369 WorkCentres.php:146 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
@@ -567,13 +566,13 @@
#: AccountGroups.php:462 AccountSections.php:268 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
+#: BOMs.php:833 BankAccounts.php:433 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:647
#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
+#: Manufacturers.php:375 OffersReceived.php:57 OffersReceived.php:146
#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
@@ -581,12 +580,12 @@
#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:283
+#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:289
msgid "Enter Information"
msgstr "أدخل المعلومات"
#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
-#: includes/MainMenuLinksArray.php:396
+#: includes/MainMenuLinksArray.php:398
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -644,8 +643,8 @@
msgid "Could not retrieve the requested section please try again."
msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:608
-#: SelectCustomer.php:643
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:672
+#: SelectCustomer.php:724
msgid "Customer Contacts"
msgstr ""
@@ -681,11 +680,11 @@
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PO_Items.php:380
#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
-#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
+#: PcTabs.php:124 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:589 SupplierTypes.php:68
+#: SelectQASamples.php:85 Stocks.php:594 SupplierTypes.php:68
#: Suppliers.php:531
msgid "has been updated"
msgstr ""
@@ -703,8 +702,8 @@
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
-#: SelectCustomer.php:611 StockDispatch.php:275 StockDispatch.php:286
-#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
+#: SelectCustomer.php:675 StockDispatch.php:277 StockDispatch.php:288
+#: StockDispatch.php:299 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:161
#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
@@ -712,7 +711,7 @@
msgstr ""
#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1119
-#: Customers.php:1127 SelectCustomer.php:612 WWW_Access.php:113
+#: Customers.php:1127 SelectCustomer.php:676 WWW_Access.php:113
#: WWW_Access.php:179
msgid "Role"
msgstr ""
@@ -731,8 +730,8 @@
#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
-#: PrintCustTransPortrait.php:1095 SelectCustomer.php:429
-#: SelectCustomer.php:614 SelectSupplier.php:290 SupplierContacts.php:156
+#: PrintCustTransPortrait.php:1095 SelectCustomer.php:493
+#: SelectCustomer.php:678 SelectSupplier.php:290 SupplierContacts.php:156
#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:322
#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:85
@@ -743,12 +742,12 @@
msgstr ""
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250
-#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:132
+#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:123
#: Customers.php:1122 Customers.php:1130 PDFQuotation.php:252
-#: PDFQuotationPortrait.php:249 PcAssignCashToTab.php:253
-#: PcAssignCashToTab.php:391 PcAuthorizeExpenses.php:97
+#: PDFQuotationPortrait.php:249 PcAssignCashToTab.php:256
+#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
#: PcClaimExpensesFromTab.php:238 PcClaimExpensesFromTab.php:405
-#: PcReportTab.php:333 SelectCustomer.php:615 ShopParameters.php:198
+#: PcReportTab.php:333 SelectCustomer.php:679 ShopParameters.php:198
#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -771,9 +770,9 @@
msgid "Contact Name"
msgstr ""
-#: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:245
-#: SelectCustomer.php:427 SelectOrderItems.php:597
+#: AddCustomerContacts.php:232 Contracts.php:788 PDFRemittanceAdvice.php:247
+#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
+#: SelectCustomer.php:491 SelectOrderItems.php:597
#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:84
#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
@@ -781,8 +780,8 @@
msgid "Phone"
msgstr ""
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:658
-#: SelectCustomer.php:691
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:739
+#: SelectCustomer.php:772
msgid "Customer Notes"
msgstr ""
@@ -822,13 +821,13 @@
#: CustomerAllocations.php:378 CustomerInquiry.php:251
#: CustomerTransInquiry.php:100 GLAccountReport.php:347 GLTransInquiry.php:47
#: GoodsReceived.php:130 MRPCalendar.php:219 PDFRemittanceAdvice.php:308
-#: PDFWOPrint.php:450 PaymentAllocations.php:66 PcAssignCashToTab.php:249
+#: PDFWOPrint.php:450 PaymentAllocations.php:66 PcAssignCashToTab.php:252
#: PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
-#: SelectCustomer.php:661 SelectCustomer.php:703 ShipmentCosting.php:538
-#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:277
-#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92
+#: SelectCustomer.php:742 SelectCustomer.php:784 ShipmentCosting.php:538
+#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:279
+#: StockDispatch.php:290 StockDispatch.php:301 StockLocMovements.php:92
#: StockMovements.php:105 StockSerialItemResearch.php:82
#: SupplierAllocations.php:456 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierInquiry.php:210
@@ -842,8 +841,8 @@
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
-#: SelectCustomer.php:662 SelectCustomer.php:704 StockClone.php:926
-#: Stocks.php:1260 UpgradeDatabase.php:244 UpgradeDatabase.php:247
+#: SelectCustomer.php:743 SelectCustomer.php:785 StockClone.php:942
+#: Stocks.php:1270 UpgradeDatabase.php:244 UpgradeDatabase.php:247
#: UpgradeDatabase.php:250 UpgradeDatabase.php:253 UpgradeDatabase.php:256
#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
#: UpgradeDatabase.php:268 Z_Upgrade_3.10-3.11.php:62
@@ -861,7 +860,7 @@
#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
-#: SelectCustomer.php:664 SelectCustomer.php:706
+#: SelectCustomer.php:745 SelectCustomer.php:787
msgid "Priority"
msgstr ""
@@ -882,7 +881,7 @@
msgid "Contact Note"
msgstr ""
-#: AddCustomerTypeNotes.php:5 SelectCustomer.php:700
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:781
msgid "Customer Type (Group) Notes"
msgstr ""
@@ -898,7 +897,7 @@
msgid "The contacts notes may not be empty"
msgstr ""
-#: AddCustomerTypeNotes.php:48 SelectCustomer.php:732
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:813
msgid "Customer Group Notes"
msgstr ""
@@ -943,7 +942,7 @@
#: MRPCreateDemands.php:193 MRPDemandTypes.php:17 MRPDemands.php:27
#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevel.php:194
-#: ReorderLevelLocation.php:12 SelectProduct.php:89 StockDispatch.php:319
+#: ReorderLevelLocation.php:12 SelectProduct.php:90 StockDispatch.php:321
#: StockMovements.php:22 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:20 StockSerialItemResearch.php:9
#: StockSerialItems.php:9 StockStatus.php:45 StockTransferControlled.php:14
@@ -964,7 +963,7 @@
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:567 BOMs.php:914 CollectiveWorkOrderCost.php:45
+#: BOMInquiry.php:198 BOMs.php:576 BOMs.php:932 CollectiveWorkOrderCost.php:45
#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
@@ -984,19 +983,19 @@
#: MaterialsNotUsed.php:35 NoSalesItems.php:194 PDFCOA.php:64
#: PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335
#: PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82 PO_Items.php:716
-#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:308 PO_SelectPurchOrder.php:214
+#: PO_Items.php:1189 PO_SelectOSPurchOrder.php:310 PO_SelectPurchOrder.php:214
#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
-#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:509
+#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:549
#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1479
-#: SelectOrderItems.php:1641 SelectProduct.php:538 SelectProduct.php:826
+#: SelectCreditItems.php:1019 SelectOrderItems.php:1479
+#: SelectOrderItems.php:1641 SelectProduct.php:542 SelectProduct.php:830
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
-#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:679
-#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:176
-#: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92
+#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
+#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
+#: StockQuantityByDate.php:109 Stocks.php:1018 SuppCreditGRNs.php:92
#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:122
#: SuppInvGRNs.php:264 SuppPriceList.php:309 SupplierCredit.php:317
#: SupplierCredit.php:385 SupplierInvoice.php:668 SupplierInvoice.php:750
@@ -1005,8 +1004,8 @@
#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853
#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687
#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
-#: WorkCentres.php:128 WorkOrderCosting.php:98 WorkOrderCosting.php:130
-#: WorkOrderEntry.php:735 WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33
+#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
+#: WorkOrderEntry.php:735 WorkOrderIssue.php:785 Z_ItemsWithoutPicture.php:35
#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
#: includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
@@ -1053,10 +1052,10 @@
#: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
-#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692
-#: SelectCreditItems.php:696 SelectOrderItems.php:1319
+#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693
+#: SelectCreditItems.php:697 SelectOrderItems.php:1319
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
-#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
+#: SuppTransGLAnalysis.php:140 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
#: SupplierCredit.php:407 SupplierInquiry.php:215 Tax.php:250
#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
@@ -1079,11 +1078,11 @@
msgid "Aged Customer Balances"
msgstr ""
-#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:434
+#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
msgid "Aged Customer Account Analysis"
msgstr ""
-#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:434
+#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:433
#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
@@ -1106,7 +1105,7 @@
#: PDFWeeklyOrders.php:15 PurchaseByPrefSupplier.php:399
#: PurchaseByPrefSupplier.php:447 PurchaseByPrefSupplier.php:471
#: PurchaseByPrefSupplier.php:500 PurchaseByPrefSupplier.php:531
-#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:45
+#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:46
#: StockCheck.php:60 StockCheck.php:132 SuppPriceList.php:138
#: SupplierTenderCreate.php:671 SupplierTenders.php:397
#: includes/PDFPaymentRun_PymtFooter.php:152
@@ -1119,7 +1118,7 @@
msgid "The customer details could not be retrieved by the SQL because"
msgstr ""
-#: AgedDebtors.php:270 AgedDebtors.php:372 AgedDebtors.php:437
+#: AgedDebtors.php:270 AgedDebtors.php:372 AgedDebtors.php:436
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
@@ -1128,7 +1127,7 @@
#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:155
#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203
#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170
-#: GLTrialBalance.php:182 GetStockImage.php:150 InventoryPlanning.php:102
+#: GLTrialBalance.php:182 GetStockImage.php:143 InventoryPlanning.php:102
#: InventoryPlanning.php:179 InventoryPlanning.php:216
#: InventoryPlanning.php:265 InventoryPlanning.php:340
#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
@@ -1183,7 +1182,7 @@
msgstr ""
#: AgedDebtors.php:371 AgedSuppliers.php:197 Dashboard.php:256
-#: GLAccountCSV.php:179 GLAccountInquiry.php:167 GLAccountReport.php:97
+#: GLAccountCSV.php:179 GLAccountInquiry.php:173 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
@@ -1195,23 +1194,23 @@
#: AgedDebtors.php:374 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:200
#: Areas.php:94 ConfirmDispatch_Invoice.php:172
#: ConfirmDispatch_Invoice.php:1005 ConfirmDispatch_Invoice.php:1019
-#: Contracts.php:592 CounterReturns.php:1024 CounterReturns.php:1038
+#: Contracts.php:599 CounterReturns.php:1024 CounterReturns.php:1038
#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:754
#: Credit_Invoice.php:775 CustItem.php:73 CustItem.php:86 CustItem.php:197
-#: CustomerReceipt.php:580 CustomerReceipt.php:733 CustomerReceipt.php:761
+#: CustomerReceipt.php:579 CustomerReceipt.php:732 CustomerReceipt.php:760
#: CustomerTransInquiry.php:91 Dashboard.php:259 Dashboard.php:440
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
-#: PDFRemittanceAdvice.php:85 Payments.php:361 PurchData.php:114
+#: PDFRemittanceAdvice.php:85 Payments.php:389 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387 SMTPServer.php:66
-#: SelectCreditItems.php:1447 SelectSalesOrder.php:209
+#: SelectCreditItems.php:1454 SelectSalesOrder.php:209
#: SelectSalesOrder.php:375 SellThroughSupport.php:81
-#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430
-#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88
+#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:446
+#: StockClone.php:520 StockCostUpdate.php:78 StockCostUpdate.php:88
#: StockLocStatus.php:167 StockLocTransferReceive.php:215
#: StockLocTransferReceive.php:368 StockMovements.php:98
#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285
-#: StockTransfers.php:202 StockTransfers.php:232 StockTransfers.php:387
+#: StockTransfers.php:202 StockTransfers.php:232 StockTransfers.php:388
#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:79
#: SupplierInquiry.php:101 SupplierInquiry.php:139 SupplierInquiry.php:195
@@ -1232,72 +1231,72 @@
msgid "The SQL that failed was"
msgstr ""
-#: AgedDebtors.php:436
+#: AgedDebtors.php:435
msgid ""
"There are no customers with balances meeting the criteria specified to list"
msgstr ""
-#: AgedDebtors.php:447
+#: AgedDebtors.php:446
msgid "Aged Debtor Analysis"
msgstr ""
-#: AgedDebtors.php:465 DebtorsAtPeriodEnd.php:142
+#: AgedDebtors.php:464 DebtorsAtPeriodEnd.php:142
msgid "From Customer Code"
msgstr ""
-#: AgedDebtors.php:466
+#: AgedDebtors.php:465
msgid "Enter the first customer code alphabetically to include in the report"
msgstr ""
-#: AgedDebtors.php:469 DebtorsAtPeriodEnd.php:146
+#: AgedDebtors.php:468 DebtorsAtPeriodEnd.php:146
msgid "To Customer Code"
msgstr ""
-#: AgedDebtors.php:470
+#: AgedDebtors.php:469
msgid "Enter the last customer code alphabetically to include in the report"
msgstr ""
-#: AgedDebtors.php:473 AgedSuppliers.php:295
+#: AgedDebtors.php:472 AgedSuppliers.php:295
msgid "All balances or overdues only"
msgstr ""
-#: AgedDebtors.php:475
+#: AgedDebtors.php:474
msgid "All customers with balances"
msgstr ""
-#: AgedDebtors.php:476 AgedSuppliers.php:298
+#: AgedDebtors.php:475 AgedSuppliers.php:298
msgid "Overdue accounts only"
msgstr ""
-#: AgedDebtors.php:477
+#: AgedDebtors.php:476
msgid "Held accounts only"
msgstr ""
-#: AgedDebtors.php:482
+#: AgedDebtors.php:481
msgid "Only Show Customers Of"
msgstr ""
-#: AgedDebtors.php:493
+#: AgedDebtors.php:492
msgid "All Sales people"
msgstr ""
-#: AgedDebtors.php:501
+#: AgedDebtors.php:500
msgid "Only show customers trading in"
msgstr ""
-#: AgedDebtors.php:517
+#: AgedDebtors.php:516
msgid "Summary or detailed report"
msgstr ""
-#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:266
+#: AgedDebtors.php:518 AgedSuppliers.php:320 InventoryValuation.php:266
msgid "Summary Report"
msgstr ""
-#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:267
+#: AgedDebtors.php:519 AgedSuppliers.php:321 InventoryValuation.php:267
msgid "Detailed Report"
msgstr ""
-#: AgedDebtors.php:527 AgedSuppliers.php:327 BOMExtendedQty.php:289
+#: AgedDebtors.php:526 AgedSuppliers.php:327 BOMExtendedQty.php:289
#: BOMIndented.php:278 BOMIndentedReverse.php:255 BOMListing.php:131
#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:521
#: InventoryPlanningPrefSupplier.php:437 InventoryQuantities.php:210
@@ -1306,7 +1305,7 @@
#: OutstandingGRNs.php:280 PDFCustomerList.php:421 PDFLowGP.php:146
#: PDFPriceList.php:351 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:373 PrintCustTrans.php:564
-#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447
+#: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:449
#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385
msgid "Print PDF"
msgstr ""
@@ -1376,11 +1375,11 @@
msgstr ""
#: AnalysisHorizontalIncome.php:10 AnalysisHorizontalPosition.php:10
-#: BOMs.php:126 BOMs.php:132 BOMs.php:140 BOMs.php:932 BankAccounts.php:369
-#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:627
+#: BOMs.php:127 BOMs.php:133 BOMs.php:141 BOMs.php:950 BankAccounts.php:369
+#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:651
#: PaymentTerms.php:190 PaymentTerms.php:196 SalesAnalReptCols.php:285
-#: SelectProduct.php:135 SelectProduct.php:184 SelectProduct.php:244
-#: SelectProduct.php:245 SelectProduct.php:846
+#: SelectProduct.php:136 SelectProduct.php:186 SelectProduct.php:247
+#: SelectProduct.php:248 SelectProduct.php:850
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
@@ -1390,7 +1389,7 @@
#: AnalysisHorizontalIncome.php:15 AnalysisHorizontalIncome.php:31
#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
-#: includes/MainMenuLinksArray.php:376
+#: includes/MainMenuLinksArray.php:378
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
@@ -1440,33 +1439,33 @@
msgid "Select period to"
msgstr ""
-#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:72
+#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:63
msgid "Detail or summary"
msgstr ""
-#: AnalysisHorizontalIncome.php:106 AnalysisHorizontalPosition.php:73
+#: AnalysisHorizontalIncome.php:106 AnalysisHorizontalPosition.php:64
#: GLBalanceSheet.php:60
msgid "Selecting Summary will show on the totals at the account group level"
msgstr ""
#: AnalysisHorizontalIncome.php:107 AnalysisHorizontalIncome.php:158
-#: AnalysisHorizontalPosition.php:74 AnalysisHorizontalPosition.php:121
+#: AnalysisHorizontalPosition.php:65 AnalysisHorizontalPosition.php:112
#: EDIMessageFormat.php:224 EDIMessageFormat.php:226 GLBalanceSheet.php:61
#: GLProfit_Loss.php:109 GLTagProfit_Loss.php:120 POReport.php:1521
#: SalesInquiry.php:1070 Tax.php:433
msgid "Summary"
msgstr ""
-#: AnalysisHorizontalIncome.php:108 AnalysisHorizontalPosition.php:75
+#: AnalysisHorizontalIncome.php:108 AnalysisHorizontalPosition.php:66
#: GLBalanceSheet.php:62 GLProfit_Loss.php:110 GLTagProfit_Loss.php:121
msgid "All Accounts"
msgstr ""
-#: AnalysisHorizontalIncome.php:112 AnalysisHorizontalPosition.php:79
+#: AnalysisHorizontalIncome.php:112 AnalysisHorizontalPosition.php:70
msgid "Show all accounts including zero balances"
msgstr ""
-#: AnalysisHorizontalIncome.php:113 AnalysisHorizontalPosition.php:80
+#: AnalysisHorizontalIncome.php:113 AnalysisHorizontalPosition.php:71
#: GLBalanceSheet.php:67 GLProfit_Loss.php:116
msgid ""
"Check this box to display all accounts including those accounts with no "
@@ -1474,13 +1473,13 @@
msgstr ""
#: AnalysisHorizontalIncome.php:118 AnalysisHorizontalIncome.php:119
-#: AnalysisHorizontalPosition.php:85 AnalysisHorizontalPosition.php:86
+#: AnalysisHorizontalPosition.php:76 AnalysisHorizontalPosition.php:77
#: GLBalanceSheet.php:73 GLProfit_Loss.php:121
msgid "Show on Screen (HTML)"
msgstr ""
#: AnalysisHorizontalIncome.php:121 AnalysisHorizontalIncome.php:522
-#: AnalysisHorizontalPosition.php:88 AnalysisHorizontalPosition.php:371
+#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
#: DailyBankTransactions.php:255 GLAccountUsers.php:253 GLBalanceSheet.php:720
#: GLProfit_Loss.php:1317 GLTrialBalance.php:740 UserGLAccounts.php:259
msgid "Return"
@@ -1519,9 +1518,9 @@
msgid "months to"
msgstr ""
-#: AnalysisHorizontalIncome.php:150 AnalysisHorizontalPosition.php:113
-#: Contracts.php:829 CustomerAccount.php:230 CustomerInquiry.php:162
-#: CustomerReceipt.php:1029 GLBalanceSheet.php:404 GLProfit_Loss.php:626
+#: AnalysisHorizontalIncome.php:150 AnalysisHorizontalPosition.php:104
+#: Contracts.php:836 CustomerAccount.php:230 CustomerInquiry.php:162
+#: CustomerReceipt.php:1028 GLBalanceSheet.php:404 GLProfit_Loss.php:626
#: PDFRemittanceAdvice.php:275 PO_Header.php:609 PrintCustTrans.php:776
#: PrintCustTransPortrait.php:933 SupplierInquiry.php:121
#: includes/PDFQuotationPageHeader.inc:88
@@ -1532,7 +1531,7 @@
msgid "All amounts stated in"
msgstr ""
-#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:118
+#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:109
#: GLAccountInquiry.php:49 GLAccounts.php:196 GLBalanceSheet.php:410
#: GLProfit_Loss.php:635 GLTagProfit_Loss.php:537 GLTrialBalance.php:452
#: ImportBankTransAnalysis.php:206 PrintCustTransPortrait.php:96
@@ -1543,7 +1542,7 @@
msgid "Account"
msgstr ""
-#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:119
+#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:110
#: Dashboard.php:533 GLAccounts.php:242 GLAccounts.php:295
#: GLBalanceSheet.php:411 GLCodesInquiry.php:27 GLProfit_Loss.php:636
#: GLTagProfit_Loss.php:538 GLTrialBalance.php:453 SelectGLAccount.php:126
@@ -1555,19 +1554,19 @@
msgid "Account Name"
msgstr ""
-#: AnalysisHorizontalIncome.php:161 AnalysisHorizontalPosition.php:124
-#: GLBalanceSheet.php:413 GLBalanceSheet.php:419 GLProfit_Loss.php:639
-#: GLProfit_Loss.php:646 includes/PDFBalanceSheetPageHeader.inc:30
-#: includes/PDFProfitAndLossPageHeader.inc:35
-#: includes/PDFTagProfitAndLossPageHeader.inc:37
-msgid "Last Year"
+#: AnalysisHorizontalIncome.php:160 AnalysisHorizontalPosition.php:114
+msgid "Current period"
msgstr ""
-#: AnalysisHorizontalIncome.php:162 AnalysisHorizontalPosition.php:125
+#: AnalysisHorizontalIncome.php:161 AnalysisHorizontalPosition.php:115
+msgid "Last period"
+msgstr ""
+
+#: AnalysisHorizontalIncome.php:162 AnalysisHorizontalPosition.php:116
msgid "Actual change"
msgstr ""
-#: AnalysisHorizontalIncome.php:163 AnalysisHorizontalPosition.php:126
+#: AnalysisHorizontalIncome.php:163 AnalysisHorizontalPosition.php:117
msgid "Relative change"
msgstr ""
@@ -1578,14 +1577,14 @@
"net profit."
msgstr ""
-#: AnalysisHorizontalIncome.php:171 AnalysisHorizontalPosition.php:134
+#: AnalysisHorizontalIncome.php:171 AnalysisHorizontalPosition.php:125
msgid ""
"Relative change signs: a positive number indicates an increase in the amount "
"of that account; a negative number indicates a decrease in the amount of "
"that account."
msgstr ""
-#: AnalysisHorizontalIncome.php:200 AnalysisHorizontalPosition.php:175
+#: AnalysisHorizontalIncome.php:200 AnalysisHorizontalPosition.php:166
#: GLBalanceSheet.php:154 GLBalanceSheet.php:392 GLCodesInquiry.php:18
#: GLProfit_Loss.php:190 GLProfit_Loss.php:613 GLTagProfit_Loss.php:197
#: GLTagProfit_Loss.php:516 GLTrialBalance.php:169 GLTrialBalance.php:438
@@ -1604,13 +1603,13 @@
msgstr ""
#: AnalysisHorizontalIncome.php:312 AnalysisHorizontalIncome.php:481
-#: Contracts.php:937 GLProfit_Loss.php:324 GLProfit_Loss.php:517
+#: Contracts.php:949 GLProfit_Loss.php:324 GLProfit_Loss.php:517
#: GLProfit_Loss.php:831 GLProfit_Loss.php:1188 GLTagProfit_Loss.php:310
#: GLTagProfit_Loss.php:448 GLTagProfit_Loss.php:685 GLTagProfit_Loss.php:884
#: PDFPriceList.php:431 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
#: SalesByTypePeriodInquiry.php:362 SalesCategoryPeriodInquiry.php:169
#: SalesGraph.php:196 SalesGraph.php:215 SalesGraph.php:278
-#: SelectProduct.php:179
+#: SelectProduct.php:181
#, php-format
msgid "Gross Profit"
msgstr ""
@@ -1623,14 +1622,15 @@
msgid "Net Profit"
msgstr ""
-#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:367
-#: DailyBankTransactions.php:249 GLAccountUsers.php:248 GLBalanceSheet.php:716
-#: GLProfit_Loss.php:1313 GLTrialBalance.php:736 UserGLAccounts.php:254
+#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:358
+#: BOMs.php:836 CustWhereAlloc.php:196 DailyBankTransactions.php:249
+#: GLAccountUsers.php:248 GLBalanceSheet.php:716 GLProfit_Loss.php:1313
+#: GLTrialBalance.php:736 SuppWhereAlloc.php:194 UserGLAccounts.php:254
msgid "Print This"
msgstr ""
#: AnalysisHorizontalIncome.php:519 AnalysisHorizontalIncome.php:520
-#: AnalysisHorizontalPosition.php:368 AnalysisHorizontalPosition.php:369
+#: AnalysisHorizontalPosition.php:359 AnalysisHorizontalPosition.php:360
#: DailyBankTransactions.php:250 GLBalanceSheet.php:717 GLProfit_Loss.php:1314
#: GLProfit_Loss.php:1315 GLTagProfit_Loss.php:939 GLTrialBalance.php:24
#: GLTrialBalance.php:737 GLTrialBalance.php:738 SalesGraph.php:20
@@ -1639,8 +1639,8 @@
msgstr ""
#: AnalysisHorizontalPosition.php:15 AnalysisHorizontalPosition.php:28
-#: AnalysisHorizontalPosition.php:109 AnalysisHorizontalPosition.php:110
-#: includes/MainMenuLinksArray.php:377
+#: AnalysisHorizontalPosition.php:100 AnalysisHorizontalPosition.php:101
+#: includes/MainMenuLinksArray.php:379
msgid "Horizontal Analysis of Statement of Financial Position"
msgstr ""
@@ -1652,26 +1652,26 @@
msgid "Select the balance date"
msgstr ""
-#: AnalysisHorizontalPosition.php:112 GLBalanceSheet.php:403
+#: AnalysisHorizontalPosition.php:103 GLBalanceSheet.php:403
#: includes/PDFDebtorBalsPageHeader.inc:17
#: includes/PDFSupplierBalsPageHeader.inc:17
msgid "as at"
msgstr ""
-#: AnalysisHorizontalPosition.php:133
+#: AnalysisHorizontalPosition.php:124
msgid ""
"Actual change signs: a positive number indicates a source of funds; a "
"negative number indicates an application of funds."
msgstr ""
-#: AnalysisHorizontalPosition.php:148 GLBalanceSheet.php:114
+#: AnalysisHorizontalPosition.php:139 GLBalanceSheet.php:114
#: GLBalanceSheet.php:365
msgid ""
"The accumulated profits brought forward could not be calculated by the SQL "
"because"
msgstr ""
-#: AnalysisHorizontalPosition.php:351 GLBalanceSheet.php:326
+#: AnalysisHorizontalPosition.php:342 GLBalanceSheet.php:326
#: GLBalanceSheet.php:696
#, php-format
msgid "Check Total"
@@ -1744,10 +1744,10 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:196
#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250
-#: Manufacturers.php:163 PcAssignCashToTab.php:149
+#: Manufacturers.php:197 PcAssignCashToTab.php:149
#: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101
-#: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215
-#: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:233
+#: PcTabs.php:188 PcTypeTabs.php:143 SalesAnalReptCols.php:215
+#: SalesCategories.php:158 SalesTypes.php:156 StockCategories.php:233
#: SupplierTypes.php:132 Suppliers.php:672 Z_DeleteInvoice.php:178
#: includes/DefineOfferClass.php:134
msgid "has been deleted"
@@ -1813,15 +1813,15 @@
#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225
#: PDFPriceList.php:324 POReport.php:1600 PO_Items.php:1126
#: PO_SelectOSPurchOrder.php:185 PO_SelectOSPurchOrder.php:195
-#: PO_SelectOSPurchOrder.php:208 PO_SelectOSPurchOrder.php:276
+#: PO_SelectOSPurchOrder.php:208 PO_SelectOSPurchOrder.php:278
#: ReorderLevel.php:212 ReorderLevel.php:214 ReorderLevel.php:244
#: ReorderLevel.php:246 SalesGraph.php:103 SalesGraph.php:105
#: SalesGraph.php:125 SalesGraph.php:127 SalesGraph.php:149 SalesGraph.php:151
#: SalesGraph.php:187 SalesInquiry.php:1096 SalesInquiry.php:1159
-#: SelectCreditItems.php:985 SelectOrderItems.php:1577
-#: SelectOrderItems.php:1580 SelectProduct.php:526 SelectProduct.php:528
+#: SelectCreditItems.php:983 SelectOrderItems.php:1577
+#: SelectOrderItems.php:1580 SelectProduct.php:530 SelectProduct.php:532
#: StockCategorySalesInquiry.php:35 StockCategorySalesInquiry.php:37
-#: StockDispatch.php:82 StockDispatch.php:394 StockDispatch.php:396
+#: StockDispatch.php:82 StockDispatch.php:396 StockDispatch.php:398
#: StockLocStatus.php:74 StockLocStatus.php:76 StockLocStatus.php:94
#: StockLocStatus.php:99 StockLocStatus.php:104 StockLocStatus.php:109
#: StockQuantityByDate.php:25 SupplierPriceList.php:22
@@ -1832,7 +1832,7 @@
#: SystemParameters.php:1131 SystemParameters.php:1137
#: SystemParameters.php:1143 TopItems.php:32 TopItems.php:49 TopItems.php:71
#: TopItems.php:73 WorkOrderEntry.php:677 WorkOrderEntry.php:680
-#: WorkOrderIssue.php:716 WorkOrderIssue.php:719
+#: WorkOrderIssue.php:740 WorkOrderIssue.php:743
#: reportwriter/languages/en_US/reports.php:54
msgid "All"
msgstr ""
@@ -1847,7 +1847,7 @@
#: AuditTrail.php:90 GLAccountUsers.php:152 InternalStockRequest.php:593
#: LocationUsers.php:176 MRPReport.php:807 PO_SelectPurchOrder.php:432
-#: SelectContract.php:187 SelectProduct.php:861 UserGLAccounts.php:158
+#: SelectContract.php:187 SelectProduct.php:865 UserGLAccounts.php:158
#: UserLocations.php:177
msgid "View"
msgstr ""
@@ -1867,15 +1867,16 @@
msgstr ""
#: AuditTrail.php:177 BankReconciliation.php:213 BankReconciliation.php:290
-#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAccount.php:250
+#: CustWhereAlloc.php:26 CustWhereAlloc.php:135 CustomerAccount.php:250
#: CustomerAllocations.php:376 CustomerInquiry.php:249
#: CustomerPurchases.php:82 CustomerTransInquiry.php:21
#: CustomerTransInquiry.php:98 DailyBankTransactions.php:153
-#: GLAccountInquiry.php:177 GLAccountReport.php:345 GLJournal.php:266
+#: GLAccountInquiry.php:187 GLAccountReport.php:345 GLJournal.php:266
#: MRPReschedules.php:194 ProductSpecs.php:388 QATests.php:257 QATests.php:395
-#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:426
+#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:490
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
-#: StockMovements.php:103 SupplierAllocations.php:454 SupplierInquiry.php:211
+#: StockMovements.php:103 SuppWhereAlloc.php:24 SuppWhereAlloc.php:133
+#: SupplierAllocations.php:454 SupplierInquiry.php:211
#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:108 Tax.php:409
#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11
@@ -1901,7 +1902,7 @@
msgid "Value"
msgstr ""
-#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:571
+#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:573
msgid "Translate Item Descriptions"
msgstr ""
@@ -1914,20 +1915,20 @@
msgid "#"
msgstr ""
-#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:566
-#: BOMs.php:913 CollectiveWorkOrderCost.php:316 ContractBOM.php:353
+#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:575
+#: BOMs.php:931 CollectiveWorkOrderCost.php:316 ContractBOM.php:353
#: CounterReturns.php:1691 CounterSales.php:2101 CounterSales.php:2255
-#: CustItem.php:297 CustomerBranches.php:408 CustomerReceipt.php:1209
+#: CustItem.php:297 CustomerBranches.php:408 CustomerReceipt.php:1208
#: GLCodesInquiry.php:26 InternalStockRequest.php:558
#: InternalStockRequest.php:628 MRPDemands.php:91 MRPPlannedWorkOrders.php:257
#: MRPReport.php:777 MaterialsNotUsed.php:34 NoSalesItems.php:193
#: PDFOrderStatus.php:336 PDFOrdersInvoiced.php:334 PO_Header.php:561
-#: PO_Items.php:1188 PO_SelectOSPurchOrder.php:307 PO_SelectPurchOrder.php:213
+#: PO_Items.php:1188 PO_SelectOSPurchOrder.php:309 PO_SelectPurchOrder.php:213
#: PricesByCost.php:152 PurchData.php:469 RelatedItemsUpdate.php:153
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
-#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
-#: SelectCustomer.php:422 SelectGLAccount.php:125 SelectOrderItems.php:1478
-#: SelectOrderItems.php:1640 SelectProduct.php:321 SelectProduct.php:825
+#: SelectCompletedOrder.php:504 SelectCreditItems.php:1018
+#: SelectCustomer.php:486 SelectGLAccount.php:125 SelectOrderItems.php:1478
+#: SelectOrderItems.php:1640 SelectProduct.php:324 SelectProduct.php:829
#: SelectQASamples.php:298 SelectSalesOrder.php:559 SelectSupplier.php:282
#: SelectWorkOrder.php:218 SellThroughSupport.php:159 Shipt_Select.php:190
#: SpecialOrder.php:148 StockCategories.php:263 SuppPriceList.php:308
@@ -1935,7 +1936,7 @@
#: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852
#: SupplierTenders.php:686 TestPlanResults.php:176 TopItems.php:169
#: UserBankAccounts.php:160 UserGLAccounts.php:156 UserLocations.php:175
-#: WorkOrderEntry.php:734 WorkOrderIssue.php:760
+#: WorkOrderEntry.php:734 WorkOrderIssue.php:784
#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75
#: ../webSHOP/ItemDetails.php:72
msgid "Code"
@@ -1946,7 +1947,7 @@
#: POReport.php:519 POReport.php:1535 PcReportTab.php:269
#: SalesAnalRepts.php:436 SalesAnalRepts.php:464 SalesAnalRepts.php:493
#: SalesAnalRepts.php:512 SalesInquiry.php:798 SalesInquiry.php:1107
-#: StockDispatch.php:513 StockLocTransferReceive.php:106
+#: StockDispatch.php:515 StockLocTransferReceive.php:106
#: SupplierTransInquiry.php:56 includes/PO_PDFOrderPageHeader.inc:40
#: reportwriter/languages/en_US/reports.php:105
msgid "To"
@@ -2001,10 +2002,10 @@
#: BOMExtendedQty.php:267 BOMExtendedQty.php:334 BOMExtendedQty.php:335
#: BOMExtendedQty.php:336 BOMExtendedQty.php:337 BOMIndented.php:318
-#: BOMIndentedReverse.php:296 BOMInquiry.php:199 BOMs.php:570 BOMs.php:764
+#: BOMIndentedReverse.php:296 BOMInquiry.php:199 BOMs.php:579 BOMs.php:775
#: ContractBOM.php:243 ContractBOM.php:357 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:99
-#: Contracts.php:994 Contracts.php:1030 CounterReturns.php:669
+#: Contracts.php:1006 Contracts.php:1042 CounterReturns.php:669
#: CounterReturns.php:1698 CounterReturns.php:1797 CounterSales.php:749
#: CounterSales.php:2108 CounterSales.php:2262 CounterSales.php:2365
#: Credit_Invoice.php:295 CustomerPurchases.php:87 DeliveryDetails.php:880
@@ -2018,14 +2019,14 @@
#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:173
#: PDFOrdersInvoiced.php:377 PDFSalesBySalesperson.php:87
#: PDFWeeklyOrders.php:83 POReport.php:770 POReport.php:1463
-#: PO_SelectOSPurchOrder.php:590 PrintCustTrans.php:859
+#: PO_SelectOSPurchOrder.php:586 PrintCustTrans.php:859
#: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047
#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:155
#: RecurringSalesOrders.php:331 ReorderLevel.php:300 ReverseGRN.php:402
#: ReverseGRN.php:403 SalesAnalReptCols.php:16 SalesAnalReptCols.php:18
#: SalesGraph.php:197 SalesGraph.php:280 SalesInquiry.php:998
#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225
-#: SelectCreditItems.php:687 SelectCreditItems.php:1067
+#: SelectCreditItems.php:688 Sel...
[truncated message content] |
|
From: <dai...@us...> - 2016-04-26 07:59:23
|
Revision: 7497
http://sourceforge.net/p/web-erp/reponame/7497
Author: daintree
Date: 2016-04-26 07:59:21 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
committed Tims change to report writer to allow to work with PHP7
Modified Paths:
--------------
trunk/doc/Change.log
trunk/reportwriter/WriteReport.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-25 21:15:09 UTC (rev 7496)
+++ trunk/doc/Change.log 2016-04-26 07:59:21 UTC (rev 7497)
@@ -1,5 +1,6 @@
webERP Change Log
+26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext.
25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-(
25/4/16 Jan Bakke: Improvements to allow .png and .gif images
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-04-25 21:15:09 UTC (rev 7496)
+++ trunk/reportwriter/WriteReport.inc 2016-04-26 07:59:21 UTC (rev 7497)
@@ -303,10 +303,15 @@
$ThisMonth = mb_substr($Today,5,2);
$ThisYear = mb_substr($Today,0,4);
// find total number of days in this month
- if ($ThisMonth==04 OR $ThisMonth==06 OR $ThisMonth==09 OR $ThisMonth==11) { $TotalDays=30; }
- elseif ($ThisMonth==02 AND date('L', $t)) { $TotalDays=29; } // Leap year
- elseif ($ThisMonth==02 AND !date('L', $t)) { $TotalDays=28; }
- else { $TotalDays=31; }
+ if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') {
+ $TotalDays=30;
+ } elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year
+ $TotalDays=29;
+ } elseif ($ThisMonth==02 AND !date('L', $t)) {
+ $TotalDays=28;
+ } else {
+ $TotalDays=31;
+ }
// Calculate date range
$DateArray=explode(':',$Prefs['DateListings']['params']);
switch ($DateArray[0]) { // based on the date choice selected
|
|
From: <rc...@us...> - 2016-04-25 21:15:11
|
Revision: 7496
http://sourceforge.net/p/web-erp/reponame/7496
Author: rchacon
Date: 2016-04-25 21:15:09 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext. Improve code.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-04-25 10:01:27 UTC (rev 7495)
+++ trunk/Payments.php 2016-04-25 21:15:09 UTC (rev 7496)
@@ -3,43 +3,42 @@
/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
+
include('includes/session.inc');
-
$Title = _('Payment Entry');
-
-if (isset($_GET['SupplierID'])) {
+if(isset($_GET['SupplierID'])) {
$ViewTopic = 'AccountsPayable';
$BookMark = 'SupplierPayments';
} else {
$ViewTopic= 'GeneralLedger';
$BookMark = 'BankAccountPayments';
}
+include('includes/header.inc');
-include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['PaymentCancelled'])) {
+if(isset($_POST['PaymentCancelled'])) {
prnMsg(_('Payment Cancelled since cheque was not printed'), 'warning');
include('includes/footer.inc');
exit();
}
-if (empty($_GET['identifier'])){
+if(empty($_GET['identifier'])) {
/*unique session identifier to ensure that there is no conflict with other order enty session on the same machine */
$identifier=date('U');
-}else{
+} else {
$identifier=$_GET['identifier'];//edit GLItems
}
-if (isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes'){
- unset($_SESSION['PaymentDetail' . $identifier]->GLItems);
- unset($_SESSION['PaymentDetail' . $identifier]);
+if(isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes') {
+ unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
+ unset($_SESSION['PaymentDetail'.$identifier]);
}
-if (!isset($_SESSION['PaymentDetail' . $identifier])){
- $_SESSION['PaymentDetail' . $identifier] = new Payment;
- $_SESSION['PaymentDetail' . $identifier]->GLItemCounter = 1;
+if(!isset($_SESSION['PaymentDetail'.$identifier])) {
+ $_SESSION['PaymentDetail'.$identifier] = new Payment;
+ $_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
}
-if ((isset($_POST['UpdateHeader'])
+if((isset($_POST['UpdateHeader'])
AND $_POST['BankAccount']=='')
OR (isset($_POST['Process']) AND $_POST['BankAccount']=='')) {
@@ -50,22 +49,21 @@
$BankAccountEmpty=false;
}
-echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Payments Entry')
-. '" alt="" />' . ' ' . _('Bank Account Payments Entry') . '
- </p>';
-echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account. <br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="',// Icon image.
+ _('Bank Account Payments Entry'), '" /> ',// Icon title.
+ _('Bank Account Payments Entry'), '</p>';// Page title.
+echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
<br />';
-if (isset($_GET['SupplierID'])){
+if(isset($_GET['SupplierID'])) {
/*The page was called with a supplierID check it is valid and default the inputs for Supplier Name and currency of payment */
- unset($_SESSION['PaymentDetail' . $identifier]->GLItems);
- unset($_SESSION['PaymentDetail' . $identifier]);
- $_SESSION['PaymentDetail' . $identifier] = new Payment;
- $_SESSION['PaymentDetail' . $identifier]->GLItemCounter = 1;
+ unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
+ unset($_SESSION['PaymentDetail'.$identifier]);
+ $_SESSION['PaymentDetail'.$identifier] = new Payment;
+ $_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
-
$SQL= "SELECT suppname,
address1,
address2,
@@ -79,26 +77,26 @@
WHERE supplierid='" . $_GET['SupplierID'] . "'";
$Result = DB_query($SQL);
- if (DB_num_rows($Result)==0){
+ if(DB_num_rows($Result)==0) {
prnMsg( _('The supplier code that this payment page was called with is not a currently defined supplier code') . '. ' . _('If this page is called from the selectSupplier page then this assures that a valid supplier is selected'),'warn');
include('includes/footer.inc');
exit;
} else {
$myrow = DB_fetch_array($Result);
- if ($myrow['factorcompanyid'] == 0) {
- $_SESSION['PaymentDetail' . $identifier]->SuppName = $myrow['suppname'];
- $_SESSION['PaymentDetail' . $identifier]->Address1 = $myrow['address1'];
- $_SESSION['PaymentDetail' . $identifier]->Address2 = $myrow['address2'];
- $_SESSION['PaymentDetail' . $identifier]->Address3 = $myrow['address3'];
- $_SESSION['PaymentDetail' . $identifier]->Address4 = $myrow['address4'];
- $_SESSION['PaymentDetail' . $identifier]->Address5 = $myrow['address5'];
- $_SESSION['PaymentDetail' . $identifier]->Address6 = $myrow['address6'];
- $_SESSION['PaymentDetail' . $identifier]->SupplierID = $_GET['SupplierID'];
- $_SESSION['PaymentDetail' . $identifier]->Currency = $myrow['currcode'];
- $_POST['Currency'] = $_SESSION['PaymentDetail' . $identifier]->Currency;
+ if($myrow['factorcompanyid'] == 0) {
+ $_SESSION['PaymentDetail'.$identifier]->SuppName = $myrow['suppname'];
+ $_SESSION['PaymentDetail'.$identifier]->Address1 = $myrow['address1'];
+ $_SESSION['PaymentDetail'.$identifier]->Address2 = $myrow['address2'];
+ $_SESSION['PaymentDetail'.$identifier]->Address3 = $myrow['address3'];
+ $_SESSION['PaymentDetail'.$identifier]->Address4 = $myrow['address4'];
+ $_SESSION['PaymentDetail'.$identifier]->Address5 = $myrow['address5'];
+ $_SESSION['PaymentDetail'.$identifier]->Address6 = $myrow['address6'];
+ $_SESSION['PaymentDetail'.$identifier]->SupplierID = $_GET['SupplierID'];
+ $_SESSION['PaymentDetail'.$identifier]->Currency = $myrow['currcode'];
+ $_POST['Currency'] = $_SESSION['PaymentDetail'.$identifier]->Currency;
} else {
- $factorsql= "SELECT coyname,
+ $factorsql = "SELECT coyname,
address1,
address2,
address3,
@@ -110,26 +108,26 @@
$FactorResult = DB_query($factorsql);
$myfactorrow = DB_fetch_array($FactorResult);
- $_SESSION['PaymentDetail' . $identifier]->SuppName = $myrow['suppname'] . ' ' . _('care of') . ' ' . $myfactorrow['coyname'];
- $_SESSION['PaymentDetail' . $identifier]->Address1 = $myfactorrow['address1'];
- $_SESSION['PaymentDetail' . $identifier]->Address2 = $myfactorrow['address2'];
- $_SESSION['PaymentDetail' . $identifier]->Address3 = $myfactorrow['address3'];
- $_SESSION['PaymentDetail' . $identifier]->Address4 = $myfactorrow['address4'];
- $_SESSION['PaymentDetail' . $identifier]->Address5 = $myfactorrow['address5'];
- $_SESSION['PaymentDetail' . $identifier]->Address6 = $myfactorrow['address6'];
- $_SESSION['PaymentDetail' . $identifier]->SupplierID = $_GET['SupplierID'];
- $_SESSION['PaymentDetail' . $identifier]->Currency = $myrow['currcode'];
- $_POST['Currency'] = $_SESSION['PaymentDetail' . $identifier]->Currency;
+ $_SESSION['PaymentDetail'.$identifier]->SuppName = $myrow['suppname'] . ' ' . _('care of') . ' ' . $myfactorrow['coyname'];
+ $_SESSION['PaymentDetail'.$identifier]->Address1 = $myfactorrow['address1'];
+ $_SESSION['PaymentDetail'.$identifier]->Address2 = $myfactorrow['address2'];
+ $_SESSION['PaymentDetail'.$identifier]->Address3 = $myfactorrow['address3'];
+ $_SESSION['PaymentDetail'.$identifier]->Address4 = $myfactorrow['address4'];
+ $_SESSION['PaymentDetail'.$identifier]->Address5 = $myfactorrow['address5'];
+ $_SESSION['PaymentDetail'.$identifier]->Address6 = $myfactorrow['address6'];
+ $_SESSION['PaymentDetail'.$identifier]->SupplierID = $_GET['SupplierID'];
+ $_SESSION['PaymentDetail'.$identifier]->Currency = $myrow['currcode'];
+ $_POST['Currency'] = $_SESSION['PaymentDetail'.$identifier]->Currency;
}
- if (isset($_GET['Amount']) AND is_numeric($_GET['Amount'])){
- $_SESSION['PaymentDetail' . $identifier]->Amount = filter_number_format($_GET['Amount']);
+ if(isset($_GET['Amount']) AND is_numeric($_GET['Amount'])) {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = filter_number_format($_GET['Amount']);
}
}
}
-if (isset($_POST['BankAccount']) AND $_POST['BankAccount']!=''){
+if(isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
- $_SESSION['PaymentDetail' . $identifier]->Account=$_POST['BankAccount'];
+ $_SESSION['PaymentDetail'.$identifier]->Account=$_POST['BankAccount'];
/*Get the bank account currency and set that too */
$ErrMsg = _('Could not get the currency of the bank account');
$result = DB_query("SELECT currcode,
@@ -140,40 +138,40 @@
$ErrMsg);
$myrow = DB_fetch_array($result);
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $myrow['currcode']) {
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $myrow['currcode']) {
//then we'd better update the functional exchange rate
$DefaultFunctionalRate = true;
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $myrow['currcode'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
+ $_SESSION['PaymentDetail'.$identifier]->AccountCurrency = $myrow['currcode'];
+ $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
} else {
$DefaultFunctionalRate = false;
}
} else {
- $_SESSION['PaymentDetail' . $identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
- $_SESSION['PaymentDetail' . $identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
+ $_SESSION['PaymentDetail'.$identifier]->AccountCurrency = $_SESSION['CompanyRecord']['currencydefault'];
+ $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces = $_SESSION['CompanyRecord']['decimalplaces'];
}
-if (isset($_POST['DatePaid']) AND $_POST['DatePaid']!='' AND Is_Date($_POST['DatePaid'])){
- $_SESSION['PaymentDetail' . $identifier]->DatePaid = $_POST['DatePaid'];
+if(isset($_POST['DatePaid']) AND $_POST['DatePaid']!='' AND Is_Date($_POST['DatePaid'])) {
+ $_SESSION['PaymentDetail'.$identifier]->DatePaid = $_POST['DatePaid'];
}
-if (isset($_POST['ExRate']) AND $_POST['ExRate']!=''){
- $_SESSION['PaymentDetail' . $identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
+if(isset($_POST['ExRate']) AND $_POST['ExRate']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
}
-if (isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!=''){
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
+if(isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
}
-if (isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Paymenttype = $_POST['Paymenttype'];
+if(isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Paymenttype = $_POST['Paymenttype'];
}
-if (isset($_POST['Currency']) AND $_POST['Currency']!=''){
+if(isset($_POST['Currency']) AND $_POST['Currency']!='') {
/* Payment currency is the currency that is being paid */
- $_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; // Payment currency
+ $_SESSION['PaymentDetail'.$identifier]->Currency=$_POST['Currency']; // Payment currency
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']) {
$_POST['FunctionalExRate']=1;
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate=1;
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=1;
$SuggestedFunctionalExRate =1;
} else {
@@ -187,22 +185,22 @@
*/
/*Get suggested FunctionalExRate - between bank account and home functional currency */
- $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . "'");
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . "'");
$myrow = DB_fetch_row($result);
$SuggestedFunctionalExRate = $myrow[0];
- if ($DefaultFunctionalRate) {
- $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
+ if($DefaultFunctionalRate) {
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
}
}
- if ($_POST['Currency']==$_SESSION['PaymentDetail' . $identifier]->AccountCurrency){
+ if($_POST['Currency']==$_SESSION['PaymentDetail'.$identifier]->AccountCurrency) {
/* if the currency being paid is the same as the bank account currency then default ex rate to 1 */
$_POST['ExRate']=1;
- $_SESSION['PaymentDetail' . $identifier]->ExRate = 1; //ex rate between payment currency and account currency is 1 if they are the same!!
+ $_SESSION['PaymentDetail'.$identifier]->ExRate = 1; //ex rate between payment currency and account currency is 1 if they are the same!!
$SuggestedExRate=1;
} elseif(isset($_POST['Currency'])) {
/*Get the exchange rate between the bank account currency and the payment currency*/
- $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->Currency . "'");
+ $result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency . "'");
$myrow = DB_fetch_row($result);
$TableExRate = $myrow[0]; //this is the rate of exchange between the functional currency and the payment currency
/*Calculate cross rate to suggest appropriate exchange rate between payment currency and account currency */
@@ -210,57 +208,85 @@
}
}
-if (isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!=''){ // Reference on Bank Transactions Inquiry
- $_SESSION['PaymentDetail' . $identifier]->BankTransRef=$_POST['BankTransRef'];
+// Reference in banking transactions:
+if(isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->BankTransRef = $_POST['BankTransRef'];
}
-if (isset($_POST['Narrative']) AND $_POST['Narrative']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Narrative=$_POST['Narrative'];
+// Narrative in general ledger transactions:
+if(isset($_POST['Narrative']) AND $_POST['Narrative']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Narrative = $_POST['Narrative'];
}
-if (isset($_POST['Amount']) AND $_POST['Amount']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Amount=filter_number_format($_POST['Amount']);
+// Supplier narrative in general ledger transactions:
+if(isset($_POST['gltrans_narrative'])) {
+ if($_POST['gltrans_narrative']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative = $_POST['Narrative'];// If blank, it uses the bank narrative.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative = $_POST['gltrans_narrative'];
+ }
+}
+// Supplier reference in supplier transactions:
+if(isset($_POST['supptrans_suppreference'])) {
+ if($_POST['supptrans_suppreference']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_suppreference = $_POST['Paymenttype'];// If blank, it uses the payment type.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_suppreference = $_POST['supptrans_suppreference'];
+ }
+}
+// Transaction text in supplier transactions:
+if(isset($_POST['supptrans_transtext'])) {
+ if($_POST['supptrans_transtext']=='') {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext = $_POST['Narrative'];// If blank, it uses the narrative.
+ } else {
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext = $_POST['supptrans_transtext'];
+ }
+}
+
+if(isset($_POST['Amount']) AND $_POST['Amount']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = filter_number_format($_POST['Amount']);
} else {
- if (!isset($_SESSION['PaymentDetail' . $identifier]->Amount)) {
- $_SESSION['PaymentDetail' . $identifier]->Amount=0;
+ if(!isset($_SESSION['PaymentDetail'.$identifier]->Amount)) {
+ $_SESSION['PaymentDetail'.$identifier]->Amount = 0;
}
}
-if (isset($_POST['Discount']) AND $_POST['Discount']!=''){
- $_SESSION['PaymentDetail' . $identifier]->Discount=filter_number_format($_POST['Discount']);
+
+if(isset($_POST['Discount']) AND $_POST['Discount']!='') {
+ $_SESSION['PaymentDetail'.$identifier]->Discount = filter_number_format($_POST['Discount']);
} else {
- if (!isset($_SESSION['PaymentDetail' . $identifier]->Discount)) {
- $_SESSION['PaymentDetail' . $identifier]->Discount=0;
- }
+ if(!isset($_SESSION['PaymentDetail'.$identifier]->Discount)) {
+ $_SESSION['PaymentDetail'.$identifier]->Discount = 0;
+ }
}
-if (isset($_POST['CommitBatch'])){
+if(isset($_POST['CommitBatch'])) {
- /* once the GL analysis of the payment is entered (if the Creditors_GLLink is active),
- process all the data in the session cookie into the DB creating a banktrans record for
- the payment in the batch and SuppTrans record for the supplier payment if a supplier was selected
- A GL entry is created for each GL entry (only one for a supplier entry) and one for the bank
- account credit.
+ /* once the GL analysis of the payment is entered (if the Creditors_GLLink is active),
+ process all the data in the session cookie into the DB creating a banktrans record for
+ the payment in the batch and SuppTrans record for the supplier payment if a supplier was selected
+ A GL entry is created for each GL entry (only one for a supplier entry) and one for the bank
+ account credit.
- NB allocations against supplier payments are a separate exercice
+ NB allocations against supplier payments are a separate exercise
- if GL integrated then
- first off run through the array of payment items $_SESSION['Payment']->GLItems and
- create GL Entries for the GL payment items
- */
+ if GL integrated then
+ first off run through the array of payment items $_SESSION['Payment']->GLItems and
+ create GL Entries for the GL payment items
+ */
- /*First off check we have an amount entered as paid ?? */
- $TotalAmount =0;
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems AS $PaymentItem) {
+ /*First off check we have an amount entered as paid ?? */
+ $TotalAmount = 0;
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems AS $PaymentItem) {
$TotalAmount += $PaymentItem->Amount;
}
- if ($TotalAmount==0 AND
- ($_SESSION['PaymentDetail' . $identifier]->Discount + $_SESSION['PaymentDetail' . $identifier]->Amount)/$_SESSION['PaymentDetail' . $identifier]->ExRate ==0){
+ if($TotalAmount==0 AND
+ ($_SESSION['PaymentDetail'.$identifier]->Discount + $_SESSION['PaymentDetail'.$identifier]->Amount)/$_SESSION['PaymentDetail'.$identifier]->ExRate ==0) {
prnMsg( _('This payment has no amounts entered and will not be processed'),'warn');
include('includes/footer.inc');
exit;
}
- if ($_POST['BankAccount']=='') {
+ if($_POST['BankAccount']=='') {
prnMsg( _('No bank account has been selected so this payment cannot be processed'),'warn');
include('includes/footer.inc');
exit;
@@ -275,21 +301,21 @@
$BankAccounts = array();
$i=0;
- while ($Act = DB_fetch_row($result)){
+ while($Act = DB_fetch_row($result)) {
$BankAccounts[$i]= $Act[0];
$i++;
}
- $PeriodNo = GetPeriod($_SESSION['PaymentDetail' . $identifier]->DatePaid,$db);
+ $PeriodNo = GetPeriod($_SESSION['PaymentDetail'.$identifier]->DatePaid,$db);
- $sql="SELECT usepreprintedstationery
+ $sql = "SELECT usepreprintedstationery
FROM paymentmethods
- WHERE paymentname='" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype ."'";
+ WHERE paymentname='" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype ."'";
$result=DB_query($sql);
$myrow=DB_fetch_row($result);
// first time through commit if supplier cheque then print it first
- if ((!isset($_POST['ChequePrinted']))
+ if((!isset($_POST['ChequePrinted']))
AND (!isset($_POST['PaymentCancelled']))
AND ($myrow[0] == 1)) {
// it is a supplier payment by cheque and haven't printed yet so print cheque
@@ -300,7 +326,7 @@
<br />';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Has the cheque been printed') . '?
<br />
@@ -310,9 +336,9 @@
<input type="submit" name="ChequePrinted" value="' . _('Yes / Continue') . '" />
<input type="submit" name="PaymentCancelled" value="' . _('No / Cancel Payment') . '" />';
- echo '<br />Payment amount = ' . $_SESSION['PaymentDetail' . $identifier]->Amount;
- echo '</div>
- </form>';
+ echo '<br />Payment amount = ' . $_SESSION['PaymentDetail'.$identifier]->Amount;
+ echo '</div>
+ </form>';
} else {
@@ -321,55 +347,58 @@
$result = DB_Txn_Begin();
- if ($_SESSION['PaymentDetail' . $identifier]->SupplierID=='') {
+ if($_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
//its a nominal bank transaction type 1
$TransNo = GetNextTransNo( 1, $db);
$TransType = 1;
- if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then enter GLTrans */
+ if($_SESSION['CompanyRecord']['gllink_creditors']==1) { /* then enter GLTrans */
$TotalAmount=0;
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems as $PaymentItem) {
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems as $PaymentItem) {
/*The functional currency amount will be the
- payment currenct amount / the bank account currency exchange rate - to get to the bank account currency
+ payment currenct amount / the bank account currency exchange rate - to get to the bank account currency
then / the functional currency exchange rate to get to the functional currency */
- if ($PaymentItem->Cheque=='') {
+ if($PaymentItem->Cheque=='') {
$PaymentItem->Cheque=0;
}
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount,
- chequeno,
- tag)
- VALUES (1,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $PaymentItem->GLCode . "',
- '" . $PaymentItem->Narrative . "',
- '" . ($PaymentItem->Amount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "',
- '". $PaymentItem->Cheque ."',
- '" . $PaymentItem->Tag . "')";
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount,
+ chequeno,
+ tag
+ ) VALUES (
+ 1,'" .
+ $TransNo . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $PeriodNo . "','" .
+ $PaymentItem->GLCode . "','" .
+ $PaymentItem->Narrative . "','" .
+ ($PaymentItem->Amount/$_SESSION['PaymentDetail'.$identifier]->ExRate/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate) . "','".
+ $PaymentItem->Cheque ."','" .
+ $PaymentItem->Tag .
+ "')";
$ErrMsg = _('Cannot insert a GL entry for the payment using the SQL');
$result = DB_query($SQL,$ErrMsg,_('The SQL that failed was'),true);
$TotalAmount += $PaymentItem->Amount;
}
- $_SESSION['PaymentDetail' . $identifier]->Amount = $TotalAmount;
- $_SESSION['PaymentDetail' . $identifier]->Discount=0;
+ $_SESSION['PaymentDetail'.$identifier]->Amount = $TotalAmount;
+ $_SESSION['PaymentDetail'.$identifier]->Discount=0;
}
//Run through the GL postings to check to see if there is a posting to another bank account (or the same one) if there is then a receipt needs to be created for this account too
- foreach ($_SESSION['PaymentDetail' . $identifier]->GLItems as $PaymentItem) {
+ foreach($_SESSION['PaymentDetail'.$identifier]->GLItems as $PaymentItem) {
- if (in_array($PaymentItem->GLCode, $BankAccounts)) {
+ if(in_array($PaymentItem->GLCode, $BankAccounts)) {
/*Need to deal with the case where the payment from one bank account could be to a bank account in another currency */
@@ -383,15 +412,15 @@
$TrfToBankCurrCode = $TrfToBankRow['currcode'];
$TrfToBankExRate = $TrfToBankRow['rate'];
- if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency == $TrfToBankCurrCode){
+ if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency == $TrfToBankCurrCode) {
/*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */
- $TrfToBankExRate = $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate;
+ $TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
}
/*Consider an example
functional currency NZD
bank account in AUD - 1 NZD = 0.90 AUD (FunctionalExRate)
- paying USD - 1 AUD = 0.85 USD (ExRate)
+ paying USD - 1 AUD = 0.85 USD (ExRate)
to a bank account in EUR - 1 NZD = 0.52 EUR
oh yeah - now we are getting tricky!
@@ -409,124 +438,128 @@
the receipt record will read
amount 100 (USD)
- exrate (1 EUR = (0.85 x 0.90)/0.52 USD)
+ exrate (1 EUR = (0.85 x 0.90)/0.52 USD)
(ExRate x FunctionalExRate) / USD Functional ExRate
- functionalexrate = (1NZD = EUR 0.52)
+ functionalexrate = (1NZD = EUR 0.52)
*/
$ReceiptTransNo = GetNextTransNo( 2, $db);
- $SQL= "INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
- VALUES ('" . $ReceiptTransNo . "',
- 2,
- '" . $PaymentItem->GLCode . "',
- '" . _('Act Transfer From ') . $_SESSION['PaymentDetail' . $identifier]->Account . ' - ' . $PaymentItem->Narrative . "',
- '" . (($_SESSION['PaymentDetail' . $identifier]->ExRate * $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate)/$TrfToBankExRate). "',
- '" . $TrfToBankExRate . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . $PaymentItem->Amount . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "'
- )";
+ $SQL = "INSERT INTO banktrans (
+ transno,
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode
+ ) VALUES ('" .
+ $ReceiptTransNo . "',
+ 2,'" .
+ $PaymentItem->GLCode . "','" .
+ _('Act Transfer From ') . $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" .
+ (($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfToBankExRate). "','" .
+ $TrfToBankExRate . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "','" .
+ $PaymentItem->Amount . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Currency .
+ "')";
$ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction with the SQL');
+ $DbgMsg = _('Cannot insert a bank transaction with the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
-
}
}
} else {
- /*Its a supplier payment type 22 */
- $CreditorTotal = (($_SESSION['PaymentDetail' . $identifier]->Discount + $_SESSION['PaymentDetail' . $identifier]->Amount)/$_SESSION['PaymentDetail' . $identifier]->ExRate)/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate;
+ /*Its a supplier payment type 22 */
+ $CreditorTotal = (($_SESSION['PaymentDetail'.$identifier]->Discount + $_SESSION['PaymentDetail'.$identifier]->Amount)/$_SESSION['PaymentDetail'.$identifier]->ExRate)/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
$TransNo = GetNextTransNo(22, $db);
$TransType = 22;
/* Create a SuppTrans entry for the supplier payment */
- $SQL = "INSERT INTO supptrans (transno,
- type,
- supplierno,
- trandate,
- inputdate,
- suppreference,
- rate,
- ovamount,
- transtext) ";
- $SQL = $SQL . "valueS ('" . $TransNo . "',
- 22,
- '" . $_SESSION['PaymentDetail' . $identifier]->SupplierID . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . date('Y-m-d H-i-s') . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . ($_SESSION['PaymentDetail' . $identifier]->FunctionalExRate * $_SESSION['PaymentDetail' . $identifier]->ExRate) . "',
- '" . (-$_SESSION['PaymentDetail' . $identifier]->Amount-$_SESSION['PaymentDetail' . $identifier]->Discount) . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "'
- )";
-
- $ErrMsg = _('Cannot insert a payment transaction against the supplier because');
+ $SQL = "INSERT INTO supptrans (
+ transno,
+ type,
+ supplierno,
+ trandate,
+ inputdate,
+ suppreference,
+ rate,
+ ovamount,
+ transtext
+ ) VALUES ('" .
+ $TransNo . "',
+ 22,'" .
+ $_SESSION['PaymentDetail'.$identifier]->SupplierID . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ date('Y-m-d H-i-s') . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_suppreference . "','" .
+ ($_SESSION['PaymentDetail'.$identifier]->FunctionalExRate * $_SESSION['PaymentDetail'.$identifier]->ExRate) . "','" .
+ (-$_SESSION['PaymentDetail'.$identifier]->Amount-$_SESSION['PaymentDetail'.$identifier]->Discount) . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->supptrans_transtext .
+ "')";
+ $ErrMsg = _('Cannot insert a payment transaction against the supplier because');
$DbgMsg = _('Cannot insert a payment transaction against the supplier using the SQL');
- $result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
+ $result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
/*Update the supplier master with the date and amount of the last payment made */
$SQL = "UPDATE suppliers
- SET lastpaiddate = '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- lastpaid='" . $_SESSION['PaymentDetail' . $identifier]->Amount ."'
- WHERE suppliers.supplierid='" . $_SESSION['PaymentDetail' . $identifier]->SupplierID . "'";
-
-
-
+ SET lastpaiddate = '" . FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "',
+ lastpaid='" . $_SESSION['PaymentDetail'.$identifier]->Amount ."'
+ WHERE suppliers.supplierid='" . $_SESSION['PaymentDetail'.$identifier]->SupplierID . "'";
$ErrMsg = _('Cannot update the supplier record for the date of the last payment made because');
$DbgMsg = _('Cannot update the supplier record for the date of the last payment made using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- $_SESSION['PaymentDetail' . $identifier]->Narrative = $_SESSION['PaymentDetail' . $identifier]->SupplierID . ' - ' . $_SESSION['PaymentDetail' . $identifier]->Narrative;
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative = $_SESSION['PaymentDetail'.$identifier]->SupplierID . ' - ' . $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative;
- if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then do the supplier control GLTrans */
+ if($_SESSION['CompanyRecord']['gllink_creditors']==1) { /* then do the supplier control GLTrans */
/* Now debit creditors account with payment + discount */
- $SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount) ";
- $SQL=$SQL . "VALUES (22,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['creditorsact'] . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
- '" . $CreditorTotal . "')";
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount
+ ) VALUES (
+ 22,'" .
+ $TransNo . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $PeriodNo . "','" .
+ $_SESSION['CompanyRecord']['creditorsact'] . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative . "','" .
+ $CreditorTotal .
+ "')";
$ErrMsg = _('Cannot insert a GL transaction for the creditors account debit because');
$DbgMsg = _('Cannot insert a GL transaction for the creditors account debit using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- if ($_SESSION['PaymentDetail' . $identifier]->Discount !=0){
+ if($_SESSION['PaymentDetail'.$identifier]->Discount != 0) {
/* Now credit Discount received account with discounts */
- $SQL="INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (22,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['pytdiscountact'] . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
- '" . (-$_SESSION['PaymentDetail' . $identifier]->Discount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "'
- )";
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount
+ ) VALUES (
+ 22,'" .
+ $TransNo . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $PeriodNo . "','" .
+ $_SESSION['CompanyRecord']['pytdiscountact'] . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->gltrans_narrative . "','" .
+ (-$_SESSION['PaymentDetail'.$identifier]->Discount/$_SESSION['PaymentDetail'.$identifier]->ExRate/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate) .
+ "')";
$ErrMsg = _('Cannot insert a GL transaction for the payment discount credit because');
$DbgMsg = _('Cannot insert a GL transaction for the payment discount credit using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
@@ -535,55 +568,58 @@
} // end if gl creditors
} // end if supplier
- if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then do the common GLTrans */
+ if($_SESSION['CompanyRecord']['gllink_creditors'] == 1) { /* then do the common GLTrans */
- if ($_SESSION['PaymentDetail' . $identifier]->Amount !=0){
+ if($_SESSION['PaymentDetail'.$identifier]->Amount != 0) {
/* Bank account entry first */
- $SQL = "INSERT INTO gltrans ( type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES ('" . $TransType . "',
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
- '" . (-$_SESSION['PaymentDetail' . $identifier]->Amount/$_SESSION['PaymentDetail' . $identifier]->ExRate/$_SESSION['PaymentDetail' . $identifier]->FunctionalExRate) . "')";
-
- $ErrMsg = _('Cannot insert a GL transaction for the bank account credit because');
- $DbgMsg = _('Cannot insert a GL transaction for the bank account credit using the SQL');
+ $SQL = "INSERT INTO gltrans (
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount
+ ) VALUES ('" .
+ $TransType . "','" .
+ $TransNo . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $PeriodNo . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Account . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Narrative . "','" .
+ (-$_SESSION['PaymentDetail'.$identifier]->Amount/$_SESSION['PaymentDetail'.$identifier]->ExRate/$_SESSION['PaymentDetail'.$identifier]->FunctionalExRate) .
+ "')";
+ $ErrMsg = _('Cannot insert a GL transaction for the bank account credit because');
+ $DbgMsg = _('Cannot insert a GL transaction for the bank account credit using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
-
EnsureGLEntriesBalance($TransType,$TransNo,$db);
}
}
/*now enter the BankTrans entry */
- $SQL="INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode)
- VALUES ('" . $TransNo . "',
- '" . $TransType . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . -$_SESSION['PaymentDetail' . $identifier]->Amount . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Currency . "')";
-
+ $SQL = "INSERT INTO banktrans (
+ transno,
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode
+ ) VALUES ('" .
+ $TransNo . "','" .
+ $TransType . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Account . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->BankTransRef . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->ExRate . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate . "','" .
+ FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "','" .
+ -$_SESSION['PaymentDetail'.$identifier]->Amount . "','" .
+ $_SESSION['PaymentDetail'.$identifier]->Currency .
+ "')";
$ErrMsg = _('Cannot insert a bank transaction because');
$DbgMsg = _('Cannot insert a bank transaction using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
@@ -591,7 +627,7 @@
DB_Txn_Commit();
prnMsg(_('Payment') . ' ' . $TransNo . ' ' . _('has been successfully entered'),'success');
- $LastSupplier = ($_SESSION['PaymentDetail' . $identifier]->SupplierID);
+ $LastSupplier = ($_SESSION['PaymentDetail'.$identifier]->SupplierID);
unset($_POST['BankAccount']);
unset($_POST['DatePaid']);
@@ -599,22 +635,26 @@
unset($_POST['Paymenttype']);
unset($_POST['Currency']);
unset($_POST['Narrative']);
+ unset($_POST['gltrans_narrative']);
+ unset($_POST['supptrans_suppreference']);
+ unset($_POST['supptrans_transtext']);
unset($_POST['Amount']);
unset($_POST['Discount']);
- unset($_SESSION['PaymentDetail' . $identifier]->GLItems);
- unset($_SESSION['PaymentDetail' . $identifier]);
+ unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
+ unset($_SESSION['PaymentDetail'.$identifier]->SupplierID);
+ unset($_SESSION['PaymentDetail'.$identifier]);
/*Set up a newy in case user wishes to enter another */
- if (isset($LastSupplier) and $LastSupplier!='') {
+ if(isset($LastSupplier) and $LastSupplier!='') {
$SupplierSQL="SELECT suppname FROM suppliers
WHERE supplierid='".$LastSupplier."'";
- $SupplierResult = DB_query($SupplierSQL);
- $SupplierRow = DB_fetch_array($SupplierResult);
- $TransSQL = "SELECT id FROM supptrans WHERE type=22 AND transno='" . $TransNo . "'";
- $TransResult = DB_query($TransSQL);
- $TransRow = DB_fetch_array($TransResult);
- echo '<br /><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=' . $TransRow['id'] . '">' . _('Allocate this payment') . '</a>';
- echo '<br /><a href="' . $RootPath . '/Payments.php?SupplierID=' . $LastSupplier . '">' . _('Enter another Payment for') . ' ' . $SupplierRow['suppname'] . '</a>';
+ $SupplierResult = DB_query($SupplierSQL);
+ $SupplierRow = DB_fetch_array($SupplierResult);
+ $TransSQL = "SELECT id FROM supptrans WHERE type=22 AND transno='" . $TransNo . "'";
+ $TransResult = DB_query($TransSQL);
+ $TransRow = DB_fetch_array($TransResult);
+ echo '<br /><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=' . $TransRow['id'] . '">' . _('Allocate this payment') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/Payments.php?SupplierID=' . $LastSupplier . '">' . _('Enter another Payment for') . ' ' . $SupplierRow['suppname'] . '</a>';
} else {
echo '<br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Enter another General Ledger Payment') . '</a><br />';
}
@@ -623,9 +663,9 @@
include('includes/footer.inc');
exit;
-} elseif (isset($_GET['Delete'])){
- /* User hit delete the receipt entry from the batch */
- $_SESSION['PaymentDetail' . $identifier]->Remove_GLItem($_GET['Delete']);
+} elseif(isset($_GET['Delete'])) {
+ /* User hit delete the receipt entry from the batch */
+ $_SESSION['PaymentDetail'.$identifier]->Remove_GLItem($_GET['Delete']);
//recover the bank account relative setting
$_POST['BankAccount'] = $_SESSION['PaymentDetail'.$identifier]->Account;
$_POST['DatePaid'] = $_SESSION['PaymentDetail'.$identifier]->DatePaid;
@@ -636,12 +676,12 @@
$_POST['BankTransRef'] = $_SESSION['PaymentDetail'.$identifier]->BankTransRef;
$_POST['Narrative'] = $_SESSION['PaymentDetail'.$identifier]->Narrative;
-} elseif (isset($_POST['Process']) AND !$BankAccountEmpty){ //user hit submit a new GL Analysis line into the payment
+} elseif(isset($_POST['Process']) AND !$BankAccountEmpty) { //user hit submit a new GL Analysis line into the payment
$ChequeNoSQL="SELECT account FROM gltrans WHERE chequeno='" . $_POST['Cheque'] ."'";
$ChequeNoResult=DB_query($ChequeNoSQL);
- if (is_numeric($_POST['GLManualCode'])){
+ if(is_numeric($_POST['GLManualCode'])) {
$SQL = "SELECT accountname
FROM chartmaster
@@ -649,31 +689,31 @@
$Result=DB_query($SQL);
- if (DB_num_rows($Result)==0){
+ if(DB_num_rows($Result)==0) {
prnMsg( _('The manual GL code entered does not exist in the database') . ' - ' . _('so this GL analysis item could not be added'),'warn');
unset($_POST['GLManualCode']);
- } else if (DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!=''){
+ } elseif(DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!='') {
prnMsg( _('The Cheque/Voucher number has already been used') . ' - ' . _('This GL analysis item could not be added'),'error');
} else {
$myrow = DB_fetch_array($Result);
$AllowThisPosting = true;
- if ($_SESSION['ProhibitJournalsToControlAccounts'] == 1) {
- if ($_SESSION['CompanyRecord']['gllink_debtors'] == '1' AND $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ if($_SESSION['ProhibitJournalsToControlAccounts'] == 1) {
+ if($_SESSION['CompanyRecord']['gllink_debtors'] == '1' AND $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['debtorsact']) {
prnMsg(_('Payments involving the debtors control account cannot be entered. The general ledger debtors ledger (AR) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
$AllowThisPosting = false;
}
- if ($_SESSION['CompanyRecord']['gllink_creditors'] == '1' AND
+ if($_SESSION['CompanyRecord']['gllink_creditors'] == '1' AND
($_POST['GLManualCode'] == $_SESSION['CompanyRecord']['creditorsact'] OR $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['grnact'])) {
prnMsg(_('Payments involving the creditors control account or the GRN suspense account cannot be entered. The general ledger creditors ledger (AP) integration is enabled so control accounts are automatically maintained. This setting can be disabled in System Configuration'), 'warn');
$AllowThisPosting = false;
}
- if ($_POST['GLManualCode'] == $_SESSION['CompanyRecord']['retainedearnings']) {
+ if($_POST['GLManualCode'] == $_SESSION['CompanyRecord']['retainedearnings']) {
prnMsg(_('Payments involving the retained earnings control account cannot be entered. This account is automtically maintained.'), 'warn');
$AllowThisPosting = false;
}
}
- if ($AllowThisPosting) {
- $_SESSION['PaymentDetail' . $identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
+ if($AllowThisPosting) {
+ $_SESSION['PaymentDetail'.$identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
$_POST['GLNarrative'],
$_POST['GLManualCode'],
$myrow['accountname'],
@@ -682,15 +722,15 @@
unset($_POST['GLManualCode']);
}
}
- } else if (DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!=''){
+ } elseif(DB_num_rows($ChequeNoResult)!=0 AND $_POST['Cheque']!='') {
prnMsg( _('The cheque number has already been used') . ' - ' . _('This GL analysis item could not be added'),'error');
- } else if ($_POST['GLCode'] == '') {
+ } elseif($_POST['GLCode'] == '') {
prnMsg( _('No General Ledger code has been chosen') . ' - ' . _('so this GL analysis item could not be added'),'warn');
} else {
$SQL = "SELECT accountname FROM chartmaster WHERE accountcode='" . $_POST['GLCode'] . "'";
$Result=DB_query($SQL);
$myrow=DB_fetch_array($Result);
- $_SESSION['PaymentDetail' . $identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
+ $_SESSION['PaymentDetail'.$identifier]->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
$_POST['GLNarrative'],
$_POST['GLCode'],
$myrow['accountname'],
@@ -702,7 +742,7 @@
$_POST['Cancel'] = 1;
}
-if (isset($_POST['Cancel'])){
+if(isset($_POST['Cancel'])) {
unset($_POST['GLAmount']);
unset($_POST['GLNarrative']);
unset($_POST['GLCode']);
@@ -710,24 +750,24 @@
}
/*set up the form whatever */
-if (!isset($_POST['DatePaid'])) {
+if(!isset($_POST['DatePaid'])) {
$_POST['DatePaid'] = '';
}
-if (isset($_POST['DatePaid'])
+if(isset($_POST['DatePaid'])
AND ($_POST['DatePaid']==''
- OR !Is_Date($_SESSION['PaymentDetail' . $identifier]->DatePaid))){
+ OR !Is_Date($_SESSION['PaymentDetail'.$identifier]->DatePaid))) {
$_POST['DatePaid']= Date($_SESSION['DefaultDateFormat']);
- $_SESSION['PaymentDetail' . $identifier]->DatePaid = $_POST['DatePaid'];
+ $_SESSION['PaymentDetail'.$identifier]->DatePaid = $_POST['DatePaid'];
}
-if ($_SESSION['PaymentDetail' . $identifier]->Currency=='' AND $_SESSION['PaymentDetail' . $identifier]->SupplierID==''){
- $_SESSION['PaymentDetail' . $identifier]->Currency=$_SESSION['CompanyRecord']['currencydefault'];
+if($_SESSION['PaymentDetail'.$identifier]->Currency=='' AND $_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
+ $_SESSION['PaymentDetail'.$identifier]->Currency=$_SESSION['CompanyRecord']['currencydefault'];
}
-if (isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
+if(isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
$SQL = "SELECT bankaccountname
FROM bankaccounts,
chartmaster
@@ -739,11 +779,11 @@
$result= DB_query($SQL,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result)==1){
+ if(DB_num_rows($result)==1) {
$myrow = DB_fetch_row($result);
- $_SESSION['PaymentDetail' . $identifier]->BankAccountName = $myrow[0];
+ $_SESSION['PaymentDetail'.$identifier]->BankAccountName = $myrow[0];
unset($result);
- } elseif (DB_num_rows($result)==0){
+ } elseif(DB_num_rows($result)==0) {
prnMsg( _('The bank account number') . ' ' . $_POST['BankAccount'] . ' ' . _('is not set up as a bank account with a valid general ledger account'),'error');
}
}
@@ -754,17 +794,17 @@
<br />
<table class="selection">
<tr>
- <th colspan="4"><h3>' . _('Payment');
+ <th colspan="2"><h3>' . _('Payment');
-if ($_SESSION['PaymentDetail' . $identifier]->SupplierID!=''){
- echo ' ' . _('to') . ' ' . $_SESSION['PaymentDetail' . $identifier]->SuppName;
+if($_SESSION['PaymentDetail'.$identifier]->SupplierID!='') {
+ echo ' ' . _('to') . ' ' . $_SESSION['PaymentDetail'.$identifier]->SuppName;
}
-if ($_SESSION['PaymentDetail' . $identifier]->BankAccountName!=''){
- echo ' ' . _('from the') . ' ' . $_SESSION['PaymentDetail' . $identifier]->BankAccountName;
+if($_SESSION['PaymentDetail'.$identifier]->BankAccountName!='') {
+ echo ' ' . _('from the') . ' ' . $_SESSION['PaymentDetail'.$identifier]->BankAccountName;
}
-echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '</h3></th></tr>';
+echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail'.$identifier]->DatePaid . '</h3></th></tr>';
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
@@ -782,10 +822,10 @@
$AccountsResults = DB_query($SQL,$ErrMsg,$DbgMsg);
echo '<tr>
- <td>' . _('Bank Account') . ':</td>
- <td><select name="BankAccount" autofocus="autofocus" required="required" title="' . _('Select the bank account that the payment has been made from') . '" onchange="ReloadForm(UpdateHeader)">';
+ <td>', _('Bank Account'), ':</td>
+ <td><select autofocus="autofocus" name="BankAccount" onchange="ReloadForm(UpdateHeader)" required="required" title="', _('Select the bank account that the payment has been made from'), '">';
-if (DB_num_rows($AccountsResults)==0){
+if(DB_num_rows($AccountsResults)==0) {
echo '</select></td>
</tr>
</table>
@@ -795,71 +835,70 @@
exit;
} else {
echo '<option value=""></option>';
- while ($myrow=DB_fetch_array($AccountsResults)){
+ while($myrow=DB_fetch_array($AccountsResults)) {
/*list the bank account names */
- if (isset($_POST['BankAccount']) AND $_POST['BankAccount']==$myrow['accountcode']){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . ' - ' . $myrow['currcode'] . '</option>';
- } else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . ' - ' . $myrow['currcode'] . '</option>';
+ echo '<option ';
+ if(/*isset($_POST['BankAccount']) AND */$_POST['BankAccount']==$myrow['accountcode']) {
+ echo 'selected="selected" ';
}
+ echo 'value="', $myrow['accountcode'], '">', $myrow['bankaccountname'], ' - ', $myrow['currcode'], '</option>';
}
echo '</select></td>
</tr>';
}
echo '<tr>
- <td>' . _('Date Paid') . ':</td>
- <td><input type="text" name="DatePaid" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" required="required" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '" /></td>
+ <td>', _('Date Paid'), ':</td>
+ <td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" maxlength="10" name="DatePaid" onchange="isDate(this, this.value, ', "'", $_SESSION['DefaultDateFormat'], "'", ')" required="required" size="10" type="text" value="', $_SESSION['PaymentDetail'.$identifier]->DatePaid, '" /></td>
</tr>';
-if ($_SESSION['PaymentDetail' . $identifier]->SupplierID==''){
+if($_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
echo '<tr>
<td>' . _('Currency of Payment') . ':</td>
<td><select name="Currency" required="required" onchange="ReloadForm(UpdateHeader)">';
$SQL = "SELECT currency, currabrev, rate FROM currencies";
$result=DB_query($SQL);
- if (DB_num_rows($result)==0){
+ if(DB_num_rows($result)==0) {
echo '</select></td>
</tr>';
prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
} else {
include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
- while ($myrow=DB_fetch_array($result)){
- if ($_SESSION['PaymentDetail' . $identifier]->Currency==$myrow['currabrev']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
- } else {
- echo '<option value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
+ while($myrow=DB_fetch_array($result)) {
+ echo '<option ';
+ if($_SESSION['PaymentDetail'.$identifier]->Currency==$myrow['currabrev']) {
+ echo 'selected="selected" ';
}
+ echo 'value="', $myrow['currabrev'], '">', $CurrencyName[$myrow['currabrev']], '</option>';
}
- echo '</select></td>
- <td><i>' . _('The transaction currency does not need to be the same as the bank account currency') . '</i></td>
+ echo '</select> <i>', _('The transaction currency does not need to be the same as the bank account currency'), '</i></td>
</tr>';
}
} else { /*its a supplier payment so it must be in the suppliers currency */
echo '<tr>';
- echo '<td><input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail' . $identifier]->Currency . '" />
+ echo '<td><input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail'.$identifier]->Currency . '" />
' . _('Supplier Currency') . ':</td>
- <td>' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</td>
+ <td>' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</td>
</tr>';
/*get the default rate from the currency table if it has not been set */
- if (!isset($_POST['ExRate']) OR $_POST['ExRate']==''){
- $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail' . $identifier]->Currency ."'";
+ if(!isset($_POST['ExRate']) OR $_POST['ExRate']=='') {
+ $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency ."'";
$Result=DB_query($SQL);
$myrow=DB_fetch_row($Result);
$_POST['ExRate']=locale_number_format($myrow[0],'Variable');
}
}
-if (!isset($_POST['ExRate'])){
+if(!isset($_POST['ExRate'])) {
$_POST['ExRate']=1;
}
-if (!isset($_POST['FunctionalExRate'])){
+if(!isset($_POST['FunctionalExRate'])) {
$_POST['FunctionalExRate']=1;
}
-if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['PaymentDetail' . $identifier]->Currency AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['PaymentDetail'.$identifier]->Currency AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
if($_POST['ExRate']==1 AND isset($SuggestedExRate)) {
$_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
} elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {
@@ -867,31 +906,29 @@
}
if(isset($SuggestedExRate)) {
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</b>';
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>';
} else {
- $SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->Currency;
+ $SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->Currency;
}
echo '<tr>
<td>', _('Payment Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /></td>
- <td>', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
+ <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /> ', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
</tr>';
}
-if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
if($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)) {
$_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
}
if(isset($SuggestedFunctionalExRate)) {
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . '</b>';
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . '</b>';
} else {
- $SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency;
+ $SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency;
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
- <td>', $SuggestedFunctionalExRa...
[truncated message content] |
|
From: <dai...@us...> - 2016-04-25 10:01:30
|
Revision: 7495
http://sourceforge.net/p/web-erp/reponame/7495
Author: daintree
Date: 2016-04-25 10:01:27 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Jan Bakke: improvements to google maps api v 3
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Change.log
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-04-25 09:53:53 UTC (rev 7494)
+++ trunk/SelectCustomer.php 2016-04-25 10:01:27 UTC (rev 7495)
@@ -25,6 +25,17 @@
if (!isset($_SESSION['CustomerType'])) { //initialise if not already done
$_SESSION['CustomerType'] = '';
}
+
+if (isset($_POST['JustSelectedACustomer']) ) {
+ if (isset ($_POST['SubmitCustomerSelection'])) {
+ foreach ($_POST['SubmitCustomerSelection'] AS $CustomerID=>$BranchCode)
+ $_SESSION['CustomerID'] = $CustomerID;
+ $_SESSION['BranchCode'] = $BranchCode;
+ } else {
+ prnMsg(_('Unable to identify the selected customer'), 'error');
+ }
+}
+
// only run geocode if integration is turned on AND customer has been selected
if ($_SESSION['geocode_integration'] == 1 AND $_SESSION['CustomerID'] != "") {
$sql = "SELECT * FROM geocode_param WHERE 1";
@@ -36,41 +47,106 @@
custbranch.branchcode,
custbranch.brname,
custbranch.lat,
- custbranch.lng
+ custbranch.lng,
+ braddress1,
+ braddress2,
+ braddress3,
+ braddress4
FROM debtorsmaster LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
WHERE debtorsmaster.debtorno = '" . $_SESSION['CustomerID'] . "'
+ AND custbranch.branchcode = '" . $_SESSION['BranchCode'] . "'
ORDER BY debtorsmaster.debtorno";
$ErrMsg = _('An error occurred in retrieving the information');
$result2 = DB_query($sql, $ErrMsg);
$myrow2 = DB_fetch_array($result2);
- $Lattitude = $myrow2['lat'];
- $Longitude = $myrow2['lng'];
+ $Lat = $myrow2['lat'];
+ $Lng = $myrow2['lng'];
$API_Key = $myrow['geocode_key'];
$center_long = $myrow['center_long'];
$center_lat = $myrow['center_lat'];
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $API_Key . '"';
- echo ' type="text/javascript"></script>';
- echo ' <script type="text/javascript">';
- echo 'function load() {
- if (GBrowserIsCompatible()) {
- var map = new GMap2(document.getElementById("map"));
- map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());';
- echo 'map.setCenter(new GLatLng(' . $Lattitude . ', ' . $Longitude . '), 11);';
- echo 'var marker = new GMarker(new GLatLng(' . $Lattitude . ', ' . $Longitude . '));';
- echo 'map.addOverlay(marker);
- GEvent.addListener(marker, "click", function() {
- marker.openInfoWindowHtml(WINDOW_HTML);
- });
- marker.openInfoWindowHtml(WINDOW_HTML);
+
+ if ($Lat == 0 && $myrow2["braddress1"] !='' && $_SESSION['BranchCode'] !='' ) {
+ $delay = 0;
+ $base_url = "https://" . $map_host . "/maps/api/geocode/xml?address=";
+
+ $geocode_pending = true;
+ while ($geocode_pending) {
+ $address = urlencode($myrow2["braddress1"] . "," . $myrow2["braddress2"] . "," . $myrow2["braddress3"] . "," . $myrow2["braddress4"]);
+ $id = $myrow2["branchcode"];
+ $debtorno =$myrow2["debtorno"];
+ $request_url = $base_url . $address . ',&sensor=true';
+
+ $buffer = file_get_contents($request_url) or die("url not loading");
+ $xml = simplexml_load_string($buffer);
+ //echo $xml->asXML();
+
+ $status = $xml->status;
+ if (strcmp($status, "OK") == 0) {
+ $geocode_pending = false;
+
+ $Lat = $xml->result->geometry->location->lat;
+ $Lng = $xml->result->geometry->location->lng;
+
+ $query = sprintf("UPDATE custbranch " .
+ " SET lat = '%s', lng = '%s' " .
+ " WHERE branchcode = '%s' " .
+ " AND debtorno = '%s' LIMIT 1;",
+ ($Lat),
+ ($Lng),
+ ($id),
+ ($debtorno));
+ $update_result = DB_query($query);
+
+ if ($update_result==1) {
+ prnMsg( _('GeoCode has been updated for CustomerID') . ': ' . $id . ' - ' . _('Latitude') . ': ' . $Lat . ' ' . _('Longitude') . ': ' . $Lng ,'info');
+ }
+ } else {
+ $geocode_pending = false;
+ prnMsg(_('Unable to update GeoCode for CustomerID') . ': ' . $id . ' - ' . _('Received status') . ': ' . $status , 'error');
+ }
+ usleep($delay);
}
+ }
+
+ echo '
+ <script src="https://' . $map_host . '/maps/api/js?v=3.exp&key=' . $API_Key . '" type="text/javascript"></script>
+ <script type="text/javascript">
+ function initialize() {
+ var latlng = new google.maps.LatLng('.$Lat.','.$Lng.');
+ var map = new google.maps.Map(
+ document.getElementById("map"), {
+ center: latlng,
+ zoom: 12,
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ });
+ var marker = new google.maps.Marker({
+ position: latlng,
+ map: map
+ });
+ var contentString =
+ "<div style=\"overflow: auto;\">" +
+ "<div><b>'.$myrow2['brname'].'</b></div>" +
+ "<div>'.$myrow2['braddress1'].'</div>" +
+ "<div>'.$myrow2['braddress2'].'</div>" +
+ "<div>'.$myrow2['braddress3'].'</div>" +
+ "<div>'.$myrow2['braddress4'].'</div>" +
+ "</div>";
+
+ var infowindow = new google.maps.InfoWindow({
+ content: contentString,
+ MaxWidth: 250
+ });
+ google.maps.event.addListener(marker, "click", function() {
+ infowindow.open(map,marker);
+ });
}
- </script>';
- echo '<body onload="load()" onunload="GUnload()">';
+ google.maps.event.addDomListener(window, "load", initialize);
+ </script>';
+
} //end if geocode integration is turned on AND a customer is selected
unset($result);
@@ -167,21 +243,6 @@
}
} //end of if search
-if (isset($_POST['JustSelectedACustomer'])) {
- /*Need to figure out the number of the form variable that the user clicked on */
- for ($i = 0; $i < count($_POST); $i++) { //loop through the returned customers
- if (isset($_POST['SubmitCustomerSelection' . $i])) {
- break;
- }
- } //end loop through $_POST array
- if ($i == count($_POST)) {
- prnMsg(_('Unable to identify the selected customer'), 'error');
- } else {
- $_SESSION['CustomerID'] = $_POST['SelectedCustomer' . $i];
- $_SESSION['BranchCode'] = $_POST['SelectedBranch' . $i];
- }
-} // end if Just Selected A Customer
-
if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
if (!isset($_SESSION['BranchCode'])) {
$SQL = "SELECT debtorsmaster.name,
@@ -193,7 +254,8 @@
} //!isset($_SESSION['BranchCode'])
else {
$SQL = "SELECT debtorsmaster.name,
- custbranch.phoneno
+ custbranch.phoneno,
+ custbranch.brname
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'
@@ -204,10 +266,12 @@
if ($myrow = DB_fetch_array($result)) {
$CustomerName = htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false);
$PhoneNo = $myrow['phoneno'];
+ $BranchName = $myrow['brname'];
} //$myrow = DB_fetch_array($result)
unset($result);
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '<br>';
+
echo '<div class="page_help_text">' . _('Select a menu option to operate using this customer') . '.</div><br />';
echo '<table cellpadding="4" width="90%" class="selection">
@@ -287,9 +351,9 @@
<td>' . _('Enter a partial Phone Number') . ':</td>
<td>';
if (isset($_POST['CustPhone'])) {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
+ echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
} else {
- echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" maxlength="18" />';
+ echo '<input type="tel" name="CustPhone" pattern="[0-9\-\s()+]*" size="15" maxlength="18" />';
}
echo '</td>';
echo '<td><b>' . _('OR') . '</b></td>
@@ -452,9 +516,9 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="SubmitCustomerSelection' . $i . '" value="' . htmlspecialchars($myrow['debtorno'] . ' ' . $myrow['branchcode'], ENT_QUOTES, 'UTF-8', false) . '" />
- <input type="hidden" name="SelectedCustomer' . $i . '" value="' . $myrow['debtorno'] . '" />
- <input type="hidden" name="SelectedBranch' . $i . '" value="' . $myrow['branchcode'] . '" /></td>
+ echo '<td>
+ <button type="submit" name="SubmitCustomerSelection['.htmlspecialchars($myrow['debtorno'], ENT_QUOTES, 'UTF-8', false).']" value="' . htmlspecialchars($myrow['branchcode'], ENT_QUOTES, 'UTF-8', false) . '" >' . $myrow['debtorno'] . ' ' . $myrow['branchcode'] . '</button>
+ </td>
<td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td>' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td>' . $myrow['contactname'] . '</td>
@@ -495,31 +559,30 @@
}
echo '</div>
- </form>';
+ </form>';
// Only display the geocode map if the integration is turned on, AND there is a latitude/longitude to display
if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
echo '<br />';
- if ($Lattitude == 0) {
+ if ($Lat == 0) {
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
} else {
echo '<tr>
<td colspan="2">
- <table width="45%" cellpadding="4">
+ <table style="width: 45%;" cellpadding="4">
<tr>
- <th style="width:33%">' . _('Customer Mapping') . '</th>
+ <th style="width:auto">' . _('Customer Mapping') . '</th>
</tr>
</td>
<th valign="top">
- <div class="centre">' . _('Mapping is enabled, Map will display below.') . '
- </div>
- <div align="center" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px">
- </div>
+ <div class="centre">' . _('Mapping is enabled, Map will display below.') . '</div>
+ <div class="center" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px; margin: 0 auto;"></div>
<br />
</th>
</tr>
</table>';
}
+
} //end if Geocode integration is turned on
// Extended Customer Info only if selected in Configuration
if ($_SESSION['Extended_CustomerInfo'] == 1) {
@@ -556,8 +619,8 @@
AND type !=12";
$Total1Result = DB_query($SQL);
$row = DB_fetch_array($Total1Result);
- echo '<table width="45%" cellpadding="4">';
- echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
+ echo '<table style="width: 45%;" cellpadding="4">';
+ echo '<tr><th style="width:auto" colspan="3">' . _('Customer Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">';
/* Customer Data */
if ($myrow['lastpaiddate'] == 0) {
@@ -604,9 +667,10 @@
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
ORDER BY contid";
$result = DB_query($sql);
+
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
- echo '<br /><table width="45%">';
+ echo '<br /><table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Name') . '</th>
<th class="ascending">' . _('Role') . '</th>
@@ -636,6 +700,23 @@
<td><a href="AddCustomerContacts.php?Id=' . $myrow[0] . '&DebtorNo=' . $myrow[1] . '&delete=1">' . _('Delete') . '</a></td>
</tr>';
} //END WHILE LIST LOOP
+
+ // Customer Branch Contacts if selected
+ if (isset ($_SESSION['BranchCode']) && $_SESSION['BranchCode'] != '') {
+ $sql = "SELECT branchcode, brname, contactname, phoneno, email FROM custbranch
+ WHERE debtorno='" . $_SESSION['CustomerID'] . "'
+ AND branchcode='" . $_SESSION['BranchCode'] . "'";
+ $result2 = DB_query($sql);
+ $BranchContact = DB_fetch_row($result2);
+
+ echo '<tr class="EvenTableRows">
+ <td>' . $BranchContact[2] . '</td>
+ <td>' . _('Branch Contact') . ' ' . $BranchContact[0] . '</td>
+ <td>' . $BranchContact[3] . '</td>
+ <td><a href="mailto:' . $BranchContact[4] . '">' . $BranchContact[4] . '</a></td>
+ <td colspan="3"></td>
+ </tr>';
+ }
echo '</table>';
} //end if there are contact rows returned
else {
@@ -656,7 +737,7 @@
$result = DB_query($sql);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" />' . ' ' . _('Customer Notes') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Date') . '</th>
<th>' . _('Note') . '</th>
@@ -685,7 +766,7 @@
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
- } //end if there are customer notes to display
+ } //end if there are customer notes to display
else {
if ($_SESSION['CustomerID'] != '') {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" /><a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note for this Customer') . '</a></div>';
@@ -698,16 +779,16 @@
$result = DB_query($sql);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/folder_add.png" title="' . _('Customer Type (Group) Notes') . '" alt="" />' . ' ' . _('Customer Type (Group) Notes for:' . '<b> ' . $CustomerTypeName . '</b>') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table style="width: 45%;">';
echo '<tr>
<th class="ascending">' . _('Date') . '</th>
- <th>' . _('Note') . '</th>
- <th>' . _('File Link / Reference / URL') . '</th>
- <th class="ascending">' . _('Priority') . '</th>
- <th>' . _('Edit') . '</th>
- <th>' . _('Delete') . '</th>
- <th><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . _('Add New Group Note') . '</a></th>
- </tr>';
+ <th>' . _('Note') . '</th>
+ <th>' . _('File Link / Reference / URL') . '</th>
+ <th class="ascending">' . _('Priority') . '</th>
+ <th>' . _('Edit') . '</th>
+ <th>' . _('Delete') . '</th>
+ <th><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . _('Add New Group Note') . '</a></th>
+ </tr>';
$k = 0; //row colour counter
while ($myrow = DB_fetch_array($result)) {
if ($k == 1) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-25 09:53:53 UTC (rev 7494)
+++ trunk/doc/Change.log 2016-04-25 10:01:27 UTC (rev 7495)
@@ -1,5 +1,6 @@
webERP Change Log
+25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-(
25/4/16 Jan Bakke: Improvements to allow .png and .gif images
15/04/16 PaulT: add missing } causing error.
12/04/16 Exson: add cost security token to make price security and cost security separated to cope with different situation.
|
|
From: <dai...@us...> - 2016-04-25 09:53:55
|
Revision: 7494
http://sourceforge.net/p/web-erp/reponame/7494
Author: daintree
Date: 2016-04-25 09:53:53 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Jan Bakke: improvements to allow gif and png images
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/Contracts.php
trunk/FixedAssetItems.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/Manufacturers.php
trunk/PDFPriceList.php
trunk/PO_Items.php
trunk/SalesCategories.php
trunk/SelectCreditItems.php
trunk/SelectProduct.php
trunk/StockClone.php
trunk/StockDispatch.php
trunk/Stocks.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/Z_ChangeStockCode.php
trunk/Z_ItemsWithoutPicture.php
trunk/doc/Change.log
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/ContractBOM.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -370,10 +370,19 @@
$k=1;
}
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
+ $ImageSource = _('No Image');
}
echo '<td>' . $myrow['stockid'] . '</td>
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Contracts.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -110,16 +110,20 @@
echo '<a href="'. $RootPath . '/SelectContract.php">' . _('Back to Contract Selection'). '</a><br />';
+$SupportedImgExt = array('png','jpg','jpeg');
+
//attempting to upload the drawing image file
if (isset($_FILES['Drawing']) AND $_FILES['Drawing']['name'] !='' AND $_SESSION['Contract'.$identifier]->ContractRef!='') {
$result = $_FILES['Drawing']['error'];
+ $ImgExt = pathinfo($_FILES['Drawing']['name'], PATHINFO_EXTENSION);
+
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.jpg';
+ $filename = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.' . $ImgExt;
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['Drawing']['name']),mb_strlen($_FILES['Drawing']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['Drawing']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -127,12 +131,15 @@
} elseif ( $_FILES['Drawing']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($filename)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($filename);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -913,9 +920,14 @@
<td>' . _('Contract Description') . ':</td>
<td><textarea name="ContractDescription" style="width:100%" required="required" title="' . _('A description of the contract is required') . '" minlength="5" rows="5" cols="40">' . $_SESSION['Contract'.$identifier]->ContractDescription . '</textarea></td>
</tr><tr>
- <td>' . _('Drawing File') . ' .jpg' . ' ' . _('format only') .':</td>
- <td><input type="file" id="Drawing" name="Drawing" /></td>
- </tr>';
+ <td>' . _('Drawing File') . ' ' . implode(", ", $SupportedImgExt) . ' ' . _('format only') .':</td>
+ <td><input type="file" id="Drawing" name="Drawing" />
+
+ </td>';
+
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $_SESSION['Contract'.$identifier]->ContractRef . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ echo '<td> ' . $imagefile . '</td>';
+ echo '</tr>';
if (!isset($_SESSION['Contract'.$identifier]->RequiredDate)) {
$_SESSION['Contract'.$identifier]->RequiredDate = DateAdd(date($_SESSION['DefaultDateFormat']),'m',1);
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/FixedAssetItems.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -27,15 +27,17 @@
$AssetID = '';
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') {
+ $ImgExt = pathinfo($_FILES['ItemPicture']['name'], PATHINFO_EXTENSION);
$result = $_FILES['ItemPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.jpg';
-
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ $filename = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ImgExt;
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -43,12 +45,15 @@
} elseif ( $_FILES['ItemPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($filename)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($filename);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -367,6 +372,14 @@
$result=DB_query($sql, _('Could not delete the asset record'),'',true);
$result = DB_Txn_Commit();
+
+ // Delete the AssetImage
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ unlink($file);
+ }
+ }
prnMsg(_('Deleted the asset record for asset number' ) . ' ' . $AssetID );
unset($_POST['LongDescription']);
@@ -482,22 +495,23 @@
if (!isset($New) ) { //ie not new at all!
echo '<tr>
- <td>' . _('Image File (.jpg)') . ':</td>
- <td><input type="file" id="ItemPicture" name="ItemPicture" /></td>';
+ <td>' . _('Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
+ <td><input type="file" id="ItemPicture" name="ItemPicture" />
+ <br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').'
+ </td>';
- if (function_exists('imagecreatefromjpg')){
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
$AssetImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&AssetID='.urlencode($AssetID).
+ '&StockID='.urlencode('ASSET_' . $AssetID).
'&text='.
'&width=64'.
'&height=64'.
'" />';
+ } else if (file_exists ($imagefile)) {
+ $AssetImgLink = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- if( isset($AssetID) and file_exists($_SESSION['part_pics_dir'] . '/ASSET_' .$AssetID.'.jpg') ) {
- $AssetImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/ASSET_' .$AssetID.'.jpg" />';
- } else {
- $AssetImgLink = _('No Image');
- }
+ $AssetImgLink = _('No Image');
}
if ($AssetImgLink!=_('No Image')) {
@@ -509,6 +523,22 @@
// EOR Add Image upload for New Item - by Ori
} //only show the add image if the asset already exists - otherwise AssetID will not be set - and the image needs the AssetID to save
+if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/ASSET_' . $AssetID . '.' . $ext;
+ if (file_exists ($file) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($file);
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $AssetImgLink = _('No Image');
+ }
+ }
+ }
+}
+
+
echo '<tr>
<td>' . _('Asset Category') . ':</td>
<td><select name="AssetCategoryID">';
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/GetStockImage.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -2,7 +2,7 @@
/* $Id$*/
-//include ('includes/session.inc');
+include ('includes/session.inc');
/*
http://127.0.0.1/~brink/webERP/GetStockImage.php
?automake=1&width=81&height=74&stockid=&textcolor=FFFFF0&bevel=3&text=aa&bgcolor=007F00
@@ -49,13 +49,6 @@
return array('red' => $Red, 'green' => $Green, 'blue' => $Blue );
}
-if (!function_exists('imagecreatefrompng')){
- $Title = _('Image Manipulation Script Problem');
- include('includes/header.inc');
- prnMsg(_('This script requires the gd image functions to be available to php - this needs to be enabled in your server php version before this script can be used'),'error');
- include('includes/footer.inc');
- exit;
-}
$DefaultImage = 'webERPsmall.png';
$FilePath = $_SESSION['part_pics_dir'] . '/';
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/GoodsReceived.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -182,8 +182,15 @@
//Now Display LineItem
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if ($imagefile) {
+ $ImageLink = '<a href="' . $imagefile . '" target="_blank">' . $LnItm->StockID . '</a>';
+ } else {
+ $ImageLink = $LnItm->StockID;
+ }
- echo '<td><a href="' . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $LnItm->StockID . '.jpg" target="_blank">' . $LnItm->StockID . '</a></td>
+ echo '<td>' . $ImageLink . '</td>
<td>' . $LnItm->Suppliers_PartNo . '</td>
<td>' . $LnItm->ItemDescription . '</td>
<td class="number">' . $DisplaySupplierQtyOrd . '</td>
Modified: trunk/Manufacturers.php
===================================================================
--- trunk/Manufacturers.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Manufacturers.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -15,6 +15,8 @@
$SelectedManufacturer = $_POST['SelectedManufacturer'];
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($_POST['submit'])) {
@@ -30,11 +32,13 @@
$result = $_FILES['BrandPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg';
+
+ $ImgExt = pathinfo($_FILES['BrandPicture']['name'], PATHINFO_EXTENSION);
+ $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ImgExt;
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['BrandPicture']['name']),mb_strlen($_FILES['BrandPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['BrandPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -42,12 +46,15 @@
} elseif ( $_FILES['BrandPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -60,13 +67,30 @@
}
}
if( isset($_POST['ManufacturersImage'])){
- if (file_exists($_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg') ) {
- $_POST['ManufacturersImage'] = 'BRAND-' . $SelectedManufacturer . '.jpg';
- } else {
- $_POST['ManufacturersImage'] = '';
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ $_POST['ManufacturersImage'] = 'BRAND-' . $SelectedManufacturer;
+ break;
+ } else {
+ $_POST['ManufacturersImage'] = '';
+ }
}
+
}
-
+ if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ @unlink($file);
+ $_POST['ManufacturersImage'] = '';
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ }
+ }
+ }
+ }
+
$sql = "UPDATE manufacturers SET manufacturers_name='" . $_POST['ManufacturersName'] . "',
manufacturers_url='" . $_POST['ManufacturersURL'] . "'";
if (isset($_POST['ManufacturersImage'])){
@@ -102,11 +126,13 @@
$result = $_FILES['BrandPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.jpg';
+
+ $ImgExt = pathinfo($_FILES['BrandPicture']['name'], PATHINFO_EXTENSION);
+ $FileName = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.' . $ImgExt;
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['BrandPicture']['name']),mb_strlen($_FILES['BrandPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['BrandPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -114,19 +140,25 @@
} elseif ( $_FILES['BrandPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $_SESSION['LastInsertId'] . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
if ($UploadTheFile=='Yes'){
$result = move_uploaded_file($_FILES['BrandPicture']['tmp_name'], $FileName);
$message = ($result)?_('File url') . '<a href="' . $FileName .'">' . $FileName . '</a>' : _('Something is wrong with uploading a file');
- DB_query("UPDATE manufacturers SET manufacturers_image='" . $FileName . "'");
+ DB_query("UPDATE manufacturers
+ SET manufacturers_image='" . 'BRAND-' . $_SESSION['LastInsertId'] . "'
+ WHERE manufacturers_id = '" . $_SESSION['LastInsertId'] . "'
+ ");
}
}
@@ -138,7 +170,6 @@
unset($SelectedManufacturer);
}
-
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
@@ -155,10 +186,13 @@
}
if (!$CancelDelete) {
-
+
$result = DB_query("DELETE FROM manufacturers WHERE manufacturers_id='" . $SelectedManufacturer . "'");
- if( file_exists($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg') ) {
- unlink($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.jpg');
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.' . $ext;
+ if (file_exists ($file) ) {
+ @unlink($file);
+ }
}
prnMsg( _('Manufacturer') . ' ' . $SelectedManufacturer . ' ' . _('has been deleted') . '!', 'success');
unset ($SelectedManufacturer);
@@ -205,16 +239,25 @@
$k=1;
}
- if( file_exists($_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.jpg') ) {
- $BrandImgLink = '<img width="120" height="120" src="' . $_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.jpg" />';
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/BRAND-' . $myrow['manufacturers_id'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists($imagefile)){
+ $BrandImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode('/BRAND-' . $myrow['manufacturers_id']).
+ '&text='.
+ '&width=120'.
+ '&height=120'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $BrandImgLink = '<img src="' . $imagefile . '" height="120" width="120" />';
} else {
$BrandImgLink = _('No Image');
}
+
printf('<td>%s</td>
<td>%s</td>
<td><a target="_blank" href="%s">%s</a></td>
<td>%s</td>
- <td><a href="%sSelectedManufacturer=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedManufacturer=%s&edit=1">' . _('Edit') . '</a></td>
<td><a href="%sSelectedManufacturer=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this brand?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['manufacturers_id'],
@@ -297,13 +340,33 @@
<td><input type="text" name="ManufacturersURL" value="' . $_POST['ManufacturersURL'] . '" size="50" maxlength="50" /></td>
</tr>
<tr>
- <td>' . _('Brand Image File (.jpg)') . ':</td>
- <td><input type="file" id="BrandPicture" name="BrandPicture" /></td>
+ <td>' . _('Brand Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
+ <td><input type="file" id="BrandPicture" name="BrandPicture" />';
+
+ if (isset ($_GET['edit']) ) {
+ echo ' <br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').' ';
+ }
+
+ echo ' </td>
</tr>';
if (isset($SelectedManufacturer)){
- if(file_exists($_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg') ) {
- echo '</tr><td colspan="2"><img width="100" height="100" src="' . $_SESSION['part_pics_dir'] . '/' .'BRAND-' . $SelectedManufacturer . '.jpg" /></tr></tr>';
- }
+
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/BRAND-' . $SelectedManufacturer . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('xgd') && function_exists('gd_info') && file_exists($imagefile)){
+ $BrandImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode('/BRAND-' . $SelectedManufacturer).
+ '&text='.
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ } else {
+ if( isset($SelectedManufacturer) AND !empty($SelectedManufacturer) AND file_exists($imagefile) ) {
+ $BrandImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
+ } else {
+ $BrandImgLink = _('No Image');
+ }
+ }
+ echo '<tr><td colspan="2">' . $BrandImgLink . '</td></tr>';
}
echo '</table>
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/PDFPriceList.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -230,14 +230,14 @@
$YPos -= $FontSize;
// Prints item image:
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $PriceList['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
$YPosImage = $YPos;// Initializes the image bottom $YPos.
- if(file_exists($_SESSION['part_pics_dir'] . '/' .$PriceList['stockid'].'.jpg') ) {
- $img = imagecreatefromjpeg($_SESSION['part_pics_dir'] . '/' . $PriceList['stockid'] . '.jpg');
+ if (file_exists($imagefile) ) {
if($YPos-36 < $Bottom_Margin) {// If the image bottom reaches the bottom margin, do PageHeader().
PageHeader();
}
- $LeftOvers = $pdf->Image($_SESSION['part_pics_dir'] . '/'.$PriceList['stockid'].'.jpg',
- $Left_Margin+3, $Page_Height-$YPos, 36, 36);
+ $LeftOvers = $pdf->Image($imagefile,$Left_Margin+3, $Page_Height-$YPos, 36, 36);
$YPosImage = $YPos-36;// Stores the $YPos of the image bottom (see bottom).
}
// Prints stockmaster.longdescription:
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/PO_Items.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -1147,7 +1147,7 @@
echo '</select></td>
<td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>
- <tr><td>' . _('Only items defined as from this Supplier') . ' <input type="checkbox" name="SupplierItemsOnly" ';
+ <tr><td>' . _('Only items defined as from this Supplier') . ' <input type="checkbox" checked name="SupplierItemsOnly" ';
if (isset($_POST['SupplierItemsOnly']) AND $_POST['SupplierItemsOnly']=='on'){
echo 'checked';
}
@@ -1207,11 +1207,19 @@
$k=1;
}
- $FileName = $myrow['stockid'] . '.jpg';
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
- $ImageSource = '<img src="'.$RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" width="50" height="50" />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
+ $ImageSource = _('No Image');
}
/*Get conversion factor and supplier units if any */
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SalesCategories.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -32,29 +32,36 @@
$EditName = $_POST['EditName'];
}
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($SelectedCategory) AND isset($_FILES['CategoryPicture']) AND $_FILES['CategoryPicture']['name'] !='') {
-
+ $ImgExt = pathinfo($_FILES['CategoryPicture']['name'], PATHINFO_EXTENSION);
+
$result = $_FILES['CategoryPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
// Stock is always capatalized so there is no confusion since "cat_" is lowercase
- $FileName = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg';
+ $FileName = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ImgExt;
- //But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['CategoryPicture']['name']),mb_strlen($_FILES['CategoryPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ //But check for the worst
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
- } elseif ( $_FILES['CategoryPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
+ } else if ( $_FILES['CategoryPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
$UploadTheFile ='No';
- } elseif ( $_FILES['CategoryPicture']['type'] == 'text/plain' ) { //File Type Check
+ } else if ( $_FILES['CategoryPicture']['type'] == 'text/plain' ) { //File Type Check
prnMsg( _('Only graphics files can be uploaded'),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($FileName)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($FileName);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ //prnMsg(_('Attempting to overwrite an existing item image'.$FileName),'warn');
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -65,8 +72,21 @@
/* EOR Add Image upload for New Item - by Ori */
}
+if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($file);
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $AssetImgLink = _('No Image');
+ }
+ }
+ }
+}
-
if (isset($_POST['submit']) AND isset($EditName) ) { // Creating or updating a category
//initialise no input errors assumed initially before we test
@@ -110,7 +130,6 @@
$result = DB_query($sql);
prnMsg($msg,'success');
}
-
unset ($SelectedCategory);
unset($_POST['SalesCatName']);
unset($_POST['Active']);
@@ -138,9 +157,18 @@
$result = DB_query($sql);
prnMsg(_('The sales category') . ' ' . $SelectedCategory . ' ' . _('has been deleted') .
' !','success');
- if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg') ) {
- unlink($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg');
+
+ //if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg') ) {
+ // unlink($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg');
+ //}
+
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
+ if (file_exists ($file) ) {
+ unlink($file);
+ }
}
+
unset ($SelectedCategory);
}
} //end if stock category used in debtor transactions
@@ -254,12 +282,22 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
- if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $myrow['salescatid'] . '.jpg') ) {
- $CatImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . 'SALESCAT_' . $myrow['salescatid'] . '&text=&width=120&height=120" alt="" />';
+
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/SALESCAT_' . $myrow['salescatid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if( extension_loaded('gd') && function_exists('gd_info') && file_exists($imagefile) ) {
+ $CatImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode('SALESCAT_' . $myrow['salescatid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $CatImgLink = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
$CatImgLink = _('No Image');
}
+
if ($myrow['active'] == 1){
$Active = _('Yes');
}else{
@@ -321,7 +359,7 @@
$_POST['Active'] = $myrow['active'];
echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />';
- echo '<input type="hidden" name="ParentCategory" value="' . (isset($_POST['ParentCatId'])?($_POST['ParentCategory']):('0')) . '" />';
+ echo '<input type="hidden" name="ParentCategory" value="' . $myrow['parentcatid'] . '" />';
$FormCaps = _('Edit Sub Category');
} else { //end of if $SelectedCategory only do the else when a new record is being entered
@@ -347,7 +385,7 @@
echo '<tr>
<td>' . _('Display in webSHOP?') . ':</td>
<td><select name="Active">';
-if ($_POST['Active'] == '1') {
+if (isset ($_POST['Active']) && $_POST['Active'] == '1') {
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
echo '<option value="0">' . _('No') . '</option>';
} else {
@@ -360,8 +398,10 @@
// Image upload only if we have a selected category
if (isset($SelectedCategory)) {
echo '<tr>
- <td>' . _('Image File (.jpg)') . ':</td>
- <td><input type="file" id="CategoryPicture" name="CategoryPicture" /></td>
+ <td>' . _('Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
+ <td><input type="file" id="CategoryPicture" name="CategoryPicture" />
+ <br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').'
+ </td>
</tr>';
}
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SelectCreditItems.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -1032,11 +1032,20 @@
echo '<tr class="OddTableRows">';
$k++;
}
- if(file_exists($_SESSION['part_pics_dir'] . '/' .mb_strtoupper($myrow['stockid']).'.jpg') ) {
+
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
printf('<td><input type="submit" name="NewItem" value="%s" /></td>
<td>%s</td>
<td>%s</td>
- <td><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=%s&text=&width=120&height=120" /></td></tr>',
+ <td>' . $ImageSource . '</td></tr>',
$myrow['stockid'],
$myrow['description'],
$myrow['units'],
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SelectProduct.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -399,7 +399,10 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
echo '<a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- echo '<a href="' . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
+
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ echo '<a href="' . $RootPath . '/' . $imagefile . '" target="_blank">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $RootPath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
@@ -414,8 +417,9 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == false) {
echo '<a href="' . $RootPath . '/StockAdjustments.php?StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
echo '<a href="' . $RootPath . '/StockTransfers.php?StockID=' . $StockID . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
+
//show the item image if it has been uploaded
- if (function_exists('imagecreatefromjpg')){
+ if ( extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
if ($_SESSION['ShowStockidOnImages'] == '0'){
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($StockID).
@@ -431,17 +435,14 @@
'&height=100'.
'" alt="" />';
}
+ } else if (file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
} else {
- if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
- } else {
- $StockImgLink = _('No Image');
- }
+ $StockImgLink = _('No Image');
}
echo '<div class="centre">' . $StockImgLink . '</div>';
-
if (($myrow['mbflag'] == 'B')
AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
AND $myrow['discontinued']==0){
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/StockClone.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -53,17 +53,33 @@
<img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Stock') . '" alt="" />' . ' ' . $Title . '
</p>';
echo '<div class="page_help_text">' . _('Cloning will create a new item with the same properties, image, cost, purchasing and pricing data as the selected item. Item image and general item details can be changed below prior to cloning.') . '.</div><br />';
+
+$SupportedImgExt = array('png','jpg','jpeg');
+
+// Check extention for existing old file
+foreach ($SupportedImgExt as $ext) {
+ $oldfile = $_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'] . '.' . $ext;
+ if (file_exists ($oldfile) ) {
+ break;
+ $ext = pathinfo($oldfile, PATHINFO_EXTENSION);
+ }
+}
+
if (!empty($_POST['OldStockID'])) { //only show this if there is a valid call to this script
if (isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') { //we are uploading a new file
- $newfilename = ($_POST['OldStockID'] == $_POST['StockID']) || $_POST['StockID'] == ''? $_POST['OldStockID'].'-TEMP': $_POST['StockID'] ; //so we can add a new file but not remove an existing item file
+ $newfilename = ($_POST['OldStockID'] == $_POST['StockID']) || $_POST['StockID'] == ''? $_POST['OldStockID'].'-TEMP': $_POST['StockID'] ; //so we can add a new file but not remove an existing item file
$result = $_FILES['ItemPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/' . $newfilename . '.jpg';
+ if (pathinfo($_FILES['ItemPicture']['name'], PATHINFO_EXTENSION) != $ext) {
+ $ext = pathinfo($_FILES['ItemPicture']['name'], PATHINFO_EXTENSION);
+ }
+ $filename = $_SESSION['part_pics_dir'] . '/' . $newfilename . '.' . $ext;
+
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
- $UploadTheFile ='No';
+ if (!in_array ($ext, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
+ $UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The image file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
$UploadTheFile ='No';
@@ -87,21 +103,21 @@
$result = move_uploaded_file($_FILES['ItemPicture']['tmp_name'], $filename);
$message = ($result)?_('File url') . '<a href="' . $filename .'">' . $filename . '</a>' : _('Something is wrong with uploading a file');
}
- } elseif (!empty($_POST['StockID']) AND ($_POST['StockID'] != $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'-TEMP'.'.jpg') ) {
- //rename the temp one to the new name
- $oldfile = $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg';
- if (!copy($oldfile, $_SESSION['part_pics_dir'] . '/' .$_POST['StockID'].'.jpg')) {
+ } elseif (!empty($_POST['StockID']) AND ($_POST['StockID'] != $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'] . '-TEMP' . '.' . $ext) ) {
+ //rename the temp one to the new name
+ $oldfile = $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP' . '.' . $ext;
+ if (!copy($oldfile, $_SESSION['part_pics_dir'] . '/' .$_POST['StockID'] . '.' . $ext)) {
prnMsg(_('There was an image file to clone but there was an error copying. Please upload a new image if required.'),'warn');
}
- @unlink($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg');
- if (is_file($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg')) {
+ @unlink($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP' . '.' . $ext);
+ if (is_file($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP' . '.' . $ext)) {
prnMsg(_('Unable to delete the temporary image file for cloned item.'),'error');
} else {
$StockImgLink = _('No Image');
}
- } elseif (isset( $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'.jpg') AND !file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'-TEMP'.'.jpg') ) {
- //we should copy
- if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg', $_SESSION['part_pics_dir'] . '/' .$_POST['StockID'].'.jpg')) {
+ } elseif (isset( $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'] . '.' . $ext) AND !file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'-TEMP' . '.' . $ext) ) {
+ //we should copy
+ if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'] . '.' . $ext, $_SESSION['part_pics_dir'] . '/' . $_POST['StockID'] . '.' . $ext)) {
prnMsg(_('There was an image file to clone but there was an error copying. Please upload a new image if required.'),'warn');
}
}
@@ -706,7 +722,7 @@
$tempid = $_POST['StockID'];
}
- if (function_exists('imagecreatefromjpg') && isset($tempfile)){
+ if (extension_loaded('gd') && function_exists ('gd_info') && isset ($tempfile) ) {
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($tempid).
'&text='.
@@ -714,22 +730,22 @@
'&height=100'.
'" alt="" />';
} else {
- if( !empty($tempid) AND file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg') ) {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $tempid . '.jpg" height="100" width="100" />';
+ if( !empty($tempid) AND file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.' . $ext) ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $tempid . '.' . $ext . '" height="100" width="100" />';
if (isset($_POST['ClearImage']) ) {
//workaround for many variations of permission issues that could cause unlink fail
- @unlink($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg');
- if (is_file($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg')) {
+ @unlink($_SESSION['part_pics_dir'] . '/' .$tempid.'.' . $ext);
+ if (is_file($_SESSION['part_pics_dir'] . '/' .$tempid.'.' . $ext)) {
prnMsg(_('You do not have access to delete this item image file.'),'error');
} else {
$StockImgLink = _('No Image');
}
}
- } elseif ( !empty($tempid) AND !file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg') AND file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')) {
- if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg', $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg')) {
+ } elseif ( !empty($tempid) AND !file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.' . $ext) AND file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.' . $ext)) {
+ if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.' . $ext, $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP' . '.' . $ext)) {
$StockImgLink = _('No Image');
} else {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg" height="100" width="100" />';
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP' . '.' . $ext . '" height="100" width="100" />';
}
} else {
$StockImgLink = _('No Image');
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/StockDispatch.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -223,8 +223,10 @@
} else {
//for full template
$pdf->addTextWrap(50,$YPos,70,$FontSize,$myrow['stockid'],'',0,$fill);
- if(file_exists($_SESSION['part_pics_dir'] . '/' .$myrow['stockid'].'.jpg') ) {
- $pdf->Image($_SESSION['part_pics_dir'] . '/'.$myrow['stockid'].'.jpg',135,$Page_Height-$Top_Margin-$YPos+10,45,35);
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (file_exists ($imagefile) ) {
+ $pdf->Image($imagefile,135,$Page_Height-$Top_Margin-$YPos+10,35,35);
}/*end checked file exist*/
$pdf->addTextWrap(180,$YPos,200,$FontSize,$myrow['description'],'',0,$fill);
$pdf->addTextWrap(355,$YPos,40,$FontSize,locale_number_format($myrow['fromquantity'] - $InTransitQuantityAtFrom,$myrow['decimalplaces']),'right',0,$fill);
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Stocks.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -63,15 +63,17 @@
<img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Stock') . '" alt="" />' . ' ' . $Title . '
</p>';
+$SupportedImgExt = array('png','jpg','jpeg');
+
if (isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') {
-
+ $ImgExt = pathinfo($_FILES['ItemPicture']['name'], PATHINFO_EXTENSION);
+
$result = $_FILES['ItemPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
- $filename = $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg';
-
+ $filename = $_SESSION['part_pics_dir'] . '/' . $StockID . '.' . $ImgExt;
//But check for the worst
- if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
- prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ if (!in_array ($ImgExt, $SupportedImgExt)) {
+ prnMsg(_('Only ' . implode(", ", $SupportedImgExt) . ' files are supported - a file extension of ' . implode(", ", $SupportedImgExt) . ' is expected'),'warn');
$UploadTheFile ='No';
} elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
prnMsg(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
@@ -82,12 +84,15 @@
} elseif ( $_FILES['ItemPicture']['error'] == 6 ) { //upload temp directory check
prnMsg( _('No tmp directory set. You must have a tmp directory set in your PHP for upload of files. '),'warn');
$UploadTheFile ='No';
- } elseif (file_exists($filename)){
- prnMsg(_('Attempting to overwrite an existing item image'),'warn');
- $result = unlink($filename);
- if (!$result){
- prnMsg(_('The existing image could not be removed'),'error');
- $UploadTheFile ='No';
+ }
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/' . $StockID . '.' . $ext;
+ if (file_exists ($file) ) {
+ $result = unlink($file);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
}
}
@@ -1041,38 +1046,43 @@
}
echo '<tr>
- <td>' . _('Image File (.jpg)') . ':</td>
+ <td>' . _('Image File (' . implode(", ", $SupportedImgExt) . ')') . ':</td>
<td><input type="file" id="ItemPicture" name="ItemPicture" />
<br /><input type="checkbox" name="ClearImage" id="ClearImage" value="1" > '._('Clear Image').'
</td>';
-if (function_exists('imagecreatefromjpg') && isset($StockID) && !empty($StockID)){
+$imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+if (extension_loaded('gd') && function_exists('gd_info') && isset($StockID) && !empty($StockID)){
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($StockID).
'&text='.
- '&width=100'.
- '&height=100'.
+ '&width=64'.
+ '&height=64'.
'" alt="" />';
+} else if (file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- if( isset($StockID) AND !empty($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg" height="100" width="100" />';
- if (isset($_POST['ClearImage']) ) {
- //workaround for many variations of permission issues that could cause unlink fail
- @unlink($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg');
- if(is_file($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg')) {
- prnMsg(_('You do not have access to delete this item image file.'),'error');
- } else {
- $StockImgLink = _('No Image');
- }
- }
- } else {
- $StockImgLink = _('No Image');
- }
+ $StockImgLink = _('No Image');
}
if ($StockImgLink!=_('No Image')) {
echo '<td>' . _('Image') . '<br />' . $StockImgLink . '</td>';
}
+
+if (isset($_POST['ClearImage']) ) {
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/' . $StockID . '.' . $ext;
+ if (file_exists ($file) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($file);
+ if(is_file($imagefile)) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
+ }
+}
echo '</tr>';
echo '<tr>
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SupplierTenderCreate.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -869,15 +869,21 @@
$k=1;
}
- $FileName = $myrow['stockid'] . '.jpg';
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="64" width="64" />';
+ } else {
+ $ImageSource = _('No Image');
+ }
- $ImageSource = '<img src="'.$RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $FileName . '" width="50" height="50" />';
-
- } else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
- }
-
echo '<td>' . $myrow['stockid'] . '</td>
<td>' . $myrow['description'] . '</td>
<td>' . $myrow['units'] . '</td>
Modified: trunk/SupplierTenders.php
===================================================================
--- trunk/SupplierTenders.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/SupplierTenders.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -705,13 +705,19 @@
$k=1;
}
- $FileName = $myrow['stockid'] . '.jpg';
- if (file_exists( $_SESSION['part_pics_dir'] . '/' . $FileName) ) {
-
- $ImageSource = '<img src="'.$RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" width="50" height="50" />';
-
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- $ImageSource = '<i>' . _('No Image') . '</i>';
+ $ImageSource = _('No Image');
}
$UOMsql="SELECT conversionfactor,
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/WorkOrderEntry.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -744,14 +744,20 @@
while ($myrow=DB_fetch_array($SearchResult)) {
if (!in_array($myrow['stockid'],$ItemCodes)){
- if (function_exists('imagecreatefrompng') ){
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64" />';
+
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- if(file_exists($_SERVER['DOCUMENT_ROOT'] . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg')) {
- $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" />';
- } else {
- $ImageSource = _('No Image');
- }
+ $ImageSource = _('No Image');
}
if ($k==1){
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/WorkOrderIssue.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -792,15 +792,20 @@
while ($myrow=DB_fetch_array($SearchResult)) {
+ $SupportedImgExt = array('png','jpg','jpeg');
if (!in_array($myrow['stockid'],$ItemCodes)){
- if (function_exists('imagecreatefrompng') ){
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64" alt="" />';
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
+ } else if (file_exists ($imagefile)) {
+ $ImageSource = '<img src="' . $imagefile . '" height="64" width="64" />';
} else {
- if(file_exists($_SERVER['DOCUMENT_ROOT'] . $RootPath. '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg')) {
- $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $RootPath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" alt="" />';
- } else {
- $ImageSource = _('No Image');
- }
+ $ImageSource = _('No Image');
}
if ($k==1){
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Z_ChangeStockCode.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -161,15 +161,19 @@
/* ChangeFieldInTable("Stockdescriptions", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);// Updates the translated item descriptions (StockDescriptions)*/
echo '<br />' . _('Changing any image files');
- if (file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')){
- if (rename($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg',
- $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'].'.jpg')) {
- echo ' ... ' . _('completed');
+ $SupportedImgExt = array('png','jpg','jpeg');
+ foreach ($SupportedImgExt as $ext) {
+ $file = $_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'] . '.' . $ext;
+ if (file_exists ($file) ) {
+ if (rename($file,
+ $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'] . '.' . $ext)) {
+ echo ' ... ' . _('completed');
+ } else {
+ echo ' ... ' . _('failed');
+ }
} else {
- echo ' ... ' . _('failed');
+ echo ' .... ' . _('no image to rename');
}
- } else {
- echo ' .... ' . _('no image to rename');
}
ChangeFieldInTable("stockitemproperties", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
Modified: trunk/Z_ItemsWithoutPicture.php
===================================================================
--- trunk/Z_ItemsWithoutPicture.php 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/Z_ItemsWithoutPicture.php 2016-04-25 09:53:53 UTC (rev 7494)
@@ -23,8 +23,10 @@
echo '<table class="selection">';
$k = 0; //row colour counter
$i = 1;
+ $SupportedImgExt = array('png','jpg','jpeg');
while ($myrow = DB_fetch_array($result)) {
- if(!file_exists($_SESSION['part_pics_dir'] . '/' .$myrow['stockid'].'.jpg') ) {
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if(!file_exists($imagefile) ) {
if($PrintHeader){
$TableHeader = '<tr>
<th>' . '#' . '</th>
@@ -42,15 +44,15 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- $CodeLink = '<a href="' . $RootPath . '/SelectProduct.php?StockID=' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</a>';
+ $CodeLink = '<a href="' . $RootPath . '/SelectProduct.php?StockID=' . $myrow['stockid'] . '" target="_blank">' . $myrow['stockid'] . '</a>';
printf('<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- </tr>',
- $i,
+ </tr>',
+ $i,
$myrow['categorydescription'],
- $CodeLink,
+ $CodeLink,
$myrow['description']
);
$i++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-16 01:37:00 UTC (rev 7493)
+++ trunk/doc/Change.log 2016-04-25 09:53:53 UTC (rev 7494)
@@ -1,4 +1,6 @@
webERP Change Log
+
+25/4/16 Jan Bakke: Improvements to allow .png and .gif images
15/04/16 PaulT: add missing } causing error.
12/04/16 Exson: add cost security ...
[truncated message content] |
|
From: <tu...@us...> - 2016-04-16 01:37:01
|
Revision: 7493
http://sourceforge.net/p/web-erp/reponame/7493
Author: turbopt
Date: 2016-04-16 01:37:00 +0000 (Sat, 16 Apr 2016)
Log Message:
-----------
add missing } causing error.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-04-12 01:39:05 UTC (rev 7492)
+++ trunk/PcAuthorizeExpenses.php 2016-04-16 01:37:00 UTC (rev 7493)
@@ -323,7 +323,7 @@
echo '<option value="';
}
echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
-
+ }
} //end while loop get type of tab
echo '</select></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-12 01:39:05 UTC (rev 7492)
+++ trunk/doc/Change.log 2016-04-16 01:37:00 UTC (rev 7493)
@@ -1,5 +1,5 @@
webERP Change Log
-
+15/04/16 PaulT: add missing } causing error.
12/04/16 Exson: add cost security token to make price security and cost security separated to cope with different situation.
10/04/16 RChacon: In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
10/04/16 RChacon: In SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". In SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. In css/*/default.css, regroup horizontal align classes for readability. In doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
@@ -18,7 +18,7 @@
24/02/16: Richard, Exson Fix the GLPosting initiating error in GLPostings.inc.
20/02/16 Janb,Tim fixed typo in upgrade4.12.3-4.13.sql
19/02/16 Daveparrish fixed page number error of AgedDebtors.php.
-02/02/16 Exson\xA3\xBAFixed the bug of chartdetails bfwd amount wrong in GLPostings.inc.
+02/02/16 Exson��Fixed the bug of chartdetails bfwd amount wrong in GLPostings.inc.
1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc.
30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish.
14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php.
|
|
From: <ex...@us...> - 2016-04-12 01:39:07
|
Revision: 7492
http://sourceforge.net/p/web-erp/reponame/7492
Author: exsonqu
Date: 2016-04-12 01:39:05 +0000 (Tue, 12 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-12 01:36:11 UTC (rev 7491)
+++ trunk/doc/Change.log 2016-04-12 01:39:05 UTC (rev 7492)
@@ -1,5 +1,6 @@
webERP Change Log
+12/04/16 Exson: add cost security token to make price security and cost security separated to cope with different situation.
10/04/16 RChacon: In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
10/04/16 RChacon: In SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". In SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. In css/*/default.css, regroup horizontal align classes for readability. In doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
07/04/16 RChacon: In includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
|
|
From: <ex...@us...> - 2016-04-12 01:36:13
|
Revision: 7491
http://sourceforge.net/p/web-erp/reponame/7491
Author: exsonqu
Date: 2016-04-12 01:36:11 +0000 (Tue, 12 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2016-04-11 02:00:42 UTC (rev 7490)
+++ trunk/SelectProduct.php 2016-04-12 01:36:11 UTC (rev 7491)
@@ -4,6 +4,7 @@
$PricesSecurity = 12;//don't show pricing info unless security token 12 available to user
$SuppliersSecurity = 9; //don't show supplier purchasing info unless security token 9 available to user
+$CostSecurity = 18; //don't show cost info unless security token 18 available to user
include ('includes/session.inc');
$Title = _('Search Inventory Items');
@@ -174,6 +175,7 @@
$Price = $PriceRow[1];
echo '<td class="select" colspan="2" style="text-align:right">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>';
}
+ if (in_array($CostSecurity,$_SESSION['AllowedPageSecurityTokens'])) {
echo '<th class="number">' . _('Cost') . ':</th>
<td class="select" style="text-align:right">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td>
<th class="number">' . _('Gross Profit') . ':</th>
@@ -183,8 +185,9 @@
} else {
echo _('N/A');
}
- echo '</td>
- </tr>';
+ echo '</td>';
+ }
+ echo '</tr>';
} //end of if PricesSecuirty allows viewing of prices
echo '</table>'; //end of first nested table
// Item Category Property mod: display the item properties
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-11 02:00:42 UTC (rev 7490)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-12 01:36:11 UTC (rev 7491)
@@ -54,6 +54,7 @@
ALTER table pctabs DROP FOREIGN KEY `pctabs_ibfk_4`;
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
+INSERT INTO securitytokens VALUES(18,'Cost authority');
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2016-04-11 02:00:44
|
Revision: 7490
http://sourceforge.net/p/web-erp/reponame/7490
Author: rchacon
Date: 2016-04-11 02:00:42 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
Modified Paths:
--------------
trunk/WorkCentres.php
trunk/doc/Change.log
trunk/doc/Manual/ManualManufacturing.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/WorkCentres.php
===================================================================
--- trunk/WorkCentres.php 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/WorkCentres.php 2016-04-11 02:00:42 UTC (rev 7490)
@@ -1,9 +1,11 @@
<?php
/* $Id$*/
+/* Defines the various centres of work within a manufacturing company. Also the overhead and labour rates applicable to the work centre and its standard capacity */
-
include('includes/session.inc');
$Title = _('Work Centres');
+$ViewTopic = 'Manufacturing';
+$BookMark = 'WorkCentres';
include('includes/header.inc');
if (isset($_POST['SelectedWC'])){
@@ -124,11 +126,12 @@
$result = DB_query($sql);
echo '<table class="selection">
<tr>
- <th class="ascending">' . _('WC Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('Location') . '</th>
- <th class="ascending">' . _('Overhead GL Account') . '</th>
- <th class="ascending">' . _('Overhead Per Hour') . '</th>
+ <th class="ascending">', _('WC Code'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th class="ascending">', _('Location'), '</th>
+ <th class="ascending">', _('Overhead GL Account'), '</th>
+ <th class="ascending">', _('Overhead Per Hour'), '</th>
+ <th colspan="2"> </th>
</tr>';
while ($myrow = DB_fetch_array($result)) {
@@ -160,7 +163,10 @@
//end of ifs and buts!
if (isset($SelectedWC)) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="',// Icon image.
+ $Title, '" /> ',// Icon title.
+ $Title, '</p>';// Page title.
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show all Work Centres') . '</a></div>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/doc/Change.log 2016-04-11 02:00:42 UTC (rev 7490)
@@ -1,10 +1,11 @@
webERP Change Log
-10/04/16 RChacon: On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
-07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
+10/04/16 RChacon: In WorkCentres.php, add ViewTopic and BookMark and completes html table. In doc/Manual/ManualManufacturing.html, add help for WorkCentres.php.
+10/04/16 RChacon: In SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". In SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. In css/*/default.css, regroup horizontal align classes for readability. In doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
+07/04/16 RChacon: In includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
-24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
+24/03/16 RChacon: In CustomerReceipt.php, allow more precision on the functional_exchange_rate. In Payments.php, add pattern and required attributes to the functional_exchange_rate input.
24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php.
18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php.
18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php.
@@ -26,9 +27,9 @@
13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
-29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
+29/12/15 RChacon: In GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
-27/12/15 RChacon: On UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
+27/12/15 RChacon: In UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
26/12/2015 Exson: Add items not received information on outstanding po inquiry screen in PO_SelectOSPurchOrder.php.
24/12/15 Exson: Add supplier no as a option for supplier transaction inquiry in SupplierTransInquiry.php.
24/12/15 Exson: Add width of printed text to make day to appear in PDFOstdgGRNsPageHeader.inc.
Modified: trunk/doc/Manual/ManualManufacturing.html
===================================================================
--- trunk/doc/Manual/ManualManufacturing.html 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/doc/Manual/ManualManufacturing.html 2016-04-11 02:00:42 UTC (rev 7490)
@@ -169,4 +169,36 @@
<p>MRP.php runs the MRP itself. It is a regenerative process that purges all of the old files and creates new ones. There is a selection to chose the location for inventory. Days Leeway can be entered, so purchase order and work order dates scheduled within the leeway of the calculated need date are considered valid; the system does not actually change the dates in the work orders or purchase orders, but there is a report of those orders that the MRP estimates should be changed. And there are check boxes to select if MRP Demands, eoq, pan size, and shrinkage factor should be used. The MRP runs pretty quickly. The system I am running it against is not as large as most long running systems, but, with about 3,000 parts, a few hundred open sales orders and purchase orders, a half a dozen demands for assemblies that go 7 levels deep and have close to a thousand parts, plus individual demands for a few hundred other parts, I run this on a 3 and a half year old iMac with 1 gig of memory and it takes less than a minute. I also tried it on my web host, which is in Chicago, while I’m in New Jersey about 30 miles west of New York, and it took less than 20 seconds.</p>
-<p>The MRP doesn’t change or create webERP purchase orders or work orders. I think it might be dangerous to do that automatically, without some sort of human oversight. In the 2.0 version, I might have some sort of screen that will bring up what I call MRP Planned Orders and allow users to generate purchase orders or work orders from them. Right now, there are several reports to show the results of the MRP. MRPReschedules.php shows those work orders and purchase orders that the system calculates should have their dates changed; if there is no requirement for the orders, a CANCEL message is displayed. MRPPlannedWorkOrders.php and MRPPlannedPurchaseOrders.php show orders that the MRP calculates should be created. The reports can be created showing every individual order needed and the source of its requirement, or the orders can be consolidated into weekly or monthly orders. MRPReport.php shows the supply and demand for individual parts. On the demand side, it shows the type of order that created the demand, the top level part for that demand, and the order number – in the case of user entered MRP demands, the order number is system generated. The supply side shows orders that make up the supply and in the case of Planned orders created by the MRP, it shows the type of demand the supply was planned to cover and the order number for that demand. Finally, there is MRPShortages.php that shows those parts that have a demand that is greater than the supply. The dollar total might be a little misleading because if there is a sales order for an assembly without enough supply to cover it, that will show up on the report, but so will all of the components that are needed to build the assembly. I haven’t quite decided if I should exclude the components or not. <!-- Help End: Manufacturing --></p>
+<p>The MRP doesn’t change or create webERP purchase orders or work orders. I think it might be dangerous to do that automatically, without some sort of human oversight. In the 2.0 version, I might have some sort of screen that will bring up what I call MRP Planned Orders and allow users to generate purchase orders or work orders from them. Right now, there are several reports to show the results of the MRP. MRPReschedules.php shows those work orders and purchase orders that the system calculates should have their dates changed; if there is no requirement for the orders, a CANCEL message is displayed. MRPPlannedWorkOrders.php and MRPPlannedPurchaseOrders.php show orders that the MRP calculates should be created. The reports can be created showing every individual order needed and the source of its requirement, or the orders can be consolidated into weekly or monthly orders. MRPReport.php shows the supply and demand for individual parts. On the demand side, it shows the type of order that created the demand, the top level part for that demand, and the order number – in the case of user entered MRP demands, the order number is system generated. The supply side shows orders that make up the supply and in the case of Planned orders created by the MRP, it shows the type of demand the supply was planned to cover and the order number for that demand. Finally, there is MRPShortages.php that shows those parts that have a demand that is greater than the supply. The dollar total might be a little misleading because if there is a sales order for an assembly without enough supply to cover it, that will show up on the report, but so will all of the components that are needed to build the assembly. I haven’t quite decided if I should exclude the components or not.</p>
+
+<div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+</div>
+
+<h2><a id="Maintenance">Maintenance</a></h2>
+
+<h3><a id="WorkCentres">Work Centres</a></h3>
+
+<p>A table of work centres is maintained. It contains the following fields:</p>
+
+<dl>
+ <dt>Work Centre Code</dt>
+ <dd>Enter up to five characters for the work centre code.</dd>
+
+ <dt>Work Centre Description</dt>
+ <dd>Enter up to 20 characters for the work centre name.</dd>
+
+ <dt>Location</dt>
+ <dd>A work centre location is the factory or warehouse where the work center belongs. See <a href="ManualContents.php?ViewTopic=Inventory#Locations">Locations Maintenance</a> to set up a location.</dd>
+
+ <dt>Overhead Recovery GL Account</dt>
+ <dd>The value of the overheads allocated to works and pay for employees in this work centre will be costed to this GL account.</dd>
+
+ <dt>Overhead Per Hour</dt>
+ <dd>Enter the rate per hour (if the method you selected to calculate the overhead was as an hourly rate)
+ <!--or overhead percentage to be applied as an on-cost (if you elected to calculate the overhead as a percentage).-->.</dd>
+</dl>
+
+<!--p>Comments. if Overhead Per Hour is zero or negative = other methods ? </p-->
+
+<!-- Help End: Manufacturing -->
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-10 17:12:51 UTC (rev 7489)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-11 02:00:42 UTC (rev 7490)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-29 12:33-0600\n"
-"PO-Revision-Date: 2016-03-31 07:32-0600\n"
+"PO-Revision-Date: 2016-04-10 19:44-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -2145,7 +2145,7 @@
#: BOMExtendedQty.php:274
msgid "Only Show Shortages"
-msgstr "Mostrar Sólo Escasez"
+msgstr "Solo mostrar escasez"
#: BOMExtendedQty.php:278 BOMIndented.php:268 BOMIndentedReverse.php:246
#: MRPPlannedPurchaseOrders.php:280 MRPPlannedWorkOrders.php:336
@@ -2585,7 +2585,7 @@
#: BOMInquiry.php:245
msgid "Overhead Cost"
-msgstr "Gastos Generales"
+msgstr "Costos generales"
#: BOMInquiry.php:256
msgid "Enter a stock item code above"
@@ -6007,7 +6007,7 @@
#: ContractBOM.php:399 SupplierTenders.php:758
msgid "Only the first"
-msgstr "Sólo el primero"
+msgstr "Solo el primero"
#: ContractBOM.php:399 SupplierTenders.php:758
msgid "can be displayed"
@@ -6388,7 +6388,7 @@
#: Manufacturers.php:115 SalesCategories.php:50 StockClone.php:71
#: Stocks.php:80 Z_MakeNewCompany.php:53
msgid "Only graphics files can be uploaded"
-msgstr "Sólo puede cargar ficheros gráficos"
+msgstr "Solo puede cargar archivos gráficos"
#: Contracts.php:131 FixedAssetItems.php:47 Manufacturers.php:46
#: Manufacturers.php:118 SalesCategories.php:53 StockClone.php:77
@@ -7504,7 +7504,7 @@
#: CounterSales.php:436 SelectOrderItems.php:866 SelectOrderItems.php:1053
msgid "An invalid date entry was made for "
-msgstr "Se realizó una entrada de fecha inválida para "
+msgstr "Se realizó una entrada de fecha no válida para "
#: CounterSales.php:436 SelectOrderItems.php:866 SelectOrderItems.php:1053
msgid "The date entry"
@@ -9361,7 +9361,7 @@
#: CustomerAllocations.php:51
msgid "Only positive amounts are allowed"
-msgstr "Sólo se permiten importes positivos"
+msgstr "Solo se permite cantidades positivas"
#: CustomerAllocations.php:75
msgid ""
@@ -11491,7 +11491,7 @@
#: DeliveryDetails.php:99 DeliveryDetails.php:104 DeliveryDetails.php:109
msgid "An invalid date entry was made"
-msgstr "La Fecha es inválida"
+msgstr "Se hizo una entrada de fecha no válidas "
#: DeliveryDetails.php:99 DeliveryDetails.php:104 DeliveryDetails.php:109
msgid "The date entry must be in the format"
@@ -15933,13 +15933,13 @@
#: POReport.php:871 SalesInquiry.php:82 SelectQASamples.php:166
#: TestPlanResults.php:49
msgid "Invalid From Date"
-msgstr "Fecha Desde Inválida"
+msgstr "Fecha Desde no válida"
#: HistoricalTestResults.php:31 MRPCalendar.php:52 POReport.php:92
#: POReport.php:875 SalesInquiry.php:86 SelectQASamples.php:171
#: TestPlanResults.php:54
msgid "Invalid To Date"
-msgstr "Fecha A Inválida"
+msgstr "Fecha A no válida"
#: HistoricalTestResults.php:51
msgid "Show Test Results For"
@@ -17802,7 +17802,7 @@
#: MRPCalendar.php:157
msgid "Invalid Change Date"
-msgstr "Fecha de Cambio Inválida"
+msgstr "Fecha de Cambio no válida"
#: MRPCalendar.php:174
msgid "Cannot update the MRP Calendar"
@@ -18000,11 +18000,11 @@
#: MRPDemands.php:151
msgid "Invalid due date"
-msgstr "Fecha de vencimiento inválida"
+msgstr "Fecha de vencimiento no válida"
#: MRPDemands.php:159
msgid "Invalid demand type"
-msgstr "Tipo de solicitud inválida"
+msgstr "Tipo de solicitud no válida"
#: MRPDemands.php:169
msgid "is not a valid item code"
@@ -31580,7 +31580,7 @@
#: StockClone.php:1004 Stocks.php:1338
msgid "Shrinkage Factor"
-msgstr "Factor de Escasez (¿Merma?)"
+msgstr "Factor de merma"
#: StockClone.php:1035 Stocks.php:1369
msgid "Item Category Properties"
@@ -35894,7 +35894,7 @@
#: Suppliers.php:745
msgid "Only email address are allowed"
-msgstr ""
+msgstr "Solo se permite direcciones de correo-e"
#: Suppliers.php:745 Suppliers.php:989
msgid "email format such as xx...@ma..."
@@ -35902,7 +35902,7 @@
#: Suppliers.php:749
msgid "Only URL address are allowed"
-msgstr ""
+msgstr "Sólo se permite direcciones URL"
#: Suppliers.php:749
msgid "URL format such as www.example.com"
@@ -36909,8 +36909,8 @@
"Number of month must be shown on report can be changed with this parameters "
"ex: in CustomerInquiry.php "
msgstr ""
-"El número de mes deberá indicarse en el informe, se puede cambiar con estos "
-"parámetros Ejm: in CustomerInquiry.php"
+"La cantidad de meses a mostrar por omisión en el informe se puede cambiar "
+"con este parámetro. E.g. en CustomerInquiry.php"
#: SystemParameters.php:878
msgid "The directory where images are stored"
@@ -39336,11 +39336,11 @@
#: WorkCentres.php:130
msgid "Overhead GL Account"
-msgstr "Cuenta Contable de Gastos Generales"
+msgstr "Cuenta contable de gastos generales"
#: WorkCentres.php:131 WorkCentres.php:275
msgid "Overhead Per Hour"
-msgstr "Gastos Generales Por Hora"
+msgstr "Gastos generales por hora"
#: WorkCentres.php:143
#, php-format
@@ -39615,7 +39615,7 @@
#: WorkOrderEntry.php:344
msgid "The required by date entered is in an invalid format"
-msgstr "La fecha de \"requerido\" por entrada está en un formato inválido"
+msgstr "La fecha de \"requerido\" por entrada está en un formato no válido"
#: WorkOrderEntry.php:364
msgid ""
@@ -42228,7 +42228,7 @@
#: Z_ImportFixedAssets.php:128
msgid "Invalid Description:"
-msgstr "Descripción Inválida:"
+msgstr "Descripción no válida:"
#: Z_ImportFixedAssets.php:132
msgid "The depreciation rate is expected to be numeric"
@@ -42236,7 +42236,7 @@
#: Z_ImportFixedAssets.php:133 Z_ImportFixedAssets.php:137
msgid "Invalid Depreciation Rate:"
-msgstr "Tasa de Depreciación Inválida:"
+msgstr "Tasa de Depreciación no válida:"
#: Z_ImportFixedAssets.php:141
msgid "The accumulated depreciation is expected to be numeric"
@@ -42244,7 +42244,7 @@
#: Z_ImportFixedAssets.php:142 Z_ImportFixedAssets.php:146
msgid "Invalid Accumulated Depreciation:"
-msgstr "Depreciación Acumulada No Válida:"
+msgstr "Depreciación acumulada no válida:"
#: Z_ImportFixedAssets.php:145
msgid ""
@@ -42258,7 +42258,7 @@
#: Z_ImportFixedAssets.php:151 Z_ImportFixedAssets.php:155
msgid "Invalid Cost:"
-msgstr "Costo Inválido:"
+msgstr "Costo no válido:"
#: Z_ImportFixedAssets.php:154
msgid "The cost is expected to be a positive number"
@@ -42274,7 +42274,7 @@
#: Z_ImportFixedAssets.php:160
msgid "Invalid depreciation type:"
-msgstr "Tipo de Depreciación Inválida:"
+msgstr "Tipo de Depreciación no válida:"
#: Z_ImportFixedAssets.php:166
msgid ""
@@ -42285,7 +42285,7 @@
#: Z_ImportFixedAssets.php:167
msgid "Invalid asset category:"
-msgstr "Categoría de activos No Válida:"
+msgstr "Categoría de activos no válida:"
#: Z_ImportFixedAssets.php:172
msgid ""
@@ -42304,7 +42304,7 @@
#: Z_ImportFixedAssets.php:178
msgid "Invalid date format:"
-msgstr "Formato de Fecha Inválida:"
+msgstr "Formato de fecha no válido:"
#: Z_ImportFixedAssets.php:216
msgid "The SQL that was used to add the asset and failed was"
@@ -43752,7 +43752,7 @@
#: api/api_errorcodes.php:179
msgid "Invalid Address Line"
-msgstr "Línea de Dirección Inválida"
+msgstr "Línea de dirección no válida"
#: api/api_errorcodes.php:180
msgid "Currency Code Not Setup"
@@ -43764,7 +43764,7 @@
#: api/api_errorcodes.php:182
msgid "Invalid Client Since Date"
-msgstr "Fecha de Antigüedad del cliente Inválida"
+msgstr "Fecha de Antigüedad del cliente no válida"
#: api/api_errorcodes.php:183
msgid "Hold Reason Not Setup"
@@ -43776,67 +43776,67 @@
#: api/api_errorcodes.php:185
msgid "Invalid Discount"
-msgstr "Descuento Inválido"
+msgstr "Descuento no válido"
#: api/api_errorcodes.php:186
msgid "Invalid Payment Discount"
-msgstr "Descuento del Pago Inválido"
+msgstr "Descuento del Pago no válido"
#: api/api_errorcodes.php:187
msgid "Invalid Last Paid"
-msgstr "Último Pago Inválido"
+msgstr "Último Pago no válido"
#: api/api_errorcodes.php:188
msgid "Invalid Last Paid Date"
-msgstr "Fecha del Último Pago Inválida"
+msgstr "Fecha del Último Pago no válida"
#: api/api_errorcodes.php:189
msgid "Invalid Credit Limit"
-msgstr "Límite de Crédito Inválido"
+msgstr "Límite de crédito no válido"
#: api/api_errorcodes.php:190
msgid "Invalid Inv Address Branch"
-msgstr "Sucursal de la Dirección de la Factura Inválida"
+msgstr "Sucursal de la Dirección de la Factura no válida"
#: api/api_errorcodes.php:191
msgid "Invalid Discount Code"
-msgstr "Código de Descuento Inválido"
+msgstr "Código de descuento no válido"
#: api/api_errorcodes.php:192
msgid "Invalid EDI Invoices"
-msgstr "Facturas EDI Inválidas"
+msgstr "Facturas EDI no válidas"
#: api/api_errorcodes.php:193
msgid "Invalid EDI Orders"
-msgstr "Pedidos EDI Inválidos"
+msgstr "Pedidos EDI no válidos"
#: api/api_errorcodes.php:194
msgid "Invalid EDI Reference"
-msgstr "Referencia EDI Inválida"
+msgstr "Referencia EDI no válida"
#: api/api_errorcodes.php:195
msgid "Invalid EDI Transport"
-msgstr "Transporte EDI Inválido"
+msgstr "Transporte EDI no válido"
#: api/api_errorcodes.php:196
msgid "Invalid EDI Address"
-msgstr "Dirección EDI Inválida"
+msgstr "Dirección EDI no válida"
#: api/api_errorcodes.php:197
msgid "Invalid EDI Server User"
-msgstr "Usuario del Servidor EDI Inválido"
+msgstr "Usuario del Servidor EDI no válido"
#: api/api_errorcodes.php:198
msgid "Invalid EDI Server Password"
-msgstr "Contraseña para el Servidor EDI Inválida"
+msgstr "Contraseña para el Servidor EDI no válida"
#: api/api_errorcodes.php:199
msgid "Invalid Tax Reference"
-msgstr "Referencia Fiscal Inválida"
+msgstr "Referencia Fiscal no válida"
#: api/api_errorcodes.php:200
msgid "Invalid CustomerPOLine"
-msgstr "Línea PO del cliente (nº del cliente en la orden de compra) inválida"
+msgstr "Línea PO del cliente (nº del cliente en la orden de compra) no válida"
#: api/api_errorcodes.php:201
msgid "Database Update Failed"
@@ -43864,7 +43864,7 @@
#: api/api_errorcodes.php:207
msgid "Invalid Est Delivery Days"
-msgstr "Días de Entrega Estimados Inválidos"
+msgstr "Días de Entrega Estimados no válidos"
#: api/api_errorcodes.php:208
msgid "Area Code Not Setup"
@@ -43876,23 +43876,23 @@
#: api/api_errorcodes.php:210
msgid "Invalid Fwd Date"
-msgstr "Fecha Fwd Inválida"
+msgstr "Fecha Fwd no válida"
#: api/api_errorcodes.php:211
msgid "Invalid Phone Number"
-msgstr "Nº de Teléfono Inválido"
+msgstr "Nº de Teléfono no válido"
#: api/api_errorcodes.php:212
msgid "Invalid Fax Number"
-msgstr "Número de Fax Inválido"
+msgstr "Número de Fax no válido"
#: api/api_errorcodes.php:213
msgid "Invalid Contact Name"
-msgstr "Nombre del contacto Inválido"
+msgstr "Nombre de contacto no válido"
#: api/api_errorcodes.php:214
msgid "Invalid Email Address"
-msgstr "Dirección de correo-e inválida"
+msgstr "Dirección de correo-e no válida"
#: api/api_errorcodes.php:215
msgid "Location Code Not Setup"
@@ -43908,19 +43908,19 @@
#: api/api_errorcodes.php:218
msgid "Invalid Deliver Blind"
-msgstr "Despacho a Ciegas Inválido"
+msgstr "Despacho a Ciegas no válido"
#: api/api_errorcodes.php:219
msgid "Invalid Disable Transactions"
-msgstr "Deshabilitar Transacciones Inválida"
+msgstr "Deshabilitar Transacciones no válida"
#: api/api_errorcodes.php:220
msgid "Invalid Special Instructions"
-msgstr "Instrucciones Especiales Inválidas"
+msgstr "Instrucciones Especiales no válidas"
#: api/api_errorcodes.php:221
msgid "Invalid Customer Branch Code"
-msgstr "Código de sucursal de cliente Inválida"
+msgstr "Código de sucursal de cliente no válida"
#: api/api_errorcodes.php:222
msgid "Branch No Does not Exist"
@@ -43944,39 +43944,39 @@
#: api/api_errorcodes.php:227
msgid "Incorrect MB Flag"
-msgstr "Marca MB Inválida"
+msgstr "Marca MB no válida"
#: api/api_errorcodes.php:228
msgid "Invalid Current Cost Date"
-msgstr "Fecha de Costo Actual Inválida"
+msgstr "Fecha de Costo Actual no válida"
#: api/api_errorcodes.php:229
msgid "Invalid Actual Cost"
-msgstr "Costo Real Inválido"
+msgstr "Costo Real no válido"
#: api/api_errorcodes.php:230
msgid "Invalid Lowest Level"
-msgstr "Nivel Mínimo Inválido"
+msgstr "Nivel Mínimo no válido"
#: api/api_errorcodes.php:231
msgid "Invalid Discontinued"
-msgstr "Descontinuado Inválido"
+msgstr "Descontinuado no válido"
#: api/api_errorcodes.php:232
msgid "Invalid EOQ"
-msgstr "EOQ Inválido"
+msgstr "EOQ no válido"
#: api/api_errorcodes.php:233
msgid "Invalid Volume"
-msgstr "Volumen Inválido"
+msgstr "Volumen no válido"
#: api/api_errorcodes.php:234
msgid "Invalid Kgs"
-msgstr "Peso Inválido"
+msgstr "Peso no válido"
#: api/api_errorcodes.php:235
msgid "Incorrect BarCode Length"
-msgstr "Longitud del Código de Barras Inválido"
+msgstr "Longitud del Código de Barras no válido"
#: api/api_errorcodes.php:236
msgid "Incorrect Discount Category"
@@ -43988,7 +43988,7 @@
#: api/api_errorcodes.php:238
msgid "Invalid Serialised"
-msgstr "Seriado Inválido"
+msgstr "Seriado no válido"
#: api/api_errorcodes.php:239
msgid "Incorrect Append File"
@@ -43996,11 +43996,11 @@
#: api/api_errorcodes.php:240
msgid "Invalid Perishable"
-msgstr "Perecedero Inválido"
+msgstr "Perecedero no válido"
#: api/api_errorcodes.php:241
msgid "Invalid Decimal Places"
-msgstr "Posiciones Decimales Inválida"
+msgstr "Posiciones Decimales no válida"
#: api/api_errorcodes.php:242
msgid "Incorrect Long Stock Description Length"
@@ -44016,11 +44016,11 @@
#: api/api_errorcodes.php:245
msgid "Invalid Transaction Date"
-msgstr "Fecha de Transacción Inválida"
+msgstr "Fecha de Transacción no válida"
#: api/api_errorcodes.php:246
msgid "Invalid Settled"
-msgstr "Establecido Inválido"
+msgstr "Establecido no válido"
#: api/api_errorcodes.php:247
msgid "Incorrect Reference"
@@ -44032,7 +44032,7 @@
#: api/api_errorcodes.php:249
msgid "Invalid Order Numbers"
-msgstr "Números de Pedidos Inválidos"
+msgstr "Números de Pedidos no válidos"
#: api/api_errorcodes.php:250
msgid "Invalid Exchange Rate"
@@ -44040,23 +44040,23 @@
#: api/api_errorcodes.php:251
msgid "Invalid OV Amount"
-msgstr "Importe OV Inválido"
+msgstr "Importe OV no válido"
#: api/api_errorcodes.php:252
msgid "Invalid OV Gst"
-msgstr "Gst OV Inválido"
+msgstr "Gst OV no válido"
#: api/api_errorcodes.php:253
msgid "Invalid OV Freight"
-msgstr "Flete OV Inválido"
+msgstr "Flete OV no válido"
#: api/api_errorcodes.php:254
msgid "Invalid Diff On Exchange"
-msgstr "Diferencia en Tasa de Cambio Inválida"
+msgstr "Diferencia en Tasa de Cambio no válida"
#: api/api_errorcodes.php:255
msgid "Invalid Allocation"
-msgstr "Asignación Inválida"
+msgstr "Asignación no válida"
#: api/api_errorcodes.php:256
msgid "Incorrect Invoice Text"
@@ -44064,63 +44064,63 @@
#: api/api_errorcodes.php:257
msgid "Invalid Ship Via"
-msgstr "Envío \"A Través De\" Inválido"
+msgstr "Envío \"A Través De\" no válido"
#: api/api_errorcodes.php:258
msgid "Invalid Edi Sent"
-msgstr "Envío EDI Inválido"
+msgstr "Envío EDI no válido"
#: api/api_errorcodes.php:259
msgid "Invalid Consignment"
-msgstr "Consignación Inválida"
+msgstr "Consignación no válida"
#: api/api_errorcodes.php:260
msgid "Invalid Last Cost"
-msgstr "Ultimo Costo Inválido"
+msgstr "Ultimo costo no válido"
#: api/api_errorcodes.php:261
msgid "Invalid Material Cost"
-msgstr "Costo de Material Inválido"
+msgstr "Costo de material no válido"
#: api/api_errorcodes.php:262
msgid "Invalid Labour Cost"
-msgstr "Costo de Mano de Obra Inválido"
+msgstr "Costo de mano de obra no válido"
#: api/api_errorcodes.php:263
msgid "Invalid Overhead Cost"
-msgstr "Costo de Gastos Generales Inválido"
+msgstr "Costo general no válido"
#: api/api_errorcodes.php:264
msgid "Invalid Customer Reference"
-msgstr "Referencia de cliente Inválida"
+msgstr "Referencia de cliente no válida"
#: api/api_errorcodes.php:265
msgid "Invalid Buyer Name"
-msgstr "Nombre del Comprador Inválido"
+msgstr "Nombre de comprador no válido"
#: api/api_errorcodes.php:266
msgid "Invalid Comments"
-msgstr "Comentarios Inválidos"
+msgstr "Comentarios no válidos"
#: api/api_errorcodes.php:267
msgid "Invalid Order Date"
-msgstr "Fecha de Pedido Inválida"
+msgstr "Fecha de pedido no válida"
#: api/api_errorcodes.php:268
msgid "Invalid Delivery Name"
-msgstr "Nombre de Entrega Inválido"
+msgstr "Nombre de Entrega no válido"
#: api/api_errorcodes.php:269
msgid "Invalid Freight Cost"
-msgstr "Costo de Transporte Inválido"
+msgstr "Costo de transporte no válido"
#: api/api_errorcodes.php:270
msgid "Invalid Delivery Date"
-msgstr "Fecha de Entrega Inválida"
+msgstr "Fecha de Entrega no válida"
#: api/api_errorcodes.php:271
msgid "Invalid Quotation Flag"
-msgstr "Referencia de cotización inválida"
+msgstr "Referencia de cotización no válida"
#: api/api_errorcodes.php:272
msgid "Order header not setup"
@@ -44128,27 +44128,27 @@
#: api/api_errorcodes.php:273
msgid "Invalid unit cost"
-msgstr "Unidad de Costo Inválida"
+msgstr "Unidad de Costo no válida"
#: api/api_errorcodes.php:274
msgid "Invalid Quantity"
-msgstr "Cantidad Inválida"
+msgstr "Cantidad no válida"
#: api/api_errorcodes.php:275
msgid "Invalid Discount Percent"
-msgstr "Porcentaje de Descuento Inválido"
+msgstr "Porcentaje de descuento no válido"
#: api/api_errorcodes.php:276
msgid "Invalid Narrative"
-msgstr "Descripción inválida"
+msgstr "Descripción no válida"
#: api/api_errorcodes.php:277
msgid "Invalid Item Due"
-msgstr "Deuda de Artículo Inválida"
+msgstr "Deuda de Artículo no válida"
#: api/api_errorcodes.php:278
msgid "Invalid PO line"
-msgstr "Fila de Orden de Compra Inválida"
+msgstr "Fila de Orden de Compra no válida"
#: api/api_errorcodes.php:279
msgid "GL account code already exists"
@@ -44180,19 +44180,19 @@
#: api/api_errorcodes.php:286
msgid "Invalid profit and loss flag"
-msgstr "Marca de Ganancias y Pérdidas inválida"
+msgstr "Marca de Ganancias y Pérdidas no válida"
#: api/api_errorcodes.php:287
msgid "Invalid sequenceintb figure"
-msgstr "Figura sequenceintb Inválida"
+msgstr "Figura sequenceintb no válida"
#: api/api_errorcodes.php:289
msgid "Invalid Latitude figure"
-msgstr "Latitud Inválida"
+msgstr "Latitud no válida"
#: api/api_errorcodes.php:290
msgid "Invalid Longitude figure"
-msgstr "Longitud Inválida"
+msgstr "Longitud no válida"
#: api/api_errorcodes.php:291
msgid "Customer type not set up"
@@ -44204,27 +44204,27 @@
#: api/api_errorcodes.php:293
msgid "Invalid invoiced quantity"
-msgstr "Cantidad facturada inválida"
+msgstr "Cantidad facturada no válida"
#: api/api_errorcodes.php:294
msgid "Invalid actual dispatch date"
-msgstr "Fecha de despacho real Inválida"
+msgstr "Fecha de despacho real no válida"
#: api/api_errorcodes.php:295
msgid "Invalid completed flag"
-msgstr "Marca de Completado Inválida"
+msgstr "Marca de Completado no válida"
#: api/api_errorcodes.php:296
msgid "Invalid category id"
-msgstr "ID de Categoría Inválido"
+msgstr "ID de Categoría no válido"
#: api/api_errorcodes.php:297
msgid "Invalid category description"
-msgstr "Descripción inválida de la categoría"
+msgstr "Descripción de categoría no válida"
#: api/api_errorcodes.php:298
msgid "Invalid stock type"
-msgstr "Tipo de existencia inválido"
+msgstr "Tipo de existencia no válido"
#: api/api_errorcodes.php:299
msgid "GL account code does not exist"
@@ -44286,11 +44286,11 @@
#: api/api_errorcodes.php:313
msgid "Invalid Lead time"
-msgstr "Tiempo de Espera Inválido"
+msgstr "Tiempo de Espera no válido"
#: api/api_errorcodes.php:314
msgid "Invalid Preferred flag"
-msgstr "Preferido Marcado Inválido"
+msgstr "Preferido Marcado no válido"
#: api/api_errorcodes.php:315
msgid "StockID SupplierID line does not exist"
@@ -44298,31 +44298,31 @@
#: api/api_errorcodes.php:316
msgid "Invalid Required By Date"
-msgstr "Requerido para la Fecha Inválido"
+msgstr "Requerido para la Fecha no válido"
#: api/api_errorcodes.php:317
msgid "Invalid Start Date"
-msgstr "Fecha de Inicio Inválida"
+msgstr "Fecha de Inicio no válida"
#: api/api_errorcodes.php:318
msgid "Invalid Cost Issued"
-msgstr "Costo Enviado Inválido"
+msgstr "Costo Enviado no válido"
#: api/api_errorcodes.php:319
msgid "Invalid Quantity Required"
-msgstr "Cantidad Requerida Inválida"
+msgstr "Cantidad Requerida no válida"
#: api/api_errorcodes.php:320
msgid "Invalid Quantity Received"
-msgstr "Cantidad Recibida Inválida"
+msgstr "Cantidad Recibida no válida"
#: api/api_errorcodes.php:321
msgid "Invalid Standard Cost"
-msgstr "Costo Estándar Inválido"
+msgstr "Costo Estándar no válido"
#: api/api_errorcodes.php:322
msgid "Invalid Serial Number or Lot Reference"
-msgstr "Número de Serie Inválido o de Referencia del Lote"
+msgstr "Número de Serie no válido o de Referencia del Lote"
#: api/api_errorcodes.php:323
msgid "Work order number does not exist"
@@ -44330,15 +44330,15 @@
#: api/api_errorcodes.php:324
msgid "Invalid issued quantity"
-msgstr "Cantidad enviada Inválida"
+msgstr "Cantidad enviada no válida"
#: api/api_errorcodes.php:325
msgid "Invalid transaction date"
-msgstr "Fecha de transacción inválida"
+msgstr "Fecha de transacción no válida"
#: api/api_errorcodes.php:326
msgid "Invalid received quantity"
-msgstr "Cantidad recibida inválida"
+msgstr "Cantidad recibida no válida"
#: api/api_errorcodes.php:327
msgid "Stock item is not controlled"
@@ -49637,7 +49637,7 @@
#: includes/InputSerialItemsFile.php:161
msgid "Invalid"
-msgstr "Inválido"
+msgstr "No válido"
#: includes/InputSerialItemsFile.php:172
msgid "Validate File"
|
|
From: <rc...@us...> - 2016-04-10 17:12:54
|
Revision: 7489
http://sourceforge.net/p/web-erp/reponame/7489
Author: rchacon
Date: 2016-04-10 17:12:51 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
Modified Paths:
--------------
trunk/SuppTransGLAnalysis.php
trunk/SupplierInvoice.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/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
trunk/doc/Manual/ManualAccountsPayable.html
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SuppTransGLAnalysis.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -10,9 +10,9 @@
/* Session started in header.inc for password checking and authorisation level check */
include('includes/session.inc');
-
$Title = _('Supplier Transaction General Ledger Analysis');
-
+$ViewTopic = 'AccountsPayable';
+$BookMark = 'SuppTransGLAnalysis';
include('includes/header.inc');
if (!isset($_SESSION['SuppTrans'])){
@@ -106,9 +106,10 @@
$TableHeader = '<tr>
<th class="ascending">' . _('Account') . '</th>
<th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th class="ascending">' . _('Amount') . '<br />(' . $_SESSION['SuppTrans']->CurrCode . ')</th>
<th>' . _('Narrative') . '</th>
<th class="ascending">' . _('Tag') . '</th>
+ <th colspan="2"> </th>
</tr>';
echo $TableHeader;
$TotalGLValue=0;
@@ -117,11 +118,11 @@
foreach ( $_SESSION['SuppTrans']->GLCodes AS $EnteredGLCode){
echo '<tr>
- <td>' . $EnteredGLCode->GLCode . '</td>
- <td>' . $EnteredGLCode->GLActName . '</td>
+ <td class="text">' . $EnteredGLCode->GLCode . '</td>
+ <td class="text">' . $EnteredGLCode->GLActName . '</td>
<td class="number">' . locale_number_format($EnteredGLCode->Amount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
- <td>' . $EnteredGLCode->Narrative . '</td>
- <td>' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
+ <td class="text">' . $EnteredGLCode->Narrative . '</td>
+ <td class="text">' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Edit=' . $EnteredGLCode->Counter . '">' . _('Edit') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $EnteredGLCode->Counter . '">' . _('Delete') . '</a></td>
</tr>';
@@ -138,6 +139,7 @@
echo '<tr>
<td colspan="2" class="number">' . _('Total') . ':</td>
<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
+ <td colspan="4"> </td>
</tr>
</table>';
@@ -216,7 +218,7 @@
$_POST['Amount']=0;
}
echo '<tr>
- <td>' . _('Amount') . ':</td>
+ <td>' . _('Amount'), ' (', $_SESSION['SuppTrans']->CurrCode, '):</td>
<td><input type="text" class="number" required="required" pattern="(?!^[-]?0[.,]0*$).{1,11}" title="'._('The amount must be numeric and cannot be zero').'" name="Amount" size="12" placeholder="'._('No zero numeric').'" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
</tr>';
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SupplierInvoice.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1109,7 +1109,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $EnteredGLCode->GLCode . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . $EnteredGLCode->Narrative . "',
'" . $EnteredGLCode->Tag . "',
'" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')";
@@ -1138,7 +1138,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $_SESSION['SuppTrans']->GRNAct . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
'" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') .
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/aguapop/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -477,12 +477,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -491,8 +495,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/default/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -438,12 +438,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -451,10 +455,6 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fluid/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -375,20 +375,21 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fresh/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -484,12 +484,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background-color:#C9D392;
color:black;
@@ -501,8 +505,4 @@
width:30%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/gel/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -528,12 +528,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -542,8 +546,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -505,12 +505,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -521,8 +525,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional-rtl/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -523,12 +523,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;/* Should be left ? */
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;/* Should be right ? */
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -539,8 +543,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;/* Should be right ? */
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/silverwolf/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -496,12 +496,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background:gainsboro;
margin:10px auto;
@@ -509,8 +513,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/wood/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -559,12 +559,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -573,8 +577,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/xenos/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -623,12 +623,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-size:18px;
@@ -639,8 +643,4 @@
width:60%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Change.log 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1,5 +1,6 @@
webERP Change Log
+10/04/16 RChacon: On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
Modified: trunk/doc/Manual/ManualAccountsPayable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsPayable.html 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Manual/ManualAccountsPayable.html 2016-04-10 17:12:51 UTC (rev 7489)
@@ -172,7 +172,7 @@
<p>
If there are some charges that relate to stock items and some charges that relate to shipments then the total of both is accumulated into the invoice total.</p>
-<h3>Entry of General Ledger Charges</h3>
+<h3><a id="SuppTransGLAnalysis">Entry of General Ledger Charges</a></h3>
<p>
Purchase invoice entry looks a little different depending on whether the GL link to Account Payable is enabled or not (See Setup tab -> Company Preferences). If the GL interface is NOT enabled then there is simply a field to enter the total amount of the invoice into. If the GL interface is enabled then a third button shows "Enter General Ledger Analysis" - the total of all the general ledger analysis, the shipment costs and the entries against GRNs is accumulated into the total invoice charge and there is no opportunity to enter an invoice total amount anywhere - it is derived as the total of all the defined charges on the invoice.</p>
<p>
|
|
From: <rc...@us...> - 2016-04-07 14:42:24
|
Revision: 7488
http://sourceforge.net/p/web-erp/reponame/7488
Author: rchacon
Date: 2016-04-07 14:42:22 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 13:12:11 UTC (rev 7487)
+++ trunk/doc/Change.log 2016-04-07 14:42:22 UTC (rev 7488)
@@ -1,5 +1,6 @@
webERP Change Log
+07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2016-04-07 13:12:11 UTC (rev 7487)
+++ trunk/includes/class.pdf.php 2016-04-07 14:42:22 UTC (rev 7488)
@@ -82,29 +82,39 @@
function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='J', $border=0, $fill=0) {
// R&OS version 0.12.2: "addTextWrap function is no more, use addText instead".
- /* Returns the balance of the string that could not fit in the width
+ /* Returns the balance of the string that could not fit in the width */
// $XPos = cell horizontal coordinate from page left side to cell left side in dpi (72dpi = 25.4mm).
// $YPos = cell vertical coordinate from page bottom side to cell bottom side in dpi (72dpi = 25.4mm).
- */
+ // $Width = Cell (line) width in dpi (72dpi = 25.4mm).
+ // $Height = Font size in dpi (72dpi = 25.4mm).
+ // $Text = Text to be split in portion to be add to the page and the remainder to be returned.
+ // $Align = 'left', 'center', 'centre', 'full' or 'right'.
+
//some special characters are html encoded
//this code serves to make them appear human readable in pdf file
- $Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8');
+ $Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8');// Convert all HTML entities to their applicable characters.
$this->x = $XPos;
- $this->y = $this->h - $YPos - $Height;//RChacon: This -$Height is the difference in yPos between AddText() and AddTextWarp().
+ $this->y = $this->h - $YPos - $Height;//RChacon: This -$Height is the difference in yPos between AddText() and AddTextWarp(). It is better "$this->y = $this->h-$YPos", but that requires to recode all the pdf generator scripts.
- switch($Align) {
+ switch($Align) {// Translate from Pdf-Creator to TCPDF.
+ case 'left':
+ $Align = 'L'; break;
case 'right':
$Align = 'R'; break;
case 'center':
$Align = 'C'; break;
+ case 'centre':
+ $Align = 'C'; break;
+ case 'full':
+ $Align = 'J'; break;
default:
- $Align = 'L';
+ $Align = 'L'; break;
}
- $this->SetFontSize($Height);
+ $this->SetFontSize($Height);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php.
if($Width==0) {
- $Width=$this->w-$this->rMargin-$this->x;
+ $Width = $this->w - $this->rMargin - $this->x;// Line_width = Page_width - Right_margin - Cell_horizontal_coordinate($XPos).
}
$wmax=($Width-2*$this->cMargin);
$s=str_replace("\r",'',$Text);
@@ -167,7 +177,7 @@
}
}
- $this->Cell($Width,$Height,mb_substr($s,0,$sep),$b,2,$Align,$fill);
+ $this->Cell($Width, $Height, mb_substr($s,0,$sep), $b, 2, $Align, $fill);
$this->x=$this->lMargin;
return mb_substr($s, $sep);
}// End function addTextWrap.
@@ -177,7 +187,7 @@
/* Javier: Some scripts set the creator to be WebERP like this
$pdf->addInfo('Creator', 'WebERP http://www.weberp.org');
- But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in tcpdf/config/tcpdfconfig.php
+ But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in ~/includes/tcpdf/config/tcpdfconfig.php
*/ $this->SetCreator(PDF_CREATOR);
}
if ($label == 'Author') {
|
|
From: <rc...@us...> - 2016-04-07 13:12:14
|
Revision: 7487
http://sourceforge.net/p/web-erp/reponame/7487
Author: rchacon
Date: 2016-04-07 13:12:11 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Improves Spanish translation.
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 2016-04-07 06:40:58 UTC (rev 7486)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-04-07 13:12:11 UTC (rev 7487)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-29 12:33-0600\n"
-"PO-Revision-Date: 2016-02-01 09:59-0600\n"
+"PO-Revision-Date: 2016-03-31 07:32-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -17213,7 +17213,7 @@
#: Labels.php:595 Labels.php:597 Labels.php:628
msgid "Company Logo"
-msgstr ""
+msgstr "Logotipo de la compañía"
#: Labels.php:612
msgid "Are you sure you wish to delete this label field?"
@@ -31088,7 +31088,7 @@
#: StockCategorySalesInquiry.php:124
msgid "COGS"
-msgstr ""
+msgstr "Costo de bienes vedidos"
#: StockCategorySalesInquiry.php:125
msgid "Gross Margin"
@@ -38538,7 +38538,7 @@
#: UserBankAccounts.php:87
msgid "bank account removed"
-msgstr ""
+msgstr "Cuenta bancaria removida"
#: UserBankAccounts.php:141
msgid "Authorised bank accounts for"
@@ -51033,7 +51033,7 @@
#: reportwriter/languages/en_US/reports.php:61
msgid "Color"
-msgstr ""
+msgstr "Color"
#: reportwriter/languages/en_US/reports.php:62
msgid "Custom Color (Range 0-255)"
@@ -51286,83 +51286,83 @@
#: reportwriter/languages/en_US/reports.php:167
msgid "Column 1"
-msgstr ""
+msgstr "Columna 1"
#: reportwriter/languages/en_US/reports.php:168
msgid "Column 2"
-msgstr ""
+msgstr "Columna 2"
#: reportwriter/languages/en_US/reports.php:169
msgid "Column 3"
-msgstr ""
+msgstr "Columna 3"
#: reportwriter/languages/en_US/reports.php:170
msgid "Column 4"
-msgstr ""
+msgstr "Columna 4"
#: reportwriter/languages/en_US/reports.php:171
msgid "Column 5"
-msgstr ""
+msgstr "Columna 5"
#: reportwriter/languages/en_US/reports.php:172
msgid "Column 6"
-msgstr ""
+msgstr "Columna 6"
#: reportwriter/languages/en_US/reports.php:173
msgid "Column 7"
-msgstr ""
+msgstr "Columna 7"
#: reportwriter/languages/en_US/reports.php:174
msgid "Column 8"
-msgstr ""
+msgstr "Columna 8"
#: reportwriter/languages/en_US/reports.php:175
msgid "Column 9"
-msgstr ""
+msgstr "Columna 9"
#: reportwriter/languages/en_US/reports.php:176
msgid "Column 10"
-msgstr ""
+msgstr "Columna 10"
#: reportwriter/languages/en_US/reports.php:177
msgid "Column 11"
-msgstr ""
+msgstr "Columna 11"
#: reportwriter/languages/en_US/reports.php:178
msgid "Column 12"
-msgstr ""
+msgstr "Columna 12"
#: reportwriter/languages/en_US/reports.php:179
msgid "Column 13"
-msgstr ""
+msgstr "Columna 13"
#: reportwriter/languages/en_US/reports.php:180
msgid "Column 14"
-msgstr ""
+msgstr "Columna 14"
#: reportwriter/languages/en_US/reports.php:181
msgid "Column 15"
-msgstr ""
+msgstr "Columna 15"
#: reportwriter/languages/en_US/reports.php:182
msgid "Column 16"
-msgstr ""
+msgstr "Columna 16"
#: reportwriter/languages/en_US/reports.php:183
msgid "Column 17"
-msgstr ""
+msgstr "Columna 17"
#: reportwriter/languages/en_US/reports.php:184
msgid "Column 18"
-msgstr ""
+msgstr "Columna 18"
#: reportwriter/languages/en_US/reports.php:185
msgid "Column 19"
-msgstr ""
+msgstr "Columna 19"
#: reportwriter/languages/en_US/reports.php:186
msgid "Column 20"
-msgstr ""
+msgstr "Columna 20"
#: reportwriter/languages/en_US/reports.php:187
msgid "Type of Criteria"
@@ -51949,7 +51949,7 @@
#: ../webSHOP/Register.php:494 ../webSHOP/index.php:30
#: ../webSHOP/includes/InfoLinks.php:22
msgid "Contact Details"
-msgstr ""
+msgstr "Detalles del contacto"
#: ../webSHOP/Checkout.php:251 ../webSHOP/Register.php:428
msgid "An email address is required"
|
|
From: <ex...@us...> - 2016-04-07 06:41:00
|
Revision: 7486
http://sourceforge.net/p/web-erp/reponame/7486
Author: exsonqu
Date: 2016-04-07 06:40:58 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
07/04/16 Exson: add sql of multiple assigner and authority of Pc module.
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-07 06:35:44 UTC (rev 7485)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-04-07 06:40:58 UTC (rev 7486)
@@ -51,7 +51,9 @@
INSERT INTO scripts VALUES('CollectiveWorkOrderCost.php',2,'Multiple work orders cost review');
ALTER table bom ADD remark varchar(500) NOT NULL DEFAULT '';
INSERT INTO scripts VALUES ('SuppWhereAlloc.php',3,'Suppliers Where allocated');
+ALTER table pctabs DROP FOREIGN KEY `pctabs_ibfk_4`;
+ALTER table pctabs CHANGE authorizer authorizer varchar(100);
+ALTER table pctabs CHANGE assigner assigner varchar(100);
-
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <ex...@us...> - 2016-04-07 06:35:46
|
Revision: 7485
http://sourceforge.net/p/web-erp/reponame/7485
Author: exsonqu
Date: 2016-04-07 06:35:44 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 06:35:08 UTC (rev 7484)
+++ trunk/doc/Change.log 2016-04-07 06:35:44 UTC (rev 7485)
@@ -1,5 +1,6 @@
webERP Change Log
+07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php.
|
|
From: <ex...@us...> - 2016-04-07 06:35:09
|
Revision: 7484
http://sourceforge.net/p/web-erp/reponame/7484
Author: exsonqu
Date: 2016-04-07 06:35:08 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
07/04/16 Exson: Add remark column to CopyBOM.php.
Modified Paths:
--------------
trunk/CopyBOM.php
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2016-04-01 08:37:57 UTC (rev 7483)
+++ trunk/CopyBOM.php 2016-04-07 06:35:08 UTC (rev 7484)
@@ -128,7 +128,8 @@
effectiveafter,
effectiveto,
quantity,
- autoissue
+ autoissue,
+ remark
FROM bom
WHERE parent='".$StockID."';";
$result = DB_query($sql);
|
|
From: <ex...@us...> - 2016-04-01 08:37:59
|
Revision: 7483
http://sourceforge.net/p/web-erp/reponame/7483
Author: exsonqu
Date: 2016-04-01 08:37:57 +0000 (Fri, 01 Apr 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-01 08:36:03 UTC (rev 7482)
+++ trunk/doc/Change.log 2016-04-01 08:37:57 UTC (rev 7483)
@@ -1,5 +1,6 @@
webERP Change Log
+01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php.
18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php.
|
|
From: <ex...@us...> - 2016-04-01 08:36:05
|
Revision: 7482
http://sourceforge.net/p/web-erp/reponame/7482
Author: exsonqu
Date: 2016-04-01 08:36:03 +0000 (Fri, 01 Apr 2016)
Log Message:
-----------
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcExpenses.php
trunk/PcTabs.php
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcAssignCashToTab.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -163,9 +163,9 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $SQL = "SELECT tabcode
+ $SQL = "SELECT tabcode, assigner
FROM pctabs
- WHERE assigner='" . $_SESSION['UserID'] . "'
+ WHERE assigner LIKE '%" . $_SESSION['UserID'] . "%'
ORDER BY tabcode";
$result = DB_query($SQL);
@@ -175,12 +175,15 @@
echo '<tr><td>' . _('Petty Cash Tab To Assign Cash') . ':</td>
<td><select name="SelectedTabs">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
+ $Assigner = explode(',',$myrow['assigner']);
+ if (in_array($_SESSION['UserID'],$Assigner)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
}
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
}
echo '</select></td></tr>';
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcAuthorizeExpenses.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -304,9 +304,9 @@
<br />
<table class="selection">'; //Main table
- $SQL = "SELECT tabcode
+ $SQL = "SELECT tabcode,authorizer
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'";
+ WHERE authorizer LIKE '%" . $_SESSION['UserID'] . "%'";
$result = DB_query($SQL);
@@ -315,12 +315,14 @@
<td><select name="SelectedTabs" required="required" autofocus="autofocus" >';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
- }
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ $Authorisers = explode(',',$myrow['authorizer']);
+ if (in_array($_SESSION['UserID'],$Authorisers)) {
+ if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
} //end while loop get type of tab
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcExpenses.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -186,11 +186,11 @@
echo '<table class="selection">';
echo '<tr>
- <th>' . _('Code Of Expense') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Account Code') . '</th>
- <th>' . _('Account Description') . '</th>
- <th>' . _('Tag') . '</th>
+ <th class="ascending">' . _('Code Of Expense') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('Account Code') . '</th>
+ <th class="ascending">' . _('Account Description') . '</th>
+ <th class="ascending">' . _('Tag') . '</th>
</tr>';
$k=0; //row colour counter
@@ -358,4 +358,4 @@
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2016-03-24 19:39:49 UTC (rev 7481)
+++ trunk/PcTabs.php 2016-04-01 08:36:03 UTC (rev 7482)
@@ -67,12 +67,12 @@
echo prnMsg(_('You must select a type of tab from the list'),'error');
$Errors[$i] = 'TabType';
$i++;
- } elseif (($_POST['SelectAssigner'])=='') {
+ } elseif (empty($_POST['SelectAssigner'])) {
$InputError = 1;
echo prnMsg(_('You must select a User to assign cash to this tab'),'error');
$Errors[$i] = 'AssignerName';
$i++;
- } elseif (($_POST['SelectAuthoriser'])=='') {
+ } elseif (empty($_POST['SelectAuthoriser'])) {
$InputError = 1;
echo prnMsg(_('You must select a User to authorise this tab'),'error');
$Errors[$i] = 'AuthoriserName';
@@ -88,15 +88,35 @@
$Errors[$i] = 'GLTab';
$i++;
}
+
+ if ($InputError == 0) {
+ $Authorisers = '';
+ $i = 0;
+ foreach ($_POST['SelectAuthoriser'] as $value) {
+ if ($i) $Authorisers .= ',';
+ $Authorisers .= $value;
+ $i++;
+ }
+ $Assigners = '';
+ $i = 0;
+ foreach ($_POST['SelectAssigner'] as $value) {
+ if ($i) $Assigners .= ',';
+ $Assigners .= $value;
+ $i++;
+ }
+ }
+
if (isset($SelectedTab) AND $InputError !=1) {
+ //get the authorisers value
+
$sql = "UPDATE pctabs SET usercode = '" . $_POST['SelectUser'] . "',
typetabcode = '" . $_POST['SelectTabs'] . "',
currency = '" . $_POST['SelectCurrency'] . "',
tablimit = '" . filter_number_format($_POST['TabLimit']) . "',
- assigner = '" . $_POST['SelectAssigner'] . "',
- authorizer = '" . $_POST['SelectAuthoriser'] . "',
+ assigner = '" . $Assigners . "',
+ authorizer = '" . $Authorisers . "',
glaccountassignment = '" . $_POST['GLAccountCash'] . "',
glaccountpcash = '" . $_POST['GLAccountPcashTab'] . "'
WHERE tabcode = '".$SelectedTab."'";
@@ -134,8 +154,8 @@
'" . $_POST['SelectTabs'] . "',
'" . $_POST['SelectCurrency'] . "',
'" . filter_number_format($_POST['TabLimit']) . "',
- '" . $_POST['SelectAssigner'] . "',
- '" . $_POST['SelectAuthoriser'] . "',
+ '" . $Assigners . "',
+ '" . $Authorisers . "',
'" . $_POST['GLAccountCash'] . "',
'" . $_POST['GLAccountPcashTab'] . "')";
@@ -383,7 +403,7 @@
echo '<tr>
<td>' . _('Assigner') . ':</td>
- <td><select name="SelectAssigner">';
+ <td><select multiple="multiple" name="SelectAssigner[]">';
$SQL = "SELECT userid,
realname
@@ -393,7 +413,8 @@
$result = DB_query($SQL);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAssigner']) and $myrow['userid']==$_POST['SelectAssigner']) {
+ $Assigners = explode(',',$_POST['SelectAssigner']);
+ if (isset($_POST['SelectAssigner']) and in_array($myrow['userid'],$Assigners)) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -408,7 +429,7 @@
echo '<tr>
<td>' . _('Authoriser') . ':</td>
- <td><select name="SelectAuthoriser">';
+ <td><select multiple="multiple" name="SelectAuthoriser[]">';
$SQL = "SELECT userid,
realname
@@ -418,7 +439,8 @@
$result = DB_query($SQL);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAuthoriser']) and $myrow['userid']==$_POST['SelectAuthoriser']) {
+ $Authorizer = explode(',',$_POST['SelectAuthoriser']);
+ if (isset($_POST['SelectAuthoriser']) and in_array($myrow['userid'],$Authorizer)) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -493,4 +515,4 @@
} // end if user wish to delete
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2016-03-24 19:39:51
|
Revision: 7481
http://sourceforge.net/p/web-erp/reponame/7481
Author: rchacon
Date: 2016-03-24 19:39:49 +0000 (Thu, 24 Mar 2016)
Log Message:
-----------
On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/CustomerReceipt.php 2016-03-24 19:39:49 UTC (rev 7481)
@@ -7,7 +7,6 @@
$Title = _('Receipt Entry');
-
if ($_GET['Type']=='GL') {
$ViewTopic= 'GeneralLedger';
$BookMark = 'GLReceipts';
@@ -905,7 +904,7 @@
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->FunctionalExRate,8), '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
@@ -1100,9 +1099,9 @@
<td>' . _('GL Account') . ':</td>
<td><select tabindex="8" name="GLCode">';
- $SQL = "SELECT chartmaster.accountcode,
- chartmaster.accountname
- FROM chartmaster
+ $SQL = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
ORDER BY chartmaster.accountcode";
$result=DB_query($SQL);
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/Payments.php 2016-03-24 19:39:49 UTC (rev 7481)
@@ -16,7 +16,6 @@
}
include('includes/header.inc');
-
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['PaymentCancelled'])) {
@@ -891,7 +890,7 @@
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
<td>', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-03-24 17:10:01 UTC (rev 7480)
+++ trunk/doc/Change.log 2016-03-24 19:39:49 UTC (rev 7481)
@@ -1,5 +1,6 @@
webERP Change Log
+24/03/16 RChacon: On CustomerReceipt.php, allow more precision on the functional_exchange_rate. On Payments.php, add pattern and required attributes to the functional_exchange_rate input.
24/03/16 Exson: Make the MRP report more place for material description in MRPReport.php.
18/03/2016 Exson: Correct the currency code for transaction between bank account in GLAccountInquiry.php.
18/03/2016 Exson: Fixed the bug that transaction between bank shows wrong original currency and amount in GLAccountInquiry.php.
|
15 messages has been excluded from this view by a project administrator.
