Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6052] trunk
|
From: <dai...@us...> - 2013-07-06 05:30:17
|
Revision: 6052
http://sourceforge.net/p/web-erp/reponame/6052
Author: daintree
Date: 2013-07-06 05:30:11 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
Shop config changes
Modified Paths:
--------------
trunk/AddCustomerNotes.php
trunk/Areas.php
trunk/ShopParameters.php
trunk/build/make_release.sh
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.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.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/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.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
trunk/sql/mysql/upgrade4.10-4.11.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2013-07-06 03:57:44 UTC (rev 6051)
+++ trunk/AddCustomerNotes.php 2013-07-06 05:30:11 UTC (rev 6052)
@@ -230,10 +230,10 @@
echo '<tr>
<td>'. _('Priority'). '</td>';
if (isset($_POST['Priority'])) {
- echo '<td><input type="number" required min="1" name="Priority" value="' . $_POST['Priority']. '" size="1" maxlength="3" /></td>
+ echo '<td><input type="number" required min="1" name="Priority" class="number" value="' . $_POST['Priority']. '" size="1" maxlength="3" /></td>
</tr>';
} else {
- echo '<td><input type="number" required min="1" name="Priority" size="1" maxlength="3" value="1"/></td>
+ echo '<td><input type=number required min="1" name="Priority" value="1" size="1" maxlength="3"/></td>
</tr>';
}
echo '<tr>
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2013-07-06 03:57:44 UTC (rev 6051)
+++ trunk/Areas.php 2013-07-06 05:30:11 UTC (rev 6052)
@@ -215,12 +215,12 @@
echo '<table class="selection">
<tr>
<td>' . _('Area Code') . ':</td>
- <td><input tabindex="1" ' . (in_array('AreaCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="AreaCode" value="' . $_POST['AreaCode'] . '" size="3" maxlength="3" /></td>
+ <td><input tabindex="1" ' . (in_array('AreaCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="AreaCode" required autofocus value="' . $_POST['AreaCode'] . '" size="3" maxlength="3" title="' . _('Enter the sales area code - up to 3 characters are allowed') . '" /></td>
</tr>';
}
echo '<tr><td>' . _('Area Name') . ':</td>
- <td><input tabindex="2" ' . (in_array('AreaDescription',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="AreaDescription" value="' . $_POST['AreaDescription'] .'" size="26" maxlength="25" /></td>
+ <td><input tabindex="2" ' . (in_array('AreaDescription',$Errors) ? 'class="inputerror"' : '' ) .' type="text" required name="AreaDescription" value="' . $_POST['AreaDescription'] .'" size="26" maxlength="25" title="' . _('Enter the description of the sales area') . '" /></td>
</tr>';
echo '<tr>
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2013-07-06 03:57:44 UTC (rev 6051)
+++ trunk/ShopParameters.php 2013-07-06 05:30:11 UTC (rev 6052)
@@ -10,21 +10,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Shop Configuration')
. '" alt="" />' . $Title. '</p>';
-?>
-<script>
- /* jQuery/javascript code */
- jQuery(document).ready(function() {
- jQuery('.noSpecialChars').bind('input', function() {
- jQuery(this).val($(this).val().replace(/[^a-z0-9@\._\-]/gi, ''));
- });
- jQuery('.number').bind('input', function() {
- jQuery(this).val($(this).val().replace(/[^0-9.]/gi, ''));
- });
- });
-</script>
-
-<?php
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -72,9 +58,16 @@
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowQOHColumn']."' WHERE confname = 'ShopShowQOHColumn'";
}
- if ($_SESSION['ShopAdditionalStockLocations'] != $_POST['X_ShopAdditionalStockLocations'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopAdditionalStockLocations']."' WHERE confname = 'ShopAdditionalStockLocations'";
- }
+ if (isset($_POST['X_ShopStockLocations'])) {
+ $ShopStockLocations = '';
+ foreach ($_POST['X_ShopStockLocations'] as $Location){
+ $ShopStockLocations .= $Location .',';
+ }
+ $ShopStockLocations = mb_substr($ShopStockLocations,0,mb_strlen($ShopStockLocations)-1);
+ if ($_SESSION['ShopStockLocations'] != $ShopStockLocations){
+ $SQL[] = "UPDATE config SET confvalue='" . $ShopStockLocations . "' WHERE confname='ShopStockLocations'";
+ }
+ }
if ($_SESSION['ShopShowLeftCategoryMenu'] != $_POST['X_ShopShowLeftCategoryMenu'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowLeftCategoryMenu']."' WHERE confname = 'ShopShowLeftCategoryMenu'";
@@ -216,20 +209,20 @@
//Shop Name
echo '<tr>
<td>' . _('Shop Name') . ':</td>
- <td><input type="text" name="X_ShopName" size="40" maxlength="40" value="' . $_SESSION['ShopName'] . '" /></td>
+ <td><input type="text" name="X_ShopName" required size="40" maxlength="40" value="' . $_SESSION['ShopName'] . '" /></td>
<td>' . _('Enter the name of the shop that will be displayed on all the store pages') . '</td>
</tr>';
// Shop Customer
echo '<tr>
<td>' . _('Default Web Shop Customer Acount') . ':</td>
- <td><input type="text"size="12" maxlength="10" name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td>
+ <td><input type="text"size="12" maxlength="10" required name="X_ShopDebtorNo" value="' . $_SESSION['ShopDebtorNo'] . '" /></td>
<td>' . _('Select the customer account that is to be used for the web-store sales') . '</td>
</tr>';
// Shop Customer Branch
echo '<tr>
<td>'._('Default Web Shop Branch Code').':</td>
- <td><input type="text" size="12" maxlength="10" name="X_ShopBranchCode" value="' . $_SESSION['ShopBranchCode'] . '" /></td>
+ <td><input type="text" required size="12" maxlength="10" name="X_ShopBranchCode" value="' . $_SESSION['ShopBranchCode'] . '" /></td>
<td>' . _('The customer branch code that is to be used - a branch of the above custoemr account - for web-store sales') . '</td>
</tr>';
@@ -308,12 +301,25 @@
echo '</select></td>
<td>' . _('Shows / Hides the vertical sales categories menu on the left column.') . '</td>
</tr>';
-
+
+if (mb_strlen($_SESSION['ShopStockLocations'])>1){
+ $ShopStockLocations = explode(',',$_SESSION['ShopStockLocations']);
+} else {
+ $ShopStockLocations = array();
+}
echo '<tr>
- <td>' . _('Additional Stock Locations') . ':</td>
- <td><input type="text" size="80" maxlength="100" name="X_ShopAdditionalStockLocations" value="' . $_SESSION['ShopAdditionalStockLocations'] . '" /></td>
- <td>' . _('List of additional stock location codes, sepparated by comma. Web-Stote will consider stock at the default customer location plus these ones.
- Leave empty if only will consider default customer location. Example: LOC01, LOC02, LOC03') . '</td>
+ <td>' . _('Stock Locations') . ':</td>
+ <td><select name="X_ShopStockLocations[]" size="5" multiple="multiple" >';
+$LocResult = DB_query("SELECT loccode, locationname FROM locations",$db);
+while ($LocRow = DB_fetch_array($LocResult)){
+ if (in_array($LocRow['loccode'],$ShopStockLocations)){
+ echo '<option selected="selected" value="' . $LocRow['loccode'] . '">' . $LocRow['locationname'] .'</option>';
+ } else {
+ echo '<option value="' . $LocRow['loccode'] . '">' . $LocRow['locationname'] .'</option>';
+ }
+}
+echo '</select></td>
+ <td>' . _('Select one or more stock locations (warehouses) that webSHOP should consider stock for the purposes of displaying the on hand quantity for customer information') . '</td>
</tr>';
echo '<tr>
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2013-07-06 03:57:44 UTC (rev 6051)
+++ trunk/build/make_release.sh 2013-07-06 05:30:11 UTC (rev 6052)
@@ -7,7 +7,7 @@
cd $BASE_DIR;
-xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
+xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php ../webshop/*.php ../webshop/includes/*.php
msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -133,4 +133,4 @@
cd ..
-zip -r $OUTPUT_DIR/webERP webERP -x \*.svn* \*/config.php
+zip -r $OUTPUT_DIR/webERP webERP -x \*.svn* \*/config.php \*build*
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 2013-07-06 03:57:44 UTC (rev 6051)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2013-07-06 05:30:11 UTC (rev 6052)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-09 22:30+1200\n"
+"POT-Creation-Date: 2013-07-06 15:49+1200\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -19,104 +19,86 @@
"X-Generator: Poedit 1.5.4\n"
#: AccountGroups.php:7 includes/MainMenuLinksArray.php:362
+#: includes/MainMenuLinksArray (puppypc32158's conflicted copy
+#: 2013-06-24).php:362
msgid "Account Groups"
msgstr "مجموعات العضوية"
-#: AccountGroups.php:35
-#, fuzzy
-msgid "The new account group name must be entered"
-msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-
-#: AccountGroups.php:36
-#, fuzzy
-msgid "The account group is expected to be 3 characters or more long"
-msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-
-#: AccountGroups.php:39
+#: AccountGroups.php:20
msgid ""
-"The sequence in the trial balance that the accounts under this account group "
-"should display must be entered"
-msgstr ""
-
-#: AccountGroups.php:40
-msgid "The sequence number can only contain digits"
-msgstr ""
-
-#: AccountGroups.php:60
-msgid ""
"An error occurred in retrieving the account groups of the parent account "
"group during the check for recursion"
msgstr ""
"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
"االتحقق من وجود استدعاء ذاتي"
-#: AccountGroups.php:61
+#: AccountGroups.php:21
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:90
+#: AccountGroups.php:50
#, fuzzy
msgid "An error occurred in moving the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:91
+#: AccountGroups.php:51
#, fuzzy
msgid "The SQL that was used to move the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:93 AccountGroups.php:374
+#: AccountGroups.php:53 AccountGroups.php:334
msgid "Review Account Groups"
msgstr ""
-#: AccountGroups.php:94
+#: AccountGroups.php:54
#, fuzzy
msgid "All accounts in the account group:"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:94
+#: AccountGroups.php:54
#, fuzzy
msgid "have been changed to the account group:"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:113 AccountGroups.php:150 AccountGroups.php:251
-#: AccountGroups.php:286
+#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211
+#: AccountGroups.php:246
msgid "The SQL that was used to retrieve the information was"
msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
-#: AccountGroups.php:114
+#: AccountGroups.php:74
msgid "Could not check whether the group exists because"
msgstr "لم يتم التحقق من وجود المجموعة بسبب"
-#: AccountGroups.php:121
+#: AccountGroups.php:81
msgid "The account group name already exists in the database"
msgstr "اسم المجموعة موجود مسبقاً"
-#: AccountGroups.php:127
+#: AccountGroups.php:87
msgid "The account group name cannot contain the character"
msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
-#: AccountGroups.php:127 Departments.php:30 TaxCategories.php:31
+#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:31
msgid "or the character"
msgstr "او الحرف"
-#: AccountGroups.php:133
+#: AccountGroups.php:93
msgid "The account group name must be at least one character long"
msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-#: AccountGroups.php:140
+#: AccountGroups.php:100
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:151
+#: AccountGroups.php:111
msgid "Could not check whether the group is recursive because"
msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
-#: AccountGroups.php:159
+#: AccountGroups.php:119
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 "
@@ -125,67 +107,67 @@
"will have no effect."
msgstr ""
-#: AccountGroups.php:164
+#: AccountGroups.php:124
msgid "The section in accounts must be an integer"
msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
-#: AccountGroups.php:170
+#: AccountGroups.php:130
msgid "The sequence in the trial balance must be an integer"
msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
-#: AccountGroups.php:176
+#: AccountGroups.php:136
msgid "The sequence in the TB must be numeric and less than"
msgstr ""
-#: AccountGroups.php:192
+#: AccountGroups.php:152
#, fuzzy
msgid "An error occurred in renaming the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:193
+#: AccountGroups.php:153
#, fuzzy
msgid "The SQL that was used to rename the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:212
+#: AccountGroups.php:172
msgid "An error occurred in updating the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:213
+#: AccountGroups.php:173
msgid "The SQL that was used to update the account group was"
msgstr ""
-#: AccountGroups.php:215 AccountSections.php:101 PaymentMethods.php:83
+#: AccountGroups.php:175 AccountSections.php:101 PaymentMethods.php:83
msgid "Record Updated"
msgstr "تم التحديث"
-#: AccountGroups.php:231
+#: AccountGroups.php:191
msgid "An error occurred in inserting the account group"
msgstr "حدث خطأ ما اثناء اضافة المجموعة"
-#: AccountGroups.php:232
+#: AccountGroups.php:192
msgid "The SQL that was used to insert the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:233 AccountSections.php:111
+#: AccountGroups.php:193 AccountSections.php:111
msgid "Record inserted"
msgstr "تمت الإضافة بنجاح"
-#: AccountGroups.php:250
+#: AccountGroups.php:210
msgid "An error occurred in retrieving the group information from chartmaster"
msgstr ""
-#: AccountGroups.php:255
+#: AccountGroups.php:215
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
msgstr ""
-#: AccountGroups.php:256 AccountGroups.php:291 AccountSections.php:133
+#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
#: Currencies.php:246 Currencies.php:254 Currencies.php:262
-#: CustomerBranches.php:289 CustomerBranches.php:299 CustomerBranches.php:309
-#: CustomerBranches.php:319 Customers.php:295 Customers.php:304
+#: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313
+#: CustomerBranches.php:323 Customers.php:295 Customers.php:304
#: Customers.php:312 Customers.php:320 CustomerTypes.php:147
#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96
@@ -205,53 +187,53 @@
msgid "There are"
msgstr "يوجد"
-#: AccountGroups.php:256
+#: AccountGroups.php:216
msgid "general ledger accounts that refer to this account group"
msgstr ""
-#: AccountGroups.php:263 AccountGroups.php:334 AccountGroups.php:447
+#: AccountGroups.php:223 AccountGroups.php:294 AccountGroups.php:407
msgid "Parent Group"
msgstr ""
-#: AccountGroups.php:279
+#: AccountGroups.php:239
msgid "Move Group"
msgstr ""
-#: AccountGroups.php:285
+#: AccountGroups.php:245
msgid "An error occurred in retrieving the parent group information"
msgstr ""
-#: AccountGroups.php:290
+#: AccountGroups.php:250
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
msgstr ""
-#: AccountGroups.php:291
+#: AccountGroups.php:251
msgid "account groups that have this group as its/there parent account group"
msgstr ""
-#: AccountGroups.php:295
+#: AccountGroups.php:255
msgid "An error occurred in deleting the account group"
msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
-#: AccountGroups.php:296
+#: AccountGroups.php:256
msgid "The SQL that was used to delete the account group was"
msgstr ""
-#: AccountGroups.php:298
+#: AccountGroups.php:258
msgid "group has been deleted"
msgstr "تم حذف المجموعة"
-#: AccountGroups.php:323
+#: AccountGroups.php:283
msgid "The sql that was used to retrieve the account group information was "
msgstr ""
-#: AccountGroups.php:324
+#: AccountGroups.php:284
msgid "Could not get account groups because"
msgstr "لم يتمكن الحصول على مجموات العضو لان"
-#: AccountGroups.php:326 AccountSections.php:172 AddCustomerContacts.php:25
+#: AccountGroups.php:286 AccountSections.php:172 AddCustomerContacts.php:25
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
#: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
@@ -279,10 +261,10 @@
#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:17
-#: SelectGLAccount.php:87 SelectOrderItems.php:609 SelectOrderItems.php:1528
-#: SelectOrderItems.php:1662 SelectProduct.php:541 SelectSalesOrder.php:563
-#: SelectSupplier.php:14 SelectSupplier.php:213 SelectWorkOrder.php:9
+#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:70
+#: SelectOrderItems.php:609 SelectOrderItems.php:1530
+#: SelectOrderItems.php:1664 SelectProduct.php:523 SelectSalesOrder.php:563
+#: SelectSupplier.php:14 SelectSupplier.php:217 SelectWorkOrder.php:9
#: SelectWorkOrder.php:169 SellThroughSupport.php:229 ShipmentCosting.php:11
#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockLocStatus.php:28
@@ -296,38 +278,39 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
#: WorkOrderReceive.php:31 WorkOrderStatus.php:58 WWW_Access.php:11
-#: WWW_Users.php:36 Z_BottomUpCosts.php:57
+#: WWW_Users.php:36 Z_BottomUpCosts.php:57 ../webshop/includes/header.php:171
msgid "Search"
msgstr "إبحث"
-#: AccountGroups.php:330
+#: AccountGroups.php:290
msgid "Group Name"
msgstr "إسم المجموعة"
-#: AccountGroups.php:331 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+#: AccountGroups.php:291 EDIMessageFormat.php:129 EDIMessageFormat.php:208
msgid "Section"
msgstr "قسم"
-#: AccountGroups.php:332 AccountGroups.php:501
+#: AccountGroups.php:292 AccountGroups.php:461
msgid "Sequence In TB"
msgstr ""
-#: AccountGroups.php:333 AccountGroups.php:484 GLProfit_Loss.php:6
+#: AccountGroups.php:293 AccountGroups.php:444 GLProfit_Loss.php:6
#: GLProfit_Loss.php:129 GLProfit_Loss.php:130 GLProfit_Loss.php:181
-#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
msgid "Profit and Loss"
msgstr ""
-#: AccountGroups.php:350 AccountGroups.php:353 AccountGroups.php:488
-#: AccountGroups.php:490 BOMs.php:124 BOMs.php:774 BOMs.php:776
+#: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448
+#: AccountGroups.php:450 BOMs.php:124 BOMs.php:774 BOMs.php:776
#: CompanyPreferences.php:479 CompanyPreferences.php:481
#: CompanyPreferences.php:494 CompanyPreferences.php:496
#: CompanyPreferences.php:509 CompanyPreferences.php:511
-#: ContractCosting.php:198 Currencies.php:332 Currencies.php:498
-#: Currencies.php:500 CustomerBranches.php:412 Customers.php:623
-#: Customers.php:1010 Customers.php:1016 Customers.php:1019
+#: ContractCosting.php:202 Currencies.php:332 Currencies.php:498
+#: Currencies.php:500 CustomerBranches.php:416 Customers.php:617
+#: Customers.php:1004 Customers.php:1010 Customers.php:1013
#: DailyBankTransactions.php:145 DeliveryDetails.php:1125
#: DeliveryDetails.php:1168 DeliveryDetails.php:1171 GLTransInquiry.php:69
+#: GLTransInquiry (puppypc32158's conflicted copy 2013-06-24).php:69
#: Labels.php:591 Labels.php:593 Labels.php:618 Locations.php:617
#: Locations.php:619 MRPCalendar.php:224 MRP.php:540 MRP.php:544 MRP.php:548
#: MRP.php:552 PaymentMethods.php:204 PaymentMethods.php:205
@@ -336,17 +319,18 @@
#: PcAuthorizeExpenses.php:246 PDFChequeListing.php:65
#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:782 PO_PDFPurchOrder.php:404 PO_PDFPurchOrder.php:407
+#: PO_Header.php:782 PO_PDFPurchOrder.php:408 PO_PDFPurchOrder.php:411
#: PurchData.php:291 PurchData.php:662 PurchData.php:665
#: 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 SalesPeople.php:219 SalesPeople.php:356
-#: SalesPeople.php:358 SelectProduct.php:397 ShipmentCosting.php:667
-#: ShopParameters.php:217 ShopParameters.php:221 ShopParameters.php:231
-#: ShopParameters.php:235 ShopParameters.php:250 ShopParameters.php:254
-#: ShopParameters.php:285 ShopParameters.php:289 Stocks.php:1160
+#: SalesPeople.php:358 SelectProduct.php:236 SelectProduct.php:379
+#: ShipmentCosting.php:667 ShopParameters.php:270 ShopParameters.php:274
+#: ShopParameters.php:305 ShopParameters.php:309 ShopParameters.php:339
+#: ShopParameters.php:343 ShopParameters.php:361 ShopParameters.php:365
+#: ShopParameters.php:422 ShopParameters.php:426 Stocks.php:1160
#: Stocks.php:1162 Stocks.php:1185 Stocks.php:1187 SuppContractChgs.php:90
#: SystemParameters.php:426 SystemParameters.php:449 SystemParameters.php:486
#: SystemParameters.php:558 SystemParameters.php:566 SystemParameters.php:606
@@ -362,17 +346,18 @@
msgid "Yes"
msgstr "موافق"
-#: AccountGroups.php:356 AccountGroups.php:493 AccountGroups.php:495
+#: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455
#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:773
#: BOMs.php:777 CompanyPreferences.php:478 CompanyPreferences.php:482
#: CompanyPreferences.php:493 CompanyPreferences.php:497
#: CompanyPreferences.php:508 CompanyPreferences.php:512
-#: ContractCosting.php:196 Currencies.php:334 Currencies.php:503
-#: Currencies.php:505 CustomerBranches.php:412 Customers.php:622
-#: Customers.php:1008 Customers.php:1015 Customers.php:1018
+#: ContractCosting.php:200 Currencies.php:334 Currencies.php:503
+#: Currencies.php:505 CustomerBranches.php:416 Customers.php:616
+#: Customers.php:1002 Customers.php:1009 Customers.php:1012
#: DailyBankTransactions.php:147 DeliveryDetails.php:1126
-#: DeliveryDetails.php:1169 DeliveryDetails.php:1172 GLTransInquiry.php:90
+#: DeliveryDetails.php:1169 DeliveryDetails.php:1172 GLTransInquiry.php:88
+#: GLTransInquiry (puppypc32158's conflicted copy 2013-06-24).php:88
#: Labels.php:590 Labels.php:594 Labels.php:619 Locations.php:622
#: Locations.php:624 MRPCalendar.php:226 MRP.php:538 MRP.php:542 MRP.php:546
#: MRP.php:550 NoSalesItems.php:184 PaymentMethods.php:204
@@ -381,17 +366,18 @@
#: PaymentMethods.php:295 PcAuthorizeExpenses.php:244 PDFChequeListing.php:64
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:781 PO_PDFPurchOrder.php:405 PO_PDFPurchOrder.php:408
+#: PO_Header.php:781 PO_PDFPurchOrder.php:409 PO_PDFPurchOrder.php:412
#: PurchData.php:294 PurchData.php:663 PurchData.php:666
#: 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 SalesPeople.php:221 SalesPeople.php:361
-#: SalesPeople.php:363 SelectProduct.php:399 ShipmentCosting.php:668
-#: ShopParameters.php:218 ShopParameters.php:220 ShopParameters.php:232
-#: ShopParameters.php:234 ShopParameters.php:251 ShopParameters.php:253
-#: ShopParameters.php:286 ShopParameters.php:288 Stocks.php:1155
+#: SalesPeople.php:363 SelectProduct.php:238 SelectProduct.php:381
+#: ShipmentCosting.php:668 ShopParameters.php:271 ShopParameters.php:273
+#: ShopParameters.php:306 ShopParameters.php:308 ShopParameters.php:340
+#: ShopParameters.php:342 ShopParameters.php:362 ShopParameters.php:364
+#: ShopParameters.php:423 ShopParameters.php:425 Stocks.php:1155
#: Stocks.php:1157 Stocks.php:1180 Stocks.php:1182 SuppContractChgs.php:92
#: SystemParameters.php:427 SystemParameters.php:450 SystemParameters.php:487
#: SystemParameters.php:559 SystemParameters.php:567 SystemParameters.php:607
@@ -408,11 +394,11 @@
msgid "No"
msgstr "ﻻ"
-#: AccountGroups.php:365 AccountSections.php:192 AddCustomerContacts.php:148
+#: AccountGroups.php:325 AccountSections.php:192 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:112
#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:364
-#: CustomerBranches.php:416 Customers.php:1093 Customers.php:1127
+#: CustomerBranches.php:420 Customers.php:1087 Customers.php:1121
#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:316 GLTags.php:96
@@ -427,8 +413,9 @@
#: SalesGLPostings.php:137 SalesGLPostings.php:253 SalesPeople.php:232
#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:621
#: SelectCustomer.php:640 SelectCustomer.php:670 SelectCustomer.php:688
-#: SelectCustomer.php:712 SelectCustomer.php:729 SellThroughSupport.php:298
-#: Shippers.php:144 StockCategories.php:264 SupplierContacts.php:165
+#: SelectCustomer.php:712 SelectCustomer.php:729 SelectGLAccount.php:106
+#: SelectGLAccount.php:121 SellThroughSupport.php:298 Shippers.php:144
+#: StockCategories.php:264 SupplierContacts.php:165
#: SupplierTenderCreate.php:155 SupplierTypes.php:189
#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182
#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
@@ -438,18 +425,18 @@
msgid "Edit"
msgstr "تحرير"
-#: AccountGroups.php:366
+#: AccountGroups.php:326
#, fuzzy
msgid "Are you sure you wish to delete this account group?"
msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
-#: AccountGroups.php:366 AccountSections.php:196 AddCustomerContacts.php:149
+#: AccountGroups.php:326 AccountSections.php:196 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:113
#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:400
-#: CreditStatus.php:176 Currencies.php:367 CustomerReceipt.php:938
-#: Customers.php:1128 CustomerTypes.php:207 Departments.php:187
+#: CreditStatus.php:176 Currencies.php:367 CustomerReceipt.php:941
+#: Customers.php:1122 CustomerTypes.php:207 Departments.php:187
#: DiscountCategories.php:225 DiscountMatrix.php:183 EDIMessageFormat.php:151
#: FixedAssetCategories.php:191 FreightCosts.php:243 GeocodeSetup.php:174
#: GLAccounts.php:317 GLJournal.php:429 GLTags.php:97
@@ -460,7 +447,7 @@
#: PaymentMethods.php:209 Payments.php:1095 PaymentTerms.php:206
#: PcAssignCashToTab.php:280 PcClaimExpensesFromTab.php:269 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:178
-#: PO_AuthorisationLevels.php:153 PO_Items.php:764 Prices_Customer.php:279
+#: PO_AuthorisationLevels.php:153 PO_Items.php:770 Prices_Customer.php:279
#: Prices.php:250 PurchData.php:309 PurchData.php:716
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:260
#: SalesCategoryDescriptions.php:114 SalesGLPostings.php:138
@@ -482,63 +469,68 @@
msgid "Delete"
msgstr "حذف"
-#: AccountGroups.php:394
+#: AccountGroups.php:354
msgid "An error occurred in retrieving the account group information"
msgstr ""
-#: AccountGroups.php:395
+#: AccountGroups.php:355
msgid ""
"The SQL that was used to retrieve the account group and that failed in the "
"process was"
msgstr ""
-#: AccountGroups.php:398
+#: AccountGroups.php:358
msgid "The account group name does not exist in the database"
msgstr ""
-#: AccountGroups.php:412
+#: AccountGroups.php:372
#, fuzzy
msgid "Edit Account Group Details"
msgstr "مجموعات العضوية"
-#: AccountGroups.php:436
+#: AccountGroups.php:396
#, fuzzy
msgid "New Account Group Details"
msgstr "مجموعات العضوية"
-#: AccountGroups.php:443
+#: AccountGroups.php:403
msgid "Account Group Name"
msgstr ""
-#: AccountGroups.php:444
+#: AccountGroups.php:404
#, fuzzy
+msgid "Enter the account group name"
+msgstr "لم يتمكن الحصول على مجموات العضو لان"
+
+#: AccountGroups.php:404
+#, fuzzy
msgid ""
"A unique name for the account group must be entered - at least 3 characters "
"long and less than 30 characters long"
msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-#: AccountGroups.php:453 AccountGroups.php:455
+#: AccountGroups.php:413 AccountGroups.php:415
msgid "Top Level Group"
msgstr ""
-#: AccountGroups.php:469
+#: AccountGroups.php:429
msgid "Section In Accounts"
msgstr ""
-#: AccountGroups.php:485
+#: AccountGroups.php:445
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:502
+#: AccountGroups.php:462
msgid ""
"Enter the sequence number that this account group and its child general "
"ledger accounts should display in the trial balance"
msgstr ""
-#: AccountGroups.php:505 AccountSections.php:262 AddCustomerContacts.php:260
+#: AccountGroups.php:465 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
#: BankAccounts.php:399 BOMs.php:787 COGSGLPostings.php:365
#: CreditStatus.php:259 Currencies.php:513 CustLoginSetup.php:273
@@ -558,6 +550,8 @@
msgstr "أدخل المعلومات"
#: AccountSections.php:7 includes/MainMenuLinksArray.php:363
+#: includes/MainMenuLinksArray (puppypc32158's conflicted copy
+#: 2013-06-24).php:363
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -673,7 +667,7 @@
msgstr ""
#: AddCustomerContacts.php:126 CompanyPreferences.php:226
-#: CustomerBranches.php:369 Customers.php:1080 Customers.php:1088
+#: CustomerBranches.php:373 Customers.php:1074 Customers.php:1082
#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:616
#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297
#: SupplierContacts.php:152 SuppTransGLAnalysis.php:108
@@ -682,8 +676,8 @@
msgid "Name"
msgstr ""
-#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1081
-#: Customers.php:1089 SelectCustomer.php:617 WWW_Access.php:110
+#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1075
+#: Customers.php:1083 SelectCustomer.php:617 WWW_Access.php:110
#: WWW_Access.php:173
msgid "Role"
msgstr ""
@@ -693,28 +687,30 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:375 CustomerBranches.php:795 CustomerInquiry.php:261
-#: Customers.php:1083 Customers.php:1091 EmailCustTrans.php:15
+#: CustomerBranches.php:379 CustomerBranches.php:801 CustomerInquiry.php:261
+#: Customers.php:1077 Customers.php:1085 EmailCustTrans.php:15
#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:587
-#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:391
-#: PO_PDFPurchOrder.php:394 PrintCustTrans.php:746 PrintCustTrans.php:977
+#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:395
+#: PO_PDFPurchOrder.php:398 PrintCustTrans.php:746 PrintCustTrans.php:977
#: PrintCustTrans.php:1026 PrintCustTransPortrait.php:789
#: PrintCustTransPortrait.php:1035 PrintCustTransPortrait.php:1091
-#: SelectCustomer.php:427 SelectCustomer.php:619 SelectSupplier.php:281
+#: SelectCustomer.php:427 SelectCustomer.php:619 SelectSupplier.php:285
#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:185
#: WWW_Users.php:283 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:109
#: includes/PO_PDFOrderPageHeader.inc:29 includes/PO_PDFOrderPageHeader
-#: (puppypc32158's conflicted copy 2013-05-23).inc:29
+#: (puppypc32158's conflicted copy 2013-05-23).inc:29 2013-06-24).inc:29
+#: ../webshop/Checkout.php:231 ../webshop/Register.php:404
+#: ../webshop/includes/Register.php:404
msgid "Email"
msgstr ""
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1084
-#: Customers.php:1092 PcAssignCashToTab.php:241 PcAssignCashToTab.php:372
+#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1078
+#: Customers.php:1086 PcAssignCashToTab.php:241 PcAssignCashToTab.php:372
#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:230
#: PcClaimExpensesFromTab.php:389 PcReportTab.php:327 SelectCustomer.php:620
-#: ShopParameters.php:157 SystemParameters.php:363 WOSerialNos.php:294
+#: ShopParameters.php:193 SystemParameters.php:363 WOSerialNos.php:294
#: WOSerialNos.php:300
msgid "Notes"
msgstr ""
@@ -733,15 +729,18 @@
msgstr ""
#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
+#: ../webshop/Checkout.php:313 ../webshop/Register.php:421
+#: ../webshop/includes/Register.php:421
msgid "Contact Name"
msgstr ""
#: AddCustomerContacts.php:232 Contracts.php:778 PDFRemittanceAdvice.php:247
-#: PO_Header.php:997 PO_Header.php:1077 SelectCreditItems.php:245
+#: PO_Header.php:997 PO_Header.php:1081 SelectCreditItems.php:245
#: SelectCustomer.php:425 SelectOrderItems.php:646
#: SupplierTenderCreate.php:390 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:81
-#: includes/PDFTransPageHeaderPortrait.inc:105
+#: includes/PDFTransPageHeaderPortrait.inc:105 ../webshop/Checkout.php:319
+#: ../webshop/Register.php:487 ../webshop/includes/Register.php:487
msgid "Phone"
msgstr ""
@@ -781,10 +780,11 @@
#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: BankMatching.php:278 BankReconciliation.php:212 BankReconciliation.php:289
-#: ContractCosting.php:173 CustomerAllocations.php:334
+#: ContractCosting.php:177 CustomerAllocations.php:334
#: CustomerAllocations.php:368 CustomerInquiry.php:204
-#: CustomerTransInquiry.php:106 GLAccountInquiry.php:181
-#: GLAccountReport.php:343 GLTransInquiry.php:42 MRPCalendar.php:219
+#: CustomerTransInquiry.php:106 GLAccountInquiry.php:191
+#: GLAccountReport.php:343 GLTransInquiry.php:42 GLTransInquiry
+#: (puppypc32158's conflicted copy 2013-06-24).php:42 MRPCalendar.php:219
#: PaymentAllocations.php:66 PcAssignCashToTab.php:237
#: PcAuthorizeExpenses.php:91 PDFRemittanceAdvice.php:308
#: PrintCustTrans.php:854 PrintCustTransPortrait.php:903 ReverseGRN.php:392
@@ -794,7 +794,7 @@
#: StockMovements.php:98 StockSerialItemResearch.php:81
#: SupplierAllocations.php:456 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierInquiry.php:211
-#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:93
+#: SupplierTransInquiry.php:105 includes/PDFQuotationPageHeader.inc:94
#: includes/PDFQuotationPortraitPageHeader.inc:91
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:48
@@ -804,9 +804,9 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:172
#: SelectCustomer.php:667 SelectCustomer.php:709 Stocks.php:1164
-#: UpgradeDatabase.php:227 UpgradeDatabase.php:230 UpgradeDatabase.php:233
-#: UpgradeDatabase.php:236 UpgradeDatabase.php:239 UpgradeDatabase.php:242
-#: UpgradeDatabase.php:245 UpgradeDatabase.php:248 UpgradeDatabase.php:251
+#: UpgradeDatabase.php:229 UpgradeDatabase.php:232 UpgradeDatabase.php:235
+#: UpgradeDatabase.php:238 UpgradeDatabase.php:241 UpgradeDatabase.php:244
+#: UpgradeDatabase.php:247 UpgradeDatabase.php:250 UpgradeDatabase.php:253
#: 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
@@ -908,14 +908,14 @@
#: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:105
#: GLBalanceSheet.php:144 GLProfit_Loss.php:181 GLTagProfit_Loss.php:194
-#: GLTrialBalance.php:160 InternalStockRequest.php:317
+#: GLTrialBalance.php:163 InternalStockRequest.php:317
#: InventoryPlanning.php:101 InventoryPlanning.php:176
#: InventoryPlanning.php:211 InventoryPlanning.php:259
#: InventoryPlanning.php:299 InventoryPlanningPrefSupplier.php:201
#: InventoryPlanningPrefSupplier.php:269 InventoryPlanningPrefSupplier.php:303
#: InventoryPlanningPrefSupplier.php:348 InventoryPlanningPrefSupplier.php:396
#: InventoryQuantities.php:84 InventoryValuation.php:78
-#: MailInventoryValuation.php:21 MailInventoryValuation.php:120
+#: MailInventoryValuation.php:21 MailInventoryValuation.php:119
#: MailSalesReport_csv.php:30 MailSalesReport.php:23
#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
#: MRPReport.php:147 MRPReport.php:508 MRPReschedules.php:45
@@ -944,7 +944,7 @@
#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:109
#: GLBalanceSheet.php:147 GLBalanceSheet.php:324 GLProfit_Loss.php:184
#: GLProfit_Loss.php:196 GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211
-#: GLTrialBalance.php:163 GLTrialBalance.php:175 InventoryPlanning.php:104
+#: GLTrialBalance.php:168 GLTrialBalance.php:182 InventoryPlanning.php:104
#: InventoryPlanning.php:179 InventoryPlanning.php:214
#: InventoryPlanning.php:262 InventoryPlanning.php:302
#: InventoryPlanning.php:365 InventoryPlanningPrefSupplier.php:204
@@ -952,9 +952,9 @@
#: InventoryPlanningPrefSupplier.php:351 InventoryPlanningPrefSupplier.php:399
#: InventoryPlanningPrefSupplier.php:455 InventoryQuantities.php:87
#: InventoryQuantities.php:98 InventoryValuation.php:81
-#: InventoryValuation.php:92 MailInventoryValuation.php:123
-#: MailInventoryValuation.php:219 MailInventoryValuation.php:243
-#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117
+#: InventoryValuation.php:92 MailInventoryValuation.php:122
+#: MailInventoryValuation.php:218 MailInventoryValuation.php:242
+#: MailInventoryValuation.php:250 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
@@ -966,7 +966,7 @@
#: PDFRemittanceAdvice.php:83 PDFSellThroughSupportClaim.php:74
#: PDFSellThroughSupportClaim.php:86 PDFStockCheckComparison.php:37
#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
-#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:153
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:155
#: PrintCustOrder_generic.php:249 PrintCustOrder.php:233 ReorderLevel.php:63
#: ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
#: SelectCreditItems.php:32 StockCheck.php:46 StockCheck.php:68
@@ -995,8 +995,8 @@
msgstr ""
#: AgedDebtors.php:365 AgedSuppliers.php:197 GLAccountCSV.php:175
-#: GLAccountInquiry.php:169 GLAccountReport.php:97 PO_Items.php:448
-#: PO_Items.php:577 PO_Items.php:602 SalesAnalReptCols.php:365
+#: GLAccountInquiry.php:179 GLAccountReport.php:97 PO_Items.php:448
+#: PO_Items.php:579 PO_Items.php:604 SalesAnalReptCols.php:365
#: SpecialOrder.php:449 StockLocTransferReceive.php:390
#: StockQuantityByDate.php:123 includes/SelectOrderItems_IntoCart.inc:55
msgid "could not be retrieved because"
@@ -1032,6 +1032,8 @@
#: includes/PDFPaymentRun_PymtFooter.php:158
#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76
#: includes/ConnectDB_mysql.inc:66
+#: ../webshop/includes/DatabaseFunctions.php:58
+#: ../webshop/includes/Functions.php:425 ../webshop/includes/PlaceOrder.php:52
msgid "The SQL that failed was"
msgstr ""
@@ -1250,6 +1252,14 @@
msgid "Review Areas Defined"
msgstr ""
+#: Areas.php:218
+msgid "Enter the sales area code - up to 3 characters are allowed"
+msgstr ""
+
+#: Areas.php:223
+msgid "Enter the description of the sales area"
+msgstr ""
+
#: AuditTrail.php:7
msgid "Audit Trail"
msgstr ""
@@ -1284,13 +1294,13 @@
#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68
#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:60 PDFPriceList.php:198
-#: PO_Items.php:1097 POReport.php:1570 ReorderLevel.php:212
+#: PO_Items.php:1103 POReport.php:1570 ReorderLevel.php:212
#: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246
#: SalesGraph.php:102 SalesGraph.php:104 SalesGraph.php:124 SalesGraph.php:126
#: SalesGraph.php:148 SalesGraph.php:150 SalesGraph.php:184
#: SalesInquiry.php:1075 SalesInquiry.php:1138 SelectCreditItems.php:986
-#: SelectOrderItems.php:1670 SelectOrderItems.php:1673 SelectProduct.php:549
-#: SelectProduct.php:551 StockDispatch.php:82 StockDispatch.php:393
+#: SelectOrderItems.php:1672 SelectOrderItems.php:1675 SelectProduct.php:531
+#: SelectProduct.php:533 StockDispatch.php:82 StockDispatch.php:393
#: StockDispatch.php:395 StockLocStatus.php:71 StockLocStatus.php:73
#: StockLocStatus.php:91 StockLocStatus.php:96 StockLocStatus.php:101
#: StockLocStatus.php:106 StockQuantityByDate.php:25 SupplierPriceList.php:23
@@ -1314,7 +1324,7 @@
msgstr ""
#: AuditTrail.php:82 InternalStockRequest.php:591 MRPReport.php:778
-#: PO_SelectPurchOrder.php:431 SelectContract.php:184 SelectProduct.php:823
+#: PO_SelectPurchOrder.php:431 SelectContract.php:184 SelectProduct.php:805
msgid "View"
msgstr ""
@@ -1322,15 +1332,15 @@
msgid "Date/Time"
msgstr ""
-#: AuditTrail.php:166 PcReportTab.php:259 includes/header.inc:61
+#: AuditTrail.php:166 PcReportTab.php:259 includes/header.inc:59
msgid "User"
msgstr ""
#: AuditTrail.php:167 BankReconciliation.php:213 BankReconciliation.php:290
#: CustomerAllocations.php:366 CustomerInquiry.php:202
#: CustomerPurchases.php:68 CustomerTransInquiry.php:25
-#: CustomerTransInquiry.php:104 CustWhereAlloc.php:22 CustWhereAlloc.php:108
-#: DailyBankTransactions.php:127 GLAccountInquiry.php:179
+#: CustomerTransInquiry.php:104 CustWhereAlloc.php:22 CustWhereAlloc.php:113
+#: DailyBankTransactions.php:127 GLAccountInquiry.php:189
#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
#: SalesByTypePeriodInquiry.php:336 SelectCustomer.php:424
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockCategories.php:236
@@ -1353,7 +1363,7 @@
msgstr ""
#: AuditTrail.php:170 MaterialsNotUsed.php:38 PurchData.php:695
-#: SellThroughSupport.php:263 ShopParameters.php:156 SystemParameters.php:362
+#: SellThroughSupport.php:263 ShopParameters.php:192 SystemParameters.php:362
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr ""
@@ -1525,7 +1535,7 @@
#: PO_AuthorisationLevels.php:215 PO_AuthoriseMyOrders.php:115
#: PO_Header.php:561 PO_SelectOSPurchOrder.php:478 PO_SelectPurchOrder.php:433
#: PricesByCost.php:277 Prices.php:220 Prices.php:296 PurchData.php:271
-#: PurchData.php:466 PurchData.php:607 SelectSupplier.php:275
+#: PurchData.php:466 PurchData.php:607 SelectSupplier.php:279
#: SellThroughSupport.php:161 SupplierCredit.php:263 SupplierInvoice.php:606
#: SupplierPriceList.php:450 SupplierTenderCreate.php:609
#: SupplierTenders.php:126 SupplierTenders.php:538
@@ -1571,8 +1581,7 @@
msgid "Bank Account Matching"
msgstr ""
-#: BankMatching.php:17 CustWhereAlloc.php:31 CustWhereAlloc.php:33
-#: PDFCustTransListing.php:45 Z_CheckDebtorsControl.php:74
+#: BankMatching.php:17 PDFCustTransListing.php:45 Z_CheckDebtorsControl.php:74
msgid "Receipts"
msgstr ""
@@ -1630,12 +1639,13 @@
msgid "Bank Account"
msgstr ""
-#: BankMatching.php:127
+#: BankMatching.php:127 ShopParameters.php:284 ShopParameters.php:288
msgid "Show"
msgstr ""
#: BankMatching.php:127 CounterSales.php:227 CreditItemsControlled.php:79
#: FreightCosts.php:269 GoodsReceivedControlled.php:68 GoodsReceived.php:73
+#: GoodsReceived (puppypc32158's conflicted copy 2013-06-24).php:73
#: InternalStockRequestFulfill.php:37 StockLocTransferReceive.php:444
#: SupplierAllocations.php:435 SuppShiptChgs.php:137
msgid "from"
@@ -1650,7 +1660,7 @@
#: PDFDeliveryDifferences.php:297 PDFDIFOT.php:193 PDFDIFOT.php:206
#: PDFDIFOT.php:299 PDFOrdersInvoiced.php:80 PDFOrdersInvoiced.php:277
#: PDFOrderStatus.php:85 PDFOrderStatus.php:259 PDFRemittanceAdvice.php:48
-#: PO_PDFPurchOrder.php:349 PricesBasedOnMarkUp.php:215
+#: PO_PDFPurchOrder.php:353 PricesBasedOnMarkUp.php:215
#: PricesBasedOnMarkUp.php:354 PrintCustStatements.php:46
#: PrintCustTrans.php:63 PrintCustTrans.php:66 PrintCustTransPortrait.php:62
#: PrintCustTransPortrait.php:65 SalesGraph.php:218 SalesGraph.php:247
@@ -1762,8 +1772,8 @@
msgstr ""
#: BankMatching.php:279 ConfirmDispatch_Invoice.php:297 Credit_Invoice.php:297
-#: CustomerAllocations.php:369 CustomerReceipt.php:915
-#: CustomerTransInquiry.php:113 CustWhereAlloc.php:112 GLJournalInquiry.php:85
+#: CustomerAllocations.php:369 CustomerReceipt.php:918
+#: CustomerTransInquiry.php:113 CustWhereAlloc.php:117 GLJournalInquiry.php:85
#: ImportBankTransAnalysis.php:208 ImportBankTransAnalysis.php:288
#: PaymentAllocations.php:67 Payments.php:1052 Payments.php:1056
#: Payments.php:1072 PcAssignCashToTab.php:239 PcAssignCashToTab.php:364
@@ -1779,7 +1789,8 @@
#: SuppTransGLAnalysis.php:109 SuppTransGLAnalysis.php:219
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
#: includes/PDFChequeListingPageHeader.inc:37
-#: includes/PDFGLJournalHeader.inc:22
+#: includes/PDFGLJournalHeader.inc:22 ../webshop/CreditCardPayFlowPro.php:276
+#: ../webshop/CreditCardPayPalPro.php:337
msgid "Amount"
msgstr ""
@@ -1894,8 +1905,8 @@
#: BankReconciliation.php:214 BankReconciliation.php:291
#: CustomerAllocations.php:333 CustomerAllocations.php:367
-#: CustomerInquiry.php:203 CustomerTransInquiry.php:105 CustWhereAlloc.php:109
-#: EmailCustTrans.php:15 GLAccountInquiry.php:180 ImportBankTrans.php:538
+#: CustomerInquiry.php:203 CustomerTransInquiry.php:105 CustWhereAlloc.php:114
+#: EmailCustTrans.php:15 GLAccountInquiry.php:190 ImportBankTrans.php:538
#: PrintCustTrans.php:509 PrintCustTrans.php:731 PrintCustTrans.php:964
#: PrintCustTrans.php:1013 PrintCustTransPortrait.php:535
#: PrintCustTransPortrait.php:771 PrintCustTransPortrait.php:1019
@@ -1903,7 +1914,7 @@
#: SupplierAllocations.php:455 SupplierAllocations.php:568
#: SupplierAllocations.php:643 SupplierTransInquiry.php:103
#: Z_CheckAllocs.php:63 Z_CheckGLTransBalance.php:12
-#: includes/PDFQuotationPageHeader.inc:89
+#: includes/PDFQuotationPageHeader.inc:90
#: includes/PDFQuotationPortraitPageHeader.inc:87
#: includes/PDFStatementPageHeader.inc:168
#: includes/PDFStatementPageHeader.inc:179 includes/PDFTransPageHeader.inc:44
@@ -1912,8 +1923,8 @@
msgstr ""
#: BankReconciliation.php:215 BankReconciliation.php:292
-#: ContractCosting.php:172 CustomerInquiry.php:206 CustomerPurchases.php:75
-#: CustomerTransInquiry.php:109 CustWhereAlloc.php:110
+#: ContractCosting.php:176 CustomerInquiry.php:206 CustomerPurchases.php:75
+#: CustomerTransInquiry.php:109 CustWhereAlloc.php:115
#: DailyBankTransactions.php:128 GLAccountReport.php:342
#: PaymentAllocations.php:64 PaymentAllocations.php:65
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:115
@@ -1923,7 +1934,7 @@
#: includes/PDFPeriodStockTransListingPageHeader.inc:48
#: includes/PDFPeriodStockTransListingPageHeader.inc:52
#: includes/PDFStockComparisonPageHeader.inc:36
-#: includes/PDFSuppTransListingPageHeader.inc:49
+#: includes/PDFSuppTransListingPageHeader.inc:49 ../webshop/Checkout.php:554
msgid "Reference"
msgstr ""
@@ -1967,7 +1978,7 @@
msgstr ""
#: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:832
-#: Customers.php:1156 SelectOrderItems.php:1456 Stocks.php:1353
+#: Customers.php:1150 SelectOrderItems.php:1456 Stocks.php:1353
#: WorkOrderCosting.php:551 WorkOrderEntry.php:590
msgid "Are You Sure?"
msgstr ""
@@ -2033,23 +2044,25 @@
#: CounterSales.php:2097 CounterSales.php:2285 CounterSales.php:2422
#: Credit_Invoice.php:291 CustomerPurchases.php:73 DeliveryDetails.php:861
#: DeliveryDetails.php:931 GoodsReceived.php:101 GoodsReceived.php:105
-#: GoodsReceived.php:108 InternalStockRequestFulfill.php:318
-#: InternalStockRequestFulfill.php:319 InternalStockRequest.php:631
-#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:248
-#: MRPDemands.php:297 MRPDemands.php:395 MRPPlannedPurchaseOrders.php:328
-#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:387 MRPReport.php:413
-#: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
-#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:170
-#: PDFOrdersInvoiced.php:393 POReport.php:762 POReport.php:1449
-#: PrintCustTrans.php:894 PrintCustTrans.php:983 PrintCustTrans.php:1032
+#: GoodsReceived.php:108 GoodsReceived (puppypc32158's conflicted copy
+#: 2013-06-24).php:101 2013-06-24).php:105 2013-06-24).php:108
+#: InternalStockRequestFulfill.php:318 InternalStockRequestFulfill.php:319
+#: InternalStockRequest.php:631 InventoryPlanningPrefSupplier.php:78
+#: InventoryQuantities.php:248 MRPDemands.php:297 MRPDemands.php:395
+#: MRPPlannedPurchaseOrders.php:328 MRPPlannedWorkOrders.php:261
+#: MRPPlannedWorkOrders.php:387 MRPReport.php:413 MRPReport.php:419
+#: MRPReschedules.php:195 OffersReceived.php:108 OffersReceived.php:218
+#: OffersReceived.php:278 OrderDetails.php:170 PDFOrdersInvoiced.php:393
+#: POReport.php:762 POReport.php:1449 PrintCustTrans.php:894
+#: PrintCustTrans.php:983 PrintCustTrans.php:1032
#: PrintCustTransPortrait.php:945 PrintCustTransPortrait.php:1043
#: PrintCustTransPortrait.php:1099 RecurringSalesOrders.php:331
#: ReorderLevel.php:300 ReverseGRN.php:393 ReverseGRN.php:394
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:193
#: SalesGraph.php:276 SalesInquiry.php:977 SalesTopItemsInquiry.php:225
#: SelectCreditItems.php:688 SelectCreditItems.php:1068
-#: SelectOrderItems.php:1378 SelectOrderItems.php:1545
-#: SelectOrderItems.php:1740 SelectOrderItems.php:1870 ShipmentCosting.php:149
+#: SelectOrderItems.php:1378 SelectOrderItems.php:1547
+#: SelectOrderItems.php:1742 SelectOrderItems.php:1872 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
#: StockCounts.php:114 StockLocMovements.php:93 StockLocTransfer.php:307
@@ -2069,7 +2082,7 @@
#: includes/PDFOrderPageHeader_generic.inc:93
#: includes/PDFPeriodStockTransListingPageHeader.inc:50
#: includes/PDFPickingListHeader.inc:74
-#: includes/PDFQuotationPageHeader.inc:104
+#: includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:104
#: includes/PDFSalesOrder_generic.inc:95
#: includes/PDFSellThroughSupportClaimPageHeader.inc:27
@@ -2077,8 +2090,9 @@
#: includes/PDFStockNegativesHeader.inc:33
#: includes/PDFStockTransferHeader.inc:39 includes/PDFTransPageHeader.inc:209
#: includes/PO_PDFOrderPageHeader.inc:77 includes/PO_PDFOrderPageHeader
-#: (puppypc32158's conflicted copy 2013-05-23).inc:76 api/api_xml-rpc.php:2533
+#: 2013-05-23).inc:76 2013-06-24).inc:77 api/api_xml-rpc.php:2533
#: api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775
+#: ../webshop/includes/DisplayShoppingCart.php:7
msgid "Quantity"
msgstr ""
@@ -2186,7 +2200,7 @@
#: includes/PDFPeriodStockTransListingPageHeader.inc:25
#: includes/PDFPickingListHeader.inc:69
#: includes/PDFProfitAndLossPageHeader.inc:28
-#: includes/PDFQuotationPageHeader.inc:95
+#: includes/PDFQuotationPageHeader.inc:96
#: includes/PDFQuotationPortraitPageHeader.inc:93
#: includes/PDFSalesAnalPageHeader.inc:15
#: includes/PDFSalesOrder_generic.inc:85
@@ -2207,7 +2221,7 @@
#: includes/PDFTransPageHeaderPortrait.inc:23
#: includes/PDFTrialBalancePageHeader.inc:18
#: includes/PO_PDFOrderPageHeader.inc:17 includes/PO_PDFOrderPageHeader
-#: (puppypc32158's conflicted copy 2013-05-23).inc:17
+#: (puppypc32158's conflicted copy 2013-05-23).inc:17 2013-06-24).inc:17
msgid "Page"
msgstr ""
@@ -2224,9 +2238,9 @@
#: InternalStockRequest.php:627 PO_SelectOSPurchOrder.php:237
#: PO_SelectPurchOrder.php:214 ReorderLevelLocation.php:73
#: ReorderLevelLocation.php:74 SelectCompletedOrder.php:556
-#: SelectOrderItems.php:1541 SelectOrderItems.php:1736
+#: SelectOrderItems.php:1543 SelectOrderItems.php:1738
#: SelectSalesOrder.php:612 SelectWorkOrder.php:211 Shipt_Select.php:192
-#: TopItems.php:168 includes/PDFTopItemsHeader.inc:54
+#: TopItems.php:168 includes/PDFTopItemsHeader.inc:54 ../webshop/index.php:169
msgid "On Hand"
msgstr ""
@@ -2296,7 +2310,8 @@
#: FixedAssetDepreciation.php:90 FixedAssetRegister.php:84
#: FixedAssetRegister.php:385 FixedAssetTransfer.php:60
#: FixedAssetTransfer.php:160 GLTags.php:63 GLTags.php:82
-#: GLTransInquiry.php:47 GoodsReceived.php:100
+#: GLTransInquiry.php:47 GLTransInquiry (puppypc32158's conflicted copy
+#: 2013-06-24).php:47 GoodsReceived.php:100 GoodsReceived 2013-06-24).php:100
#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:342
#: InternalStockRequest.php:557 InternalStockRequest.php:625
#: InventoryQuantities.php:246 Labels.php:288 MaintenanceTasks.php:91
@@ -2306,14 +2321,14 @@
#: MRPShortages.php:350 NoSalesItems.php:187 PaymentTerms.php:182
#: PcExpenses.php:190 PcExpenses.php:296 PcExpensesTypeTab.php:171
#: PcReportTab.php:170 PcTypeTabs.php:161 PDFOrdersInvoiced.php:351
-#: PDFOrderStatus.php:322 PO_Items.php:714 PO_Items.php:1147
+#: PDFOrderStatus.php:322 PO_Items.php:720 PO_Items.php:1153
#: PO_SelectOSPurchOrder.php:236 PO_SelectPurchOrder.php:213
#: PricesByCost.php:152 ReorderLevelLocation.php:71 ReorderLevel.php:298
#: ReverseGRN.php:391 SalesCategories.php:479 SecurityTokens.php:95
#: SecurityTokens.php:104 SecurityTokens.php:120 SelectAsset.php:265
#: SelectCompletedOrder.php:555 SelectContract.php:144
-#: SelectCreditItems.php:1022 SelectOrderItems.php:1539
-#: SelectOrderItems.php:1734 SelectProduct.php:561 SelectProduct.php:788
+#: SelectCreditItems.php:1022 SelectOrderItems.php:1541
+#: SelectOrderItems.php:1736 SelectProduct.php:543 SelectProduct.php:770
#: SelectSalesOrder.php:611 SelectWorkOrder.php:210 Shipt_Select.php:191
#: StockCategories.php:235 StockDispatch.php:503 StockLocStatus.php:172
#: StockQuantityByDate.php:108 Stocks.php:950 SuppCreditGRNs.php:92
@@ -2413,18 +2428,18 @@
#: BOMInquiry.php:28 BOMs.php:868 ContractBOM.php:331 ContractBOM.php:336
#: Contracts.php:759 Contracts.php:762 CounterReturns.php:1642
-#: CounterSales.php:2243 CustomerReceipt.php:1126 CustomerReceipt.php:1129
+#: CounterSales.php:2243 CustomerReceipt.php:1129 CustomerReceipt.php:1132
#: DiscountCategories.php:109 DiscountCategories.php:111
#: DiscountCategories.php:115 DiscountCategories.php:117
#: FixedAssetTransfer.php:94 InternalStockRequest.php:351 MRPDemands.php:338
-#: MRPDemands.php:341 MRPReport.php:543 PO_Header.php:542 PO_Items.php:1126
-#: PO_Items.php:1130 P...
[truncated message content] |
