Small fixes in attachments upload.
authorJanusz Dobrowolski <janusz@frontaccouting.eu>
Sat, 14 Jul 2012 20:12:18 +0000 (22:12 +0200)
committerJanusz Dobrowolski <janusz@frontaccouting.eu>
Sat, 14 Jul 2012 20:12:18 +0000 (22:12 +0200)
admin/attachments.php
lang/new_language_template/LC_MESSAGES/empty.po

index 2dcce85df2e7e9b3d69bfd016259b34fd185daf6..cc2efe935563032b6f8bdb0eacf262786b16202e 100644 (file)
@@ -77,11 +77,14 @@ if (isset($_GET['filterType'])) // catch up external links
        $_POST['filterType'] = $_GET['filterType'];
 if (isset($_GET['trans_no']))
        $_POST['trans_no'] = $_GET['trans_no'];
-       
+
 if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
 {
-       if (isset($_FILES['filename']) && $_FILES['filename']['size'] > 0)
-       {
+       if (!$_POST['trans_no'])
+               display_error(_("No transaction has been selected."));
+       elseif ($Mode == 'ADD_ITEM' && (!isset($_FILES['filename']) || $_FILES['filename']['size'] == 0))
+               display_error(_("Select attachment file."));
+       else {
                //$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
                $tmpname = $_FILES['filename']['tmp_name'];
 
@@ -110,26 +113,22 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                $filename = basename($_FILES['filename']['name']);
                $filesize = $_FILES['filename']['size'];
                $filetype = $_FILES['filename']['type'];
-       }
-       else
-       {
-               $unique_name = $filename = $filetype = "";
-               $filesize = 0;
-       }
-       if ($Mode == 'ADD_ITEM')
-       {
-               add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
-                       $filename, $unique_name, $filesize, $filetype);
-               display_notification(_("Attachment has been inserted.")); 
-       }
-       else
-       {
-               update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
-                       $filename, $unique_name, $filesize, $filetype); 
-               display_notification(_("Attachment has been updated.")); 
+
+               if ($Mode == 'ADD_ITEM')
+               {
+                       add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+                               $filename, $unique_name, $filesize, $filetype);
+                       display_notification(_("Attachment has been inserted.")); 
+               }
+               else
+               {
+                       update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+                               $filename, $unique_name, $filesize, $filetype); 
+                       display_notification(_("Attachment has been updated.")); 
+               }
        }
        $Mode = 'RESET';
-}              
+}
 
 if ($Mode == 'Delete')
 {
@@ -223,7 +222,7 @@ file_row(_("Attached File") . ":", 'filename', 'filename');
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == -1, '', 'process');
 
 end_form();
 
index 0f8399838b343e80772ca33b7dc718a083f541cd..cbbaba16cd1985c5e160d86e5547907c24e97996 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 20:49+0100\n"
+"POT-Creation-Date: 2012-07-14 22:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -87,15 +87,15 @@ msgstr ""
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:123
+#: admin/attachments.php:123 admin/attachments.php:121
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:129
+#: admin/attachments.php:129 admin/attachments.php:127
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:141
+#: admin/attachments.php:141 admin/attachments.php:140
 msgid "Attachment has been deleted."
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 #: manufacturing/work_order_entry.php:379
 #: manufacturing/work_order_entry.php:387
 #: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47
+#: sales/inquiry/customer_allocation_inquiry.php:47 admin/attachments.php:158
 msgid "Type:"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr ""
 #: sales/view/view_sales_order.php:161
 #: sales/inquiry/customer_allocation_inquiry.php:145
 #: sales/inquiry/customer_inquiry.php:225
-#: sales/inquiry/customer_inquiry.php.orig:225
+#: sales/inquiry/customer_inquiry.php.orig:225 admin/attachments.php:170
 msgid "#"
 msgstr ""
 
@@ -167,23 +167,25 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:299
 #: sales/inquiry/sales_orders_view.php.orig:293
 #: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
-#: taxes/tax_types.php:115
+#: taxes/tax_types.php:115 admin/attachments.php:170 admin/attachments.php:220
+#: reporting/rep305.php:98 sales/create_recurrent_invoices.php:132
 msgid "Description"
 msgstr ""
 
 #: admin/attachments.php:171 admin/backups.php:63 admin/backups.php:149
+#: admin/attachments.php:170
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:171
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:171
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:171
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Date Uploaded"
 msgstr ""
 
@@ -225,15 +227,17 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php.orig:126
 #: sales/includes/ui/sales_credit_ui.inc:197
 #: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:142 taxes/tax_types.php:132
+#: taxes/tax_groups.php:142 taxes/tax_types.php:132 admin/attachments.php:185
+#: sales/includes/ui/sales_order_ui.inc:206
 msgid "Edit"
 msgstr ""
 
 #: admin/attachments.php:187 gl/inquiry/journal_inquiry.php:135
+#: admin/attachments.php:186
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:188
+#: admin/attachments.php:188 admin/attachments.php:187
 msgid "Download"
 msgstr ""
 
@@ -268,15 +272,17 @@ msgstr ""
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:199
 #: sales/includes/ui/sales_order_ui.inc:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:143 taxes/tax_types.php:133
+#: taxes/tax_groups.php:143 taxes/tax_types.php:133 admin/attachments.php:188
+#: sales/includes/ui/sales_order_ui.inc:208
 msgid "Delete"
 msgstr ""
 
 #: admin/attachments.php:215 admin/attachments.php:220
+#: admin/attachments.php:214 admin/attachments.php:219
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:222
+#: admin/attachments.php:222 admin/attachments.php:221
 msgid "Attached File"
 msgstr ""
 
@@ -355,6 +361,8 @@ msgstr ""
 
 #: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
 #: sales/includes/ui/sales_order_ui.inc:637
+#: sales/includes/ui/sales_order_ui.inc:593
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Comments:"
 msgstr ""
 
@@ -489,6 +497,7 @@ msgstr ""
 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
 #: sales/manage/customers.php:231 sales/manage/customers.php.orig:228
 #: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:632
 msgid "Address:"
 msgstr ""
 
@@ -632,7 +641,10 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php.orig:321
 #: sales/includes/ui/sales_credit_ui.inc:293
 #: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:555
+#: sales/includes/ui/sales_order_ui.inc:555 sales/credit_note_entry.php:284
+#: sales/customer_credit_invoice.php:380 sales/customer_invoice.php:582
+#: sales/includes/ui/sales_order_ui.inc:241
+#: sales/includes/ui/sales_order_ui.inc:559
 msgid "Update"
 msgstr ""
 
@@ -1798,7 +1810,7 @@ msgstr ""
 #: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
 #: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
 #: purchasing/manage/suppliers.php:289 sales/manage/customers.php:324
-#: sales/manage/customers.php.orig:321
+#: sales/manage/customers.php.orig:321 sales/manage/customers.php:326
 msgid "Show inactive:"
 msgstr ""
 
@@ -1850,6 +1862,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:444
 #: sales/includes/ui/sales_credit_ui.inc:295
 #: sales/includes/ui/sales_order_ui.inc:557
+#: sales/includes/ui/sales_order_ui.inc:561
 msgid "Cancel"
 msgstr ""
 
@@ -1860,7 +1873,8 @@ msgstr ""
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
 #: sales/customer_delivery.php:368 sales/customer_invoice.php:420
 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
-#: sales/view/view_invoice.php:91
+#: sales/view/view_invoice.php:91 sales/customer_credit_invoice.php:254
+#: sales/customer_invoice.php:422
 msgid "Shipping Company"
 msgstr ""
 
@@ -2153,6 +2167,8 @@ msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:85
 #: sales/includes/ui/sales_credit_ui.inc:87
 #: sales/includes/ui/sales_order_ui.inc:373
+#: sales/customer_credit_invoice.php:245 sales/customer_invoice.php:396
+#: sales/includes/ui/sales_order_ui.inc:377
 msgid "Reference"
 msgstr ""
 
@@ -2194,7 +2210,7 @@ msgstr ""
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 #: sales/inquiry/customer_allocation_inquiry.php:148
 #: sales/inquiry/customer_inquiry.php:228
-#: sales/inquiry/customer_inquiry.php.orig:228
+#: sales/inquiry/customer_inquiry.php.orig:228 sales/customer_invoice.php:432
 msgid "Date"
 msgstr ""
 
@@ -2277,6 +2293,7 @@ msgstr ""
 #: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
 #: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
 #: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
+#: sales/create_recurrent_invoices.php:119 sales/credit_note_entry.php:157
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
@@ -2301,7 +2318,7 @@ msgstr ""
 
 #: admin/db/current_user.inc:97 includes/current_user.inc:88
 #: includes/ldap.current_user.inc:97 includes/ui/ui_controls.inc:190
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:843 includes/ui/ui_view.inc:844
 msgid "Back"
 msgstr ""
 
@@ -2369,6 +2386,7 @@ msgid "The language files folder "
 msgstr ""
 
 #: admin/db/maintenance_db.inc:389 admin/db/maintenance_db.inc.orig:387
+#: admin/db/connect_db2.inc:156
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2446,6 +2464,7 @@ msgstr ""
 #: manufacturing/includes/db/work_orders_db.inc:462
 #: sales/includes/db/sales_invoice_db.inc:205
 #: sales/includes/db/sales_invoice_db.inc.orig:208
+#: sales/includes/db/sales_invoice_db.inc:206
 msgid "Voided."
 msgstr ""
 
@@ -3022,6 +3041,9 @@ msgstr ""
 #: sales/customer_delivery.php:172 sales/customer_invoice.php:286
 #: sales/customer_payments.php:158 sales/customer_payments.php:165
 #: sales/customer_payments.php:246 sales/sales_order_entry.php:409
+#: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181
+#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
+#: sales/customer_invoice.php:319 sales/sales_order_entry.php:430
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3203,6 +3225,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:92
 #: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
 #: purchasing/supplier_payment.php:286 sales/customer_payments.php:380
+#: gl/bank_transfer.php:74
 msgid "Reference:"
 msgstr ""
 
@@ -3273,7 +3296,8 @@ msgstr ""
 #: sales/inquiry/customer_allocation_inquiry.php:149
 #: sales/inquiry/customer_inquiry.php:229
 #: sales/inquiry/customer_inquiry.php.orig:229
-#: sales/includes/ui/sales_order_ui.inc:596
+#: sales/includes/ui/sales_order_ui.inc:596 sales/customer_invoice.php:439
+#: sales/includes/ui/sales_order_ui.inc:600
 msgid "Due Date"
 msgstr ""
 
@@ -3390,7 +3414,10 @@ msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
 #: sales/includes/ui/sales_order_ui.inc:451
-#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:456 sales/customer_invoice.php:409
+#: sales/customer_invoice.php:447 sales/manage/customers.php:270
+#: sales/manage/customers.php:272 sales/includes/ui/sales_order_ui.inc:455
+#: sales/includes/ui/sales_order_ui.inc:460
 msgid "Dimension"
 msgstr ""
 
@@ -3417,6 +3444,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
 #: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
+#: sales/customer_credit_invoice.php:364 sales/customer_invoice.php:578
 msgid "Memo"
 msgstr ""
 
@@ -3439,6 +3467,7 @@ msgstr ""
 #: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
 #: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Monthly"
 msgstr ""
 
@@ -3610,12 +3639,14 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:409
+#: sales/customer_payments.php:409 gl/bank_transfer.php:82
+#: gl/bank_transfer.php:89
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:79 gl/bank_transfer.php:86
 #: purchasing/supplier_payment.php:299 sales/customer_payments.php:394
+#: gl/bank_transfer.php:83 gl/bank_transfer.php:90
 msgid "Bank Charge:"
 msgstr ""
 
@@ -3817,6 +3848,7 @@ msgstr ""
 #: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
 #: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
 #: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
+#: reporting/rep305.php:103
 msgid "Period"
 msgstr ""
 
@@ -3861,7 +3893,10 @@ msgstr ""
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:142 reporting/rep305.php:98
+#: reporting/rep305.php:122 reporting/rep305.php:178
+#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Total"
 msgstr ""
 
@@ -3931,6 +3966,7 @@ msgstr ""
 
 #: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
 #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
+#: includes/ui/ui_view.inc:673
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
@@ -4032,6 +4068,7 @@ msgstr ""
 #: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
 #: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Group"
 msgstr ""
 
@@ -4127,10 +4164,12 @@ msgid "Tax Inquiry"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Outputs"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Inputs"
 msgstr ""
 
@@ -4139,6 +4178,7 @@ msgid "Charged on sales"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Output Tax"
 msgstr ""
 
@@ -4147,6 +4187,7 @@ msgid "Paid on purchases"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Input Tax"
 msgstr ""
 
@@ -4155,6 +4196,7 @@ msgid "Net payable or collectible"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203
+#: reporting/rep709.php:207
 msgid "Total payable or refund"
 msgstr ""
 
@@ -4234,6 +4276,7 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:286
 #: sales/inquiry/sales_orders_view.php.orig:270
 #: sales/inquiry/sales_orders_view.php.orig:284
+#: sales/customer_credit_invoice.php:237 sales/customer_invoice.php:404
 msgid "Currency"
 msgstr ""
 
@@ -4782,7 +4825,7 @@ msgid "Posted"
 msgstr ""
 
 #: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468
+#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
 msgid "Tax Type"
 msgstr ""
 
@@ -5004,6 +5047,7 @@ msgstr ""
 #: sales/manage/recurrent_invoices.php:169
 #: sales/includes/ui/sales_credit_ui.inc:29
 #: sales/includes/ui/sales_order_ui.inc:278
+#: sales/includes/ui/sales_order_ui.inc:282
 msgid "Customer:"
 msgstr ""
 
@@ -5011,6 +5055,7 @@ msgstr ""
 #: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:285
+#: sales/includes/ui/sales_order_ui.inc:289
 msgid "Branch:"
 msgstr ""
 
@@ -5034,6 +5079,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:267
 #: sales/includes/ui/sales_credit_ui.inc:198
 #: sales/includes/ui/sales_order_ui.inc:203
+#: sales/includes/ui/sales_order_ui.inc:207
 msgid "Edit document line"
 msgstr ""
 
@@ -5046,6 +5092,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:269
 #: sales/includes/ui/sales_credit_ui.inc:200
 #: sales/includes/ui/sales_order_ui.inc:205
+#: sales/includes/ui/sales_order_ui.inc:209
 msgid "Remove line from document"
 msgstr ""
 
@@ -5057,6 +5104,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:443
 #: sales/includes/ui/sales_credit_ui.inc:294
 #: sales/includes/ui/sales_order_ui.inc:556
+#: sales/includes/ui/sales_order_ui.inc:560
 msgid "Confirm changes"
 msgstr ""
 
@@ -5068,6 +5116,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:445
 #: sales/includes/ui/sales_credit_ui.inc:296
 #: sales/includes/ui/sales_order_ui.inc:558
+#: sales/includes/ui/sales_order_ui.inc:562
 msgid "Cancel changes"
 msgstr ""
 
@@ -5079,6 +5128,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:451
 #: sales/includes/ui/sales_credit_ui.inc:302
 #: sales/includes/ui/sales_order_ui.inc:564
+#: sales/includes/ui/sales_order_ui.inc:568
 msgid "Add Item"
 msgstr ""
 
@@ -5089,6 +5139,7 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:452
 #: sales/includes/ui/sales_credit_ui.inc:303
 #: sales/includes/ui/sales_order_ui.inc:565
+#: sales/includes/ui/sales_order_ui.inc:569
 msgid "Add new item to document"
 msgstr ""
 
@@ -5800,6 +5851,7 @@ msgid "Sales Order"
 msgstr ""
 
 #: includes/sysnames.inc:41 sales/sales_order_entry.php:614
+#: sales/sales_order_entry.php:618
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5836,6 +5888,7 @@ msgid "CP"
 msgstr ""
 
 #: includes/sysnames.inc:54 sales/customer_invoice.php:471
+#: sales/customer_invoice.php:473
 msgid "DN"
 msgstr ""
 
@@ -5864,6 +5917,7 @@ msgid "SP"
 msgstr ""
 
 #: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95
+#: reporting/rep305.php:98
 msgid "GRN"
 msgstr ""
 
@@ -5945,6 +5999,8 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:278
 #: sales/inquiry/sales_orders_view.php.orig:262
 #: sales/inquiry/sales_orders_view.php.orig:276
+#: sales/create_recurrent_invoices.php:132
+#: sales/customer_credit_invoice.php:235 sales/customer_invoice.php:380
 msgid "Customer"
 msgstr ""
 
@@ -6224,7 +6280,7 @@ msgstr ""
 #: includes/system_tests.inc:193 includes/system_tests.inc:200
 #: includes/system_tests.inc:208 includes/system_tests.inc:225
 #: includes/system_tests.inc:340 includes/system_tests.inc:349
-#: includes/system_tests.inc:358
+#: includes/system_tests.inc:358 includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
@@ -6288,36 +6344,37 @@ msgstr ""
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:363
+#: includes/system_tests.inc:363 includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:375
+#: includes/system_tests.inc:375 includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: includes/system_tests.inc:385 includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:388
+#: includes/system_tests.inc:388 includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: includes/system_tests.inc:411 includes/system_tests.inc:420
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: includes/system_tests.inc:411 includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
 #: includes/system_tests.inc:411 includes/ui/view_package.php:37
 #: reporting/rep204.php:83 reporting/rep301.php:103
+#: includes/system_tests.inc:420
 msgid "Value"
 msgstr ""
 
@@ -6348,11 +6405,12 @@ msgstr ""
 #: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
 #: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
-#: sales/view/view_sales_order.php:85
+#: sales/view/view_sales_order.php:85 includes/system_tests.inc:420
+#: reporting/includes/pdf_report.inc:619
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:435
+#: includes/system_tests.inc:435 includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
@@ -6826,103 +6884,104 @@ msgstr ""
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:512
+#: includes/ui/ui_view.inc:512 includes/ui/ui_view.inc:513
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:516
+#: includes/ui/ui_view.inc:516 includes/ui/ui_view.inc:517
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:569
+#: includes/ui/ui_view.inc:569 includes/ui/ui_view.inc:570
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:597
+#: includes/ui/ui_view.inc:597 includes/ui/ui_view.inc:598
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
 #: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
+#: includes/ui/ui_view.inc:780
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "May"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:842 includes/ui/ui_view.inc:843
 msgid "W"
 msgstr ""
 
@@ -7134,6 +7193,7 @@ msgstr ""
 #: sales/customer_delivery.php:355 sales/customer_invoice.php:400
 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
 #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
+#: sales/customer_invoice.php:402
 msgid "Sales Type"
 msgstr ""
 
@@ -7147,6 +7207,7 @@ msgstr ""
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
+#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
 msgid "Price"
 msgstr ""
 
@@ -7276,12 +7337,15 @@ msgstr ""
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
 #: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
 #: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
+#: sales/sales_order_entry.php:496 sales/includes/ui/sales_order_ui.inc:179
 msgid "Quantity On Hand"
 msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:263
+#: sales/includes/db/sales_order_db.inc.orig:110
+#: sales/includes/db/sales_order_db.inc.orig:263
 msgid "Re-Order Level"
 msgstr ""
 
@@ -7362,6 +7426,8 @@ msgstr ""
 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Item Code"
 msgstr ""
 
@@ -7377,6 +7443,8 @@ msgstr ""
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Item Description"
 msgstr ""
 
@@ -7400,6 +7468,7 @@ msgstr ""
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Quantity"
 msgstr ""
 
@@ -7414,6 +7483,7 @@ msgstr ""
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Unit"
 msgstr ""
 
@@ -7558,7 +7628,8 @@ msgstr ""
 #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
 #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
 #: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467
+#: sales/customer_invoice.php:467 sales/customer_credit_invoice.php:280
+#: sales/customer_invoice.php:469
 msgid "Units"
 msgstr ""
 
@@ -7611,6 +7682,7 @@ msgid "Foreign Item Codes"
 msgstr ""
 
 #: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
+#: sales/sales_order_entry.php:663
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7792,12 +7864,13 @@ msgstr ""
 
 #: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
 #: sales/manage/customer_branches.php:322 sales/manage/customers.php:342
-#: sales/manage/customers.php.orig:339
+#: sales/manage/customers.php.orig:339 sales/manage/customers.php:344
 msgid "&General settings"
 msgstr ""
 
 #: inventory/manage/items.php:455 purchasing/manage/suppliers.php:308
 #: sales/manage/customers.php:344 sales/manage/customers.php.orig:341
+#: sales/manage/customers.php:346
 msgid "&Transactions"
 msgstr ""
 
@@ -8774,6 +8847,7 @@ msgstr ""
 #: purchasing/includes/db/po_db.inc:116
 #: sales/includes/db/cust_trans_db.inc:111
 #: sales/includes/db/sales_order_db.inc:249
+#: sales/includes/db/sales_order_db.inc.orig:249
 msgid "Updated."
 msgstr ""
 
@@ -8873,6 +8947,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:130
 #: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
 #: sales/manage/customers.php:292 sales/manage/customers.php.orig:289
+#: sales/manage/customers.php:294
 msgid "Tax Group:"
 msgstr ""
 
@@ -8887,6 +8962,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:156
 #: sales/customer_credit_invoice.php:332
 #: sales/includes/ui/sales_credit_ui.inc:233
+#: sales/customer_credit_invoice.php:330
 msgid "Credit Note Total"
 msgstr ""
 
@@ -8924,6 +9000,7 @@ msgid "Add to Credit Note"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
+#: sales/customer_invoice.php:524
 msgid "Remove"
 msgstr ""
 
@@ -8996,12 +9073,14 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price after Tax"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price before Tax"
 msgstr ""
 
@@ -9034,14 +9113,17 @@ msgid "Supplier Currency:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
+#: sales/sales_order_entry.php:687
 msgid "Order Date:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
+#: sales/sales_order_entry.php:674
 msgid "Delivery Date:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
+#: sales/sales_order_entry.php:668
 msgid "Invoice Date:"
 msgstr ""
 
@@ -9077,6 +9159,7 @@ msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:611
+#: sales/includes/ui/sales_order_ui.inc:615
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -9092,6 +9175,8 @@ msgstr ""
 #: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
 #: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:229
+#: sales/customer_credit_invoice.php:322 sales/customer_invoice.php:565
+#: sales/includes/ui/sales_order_ui.inc:233
 msgid "Sub-total"
 msgstr ""
 
@@ -9099,6 +9184,7 @@ msgstr ""
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
 #: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
 #: sales/includes/ui/sales_order_ui.inc:236
+#: sales/includes/ui/sales_order_ui.inc:240
 msgid "Amount Total"
 msgstr ""
 
@@ -9106,6 +9192,7 @@ msgstr ""
 #: purchasing/allocations/supplier_allocate.php:64
 #: sales/allocations/customer_allocate.php:63
 #: sales/includes/ui/sales_order_ui.inc:237
+#: sales/includes/ui/sales_order_ui.inc:241
 msgid "Refresh"
 msgstr ""
 
@@ -9225,6 +9312,7 @@ msgid "Enter a new purchase order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
+#: sales/sales_order_entry.php:468
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -9304,6 +9392,7 @@ msgid ""
 msgstr ""
 
 #: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:691
 msgid "Place Order"
 msgstr ""
 
@@ -9312,6 +9401,7 @@ msgid "Update Order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
+#: sales/sales_order_entry.php:690
 msgid "Cancel Order"
 msgstr ""
 
@@ -9328,6 +9418,7 @@ msgid "Cancel GRN"
 msgstr ""
 
 #: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
+#: sales/customer_invoice.php:584
 msgid "Process Invoice"
 msgstr ""
 
@@ -9336,6 +9427,7 @@ msgid "Update Invoice"
 msgstr ""
 
 #: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:671
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9715,6 +9807,7 @@ msgstr ""
 #: purchasing/view/view_supp_credit.php:47
 #: purchasing/view/view_supp_invoice.php:50
 #: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
+#: sales/customer_credit_invoice.php:268
 msgid "Invoice Date"
 msgstr ""
 
@@ -9761,7 +9854,7 @@ msgstr ""
 
 #: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
 #: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
-#: sales/view/view_sales_order.php:202
+#: sales/view/view_sales_order.php:202 sales/customer_invoice.php:470
 msgid "Discount"
 msgstr ""
 
@@ -9804,12 +9897,12 @@ msgid "Bank Name/Account:"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:110 sales/manage/customers.php:263
-#: sales/manage/customers.php.orig:260
+#: sales/manage/customers.php.orig:260 sales/manage/customers.php:264
 msgid "Credit Limit:"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:111 sales/manage/customers.php:265
-#: sales/manage/customers.php.orig:262
+#: sales/manage/customers.php.orig:262 sales/manage/customers.php:266
 msgid "Payment Terms:"
 msgstr ""
 
@@ -9856,6 +9949,7 @@ msgstr ""
 
 #: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
 #: sales/manage/customers.php:286 sales/manage/customers.php.orig:283
+#: sales/manage/customers.php:287
 msgid "General Notes:"
 msgstr ""
 
@@ -9930,6 +10024,7 @@ msgstr ""
 
 #: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
 #: sales/manage/customers.php:343 sales/manage/customers.php.orig:340
+#: sales/manage/customers.php:345
 msgid "&Contacts"
 msgstr ""
 
@@ -10030,6 +10125,7 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php.orig:75
 #: sales/inquiry/customer_inquiry.php.orig:76
 #: sales/inquiry/customer_inquiry.php.orig:77
+#: sales/create_recurrent_invoices.php:132
 msgid "Days"
 msgstr ""
 
@@ -10177,7 +10273,7 @@ msgstr ""
 #: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:167
 #: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
 #: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191
-#: reporting/rep305.php:181
+#: reporting/rep305.php:181 reporting/rep305.php:183
 msgid "Grand Total"
 msgstr ""
 
@@ -10342,6 +10438,9 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:279
 #: sales/inquiry/sales_orders_view.php.orig:263
 #: sales/inquiry/sales_orders_view.php.orig:277
+#: sales/create_recurrent_invoices.php:132
+#: sales/customer_credit_invoice.php:236 sales/customer_invoice.php:381
+#: sales/manage/customers.php:290
 msgid "Branch"
 msgstr ""
 
@@ -10362,7 +10461,7 @@ msgid "Loc"
 msgstr ""
 
 #: reporting/rep105.php:112 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467
+#: sales/customer_invoice.php:467 sales/customer_invoice.php:469
 msgid "Invoiced"
 msgstr ""
 
@@ -10613,6 +10712,7 @@ msgid "Shortage"
 msgstr ""
 
 #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
+#: reporting/rep305.php:98
 msgid "Stock ID"
 msgstr ""
 
@@ -10628,12 +10728,13 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:112 reporting/rep305.php:95
+#: reporting/rep304.php:112 reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Qty"
 msgstr ""
 
 #: reporting/rep304.php:112 sales/manage/customer_branches.php:240
 #: sales/manage/customers.php:259 sales/manage/customers.php.orig:256
+#: sales/manage/customers.php:260
 msgid "Sales"
 msgstr ""
 
@@ -10649,23 +10750,23 @@ msgstr ""
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:102
+#: reporting/rep305.php:102 reporting/rep305.php:105
 msgid "GRN Valuation Report"
 msgstr ""
 
@@ -10770,11 +10871,11 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep709.php:172
+#: reporting/rep709.php:172 reporting/rep709.php:176
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:172
+#: reporting/rep709.php:172 reporting/rep709.php:176
 msgid "Net Tax"
 msgstr ""
 
@@ -11120,6 +11221,8 @@ msgstr ""
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/customer_credit_invoice.php:281
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Discount %"
 msgstr ""
 
@@ -11162,6 +11265,7 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:282
 #: sales/inquiry/sales_orders_view.php.orig:280
 #: sales/includes/ui/sales_order_ui.inc:606
+#: sales/includes/ui/sales_order_ui.inc:610
 msgid "Valid until"
 msgstr ""
 
@@ -11234,6 +11338,7 @@ msgid "DueDate"
 msgstr ""
 
 #: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1013
+#: reporting/includes/pdf_report.inc:1014
 msgid "You can pay through"
 msgstr ""
 
@@ -11261,12 +11366,12 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:600
+#: reporting/includes/pdf_report.inc:600 reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:609
+#: reporting/includes/pdf_report.inc:609 reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
@@ -11280,47 +11385,57 @@ msgstr ""
 
 #: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
 #: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
+#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:583
+#: reporting/includes/pdf_report.inc:583 reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:980
+#: reporting/includes/pdf_report.inc:980 reporting/includes/pdf_report.inc:981
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:999
+#: reporting/includes/pdf_report.inc:1000
 msgid "Dear"
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1000
+#: reporting/includes/pdf_report.inc:1001
 msgid "Attached you will find "
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1016
+#: reporting/includes/pdf_report.inc:1017
 msgid "Kindest regards"
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1028
+#: reporting/includes/pdf_report.inc:1029
 msgid "There is no contact email set for this document type."
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1031
+#: reporting/includes/pdf_report.inc:1032
 msgid "Sending document by email failed"
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1031
 #: reporting/includes/pdf_report.inc:1034
+#: reporting/includes/pdf_report.inc:1032
+#: reporting/includes/pdf_report.inc:1035
 msgid "Email:"
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1034
+#: reporting/includes/pdf_report.inc:1035
 msgid "has been sent by email to destination."
 msgstr ""
 
 #: reporting/includes/pdf_report.inc:1064
+#: reporting/includes/pdf_report.inc:1065
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -11444,59 +11559,71 @@ msgid "No Users Filter"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:24
+#: sales/create_recurrent_invoices.php:26
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:40
+#: sales/create_recurrent_invoices.php:42
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:97
+#: sales/create_recurrent_invoices.php:108
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:113
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:104
+#: sales/create_recurrent_invoices.php:115
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Template No"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Begin"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "End"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
 #: sales/manage/recurrent_invoices.php:185
+#: sales/create_recurrent_invoices.php:132
 msgid "Last Created"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:156
+#: sales/create_recurrent_invoices.php:173
 msgid "Create Invoices"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:164
+#: sales/create_recurrent_invoices.php:181
 msgid "Marked items are due."
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:166
+#: sales/create_recurrent_invoices.php:183
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -11506,6 +11633,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
+#: sales/sales_order_entry.php:665
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11537,39 +11665,40 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:157
+#: sales/credit_note_entry.php:157 sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:174
+#: sales/credit_note_entry.php:174 sales/credit_note_entry.php:170
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: sales/credit_note_entry.php:175
+#: sales/credit_note_entry.php:175 sales/credit_note_entry.php:171
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: sales/credit_note_entry.php:195
+#: sales/credit_note_entry.php:195 sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:200
+#: sales/credit_note_entry.php:200 sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:205
+#: sales/credit_note_entry.php:205 sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:273
+#: sales/credit_note_entry.php:273 sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
 #: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
+#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
@@ -11602,57 +11731,61 @@ msgstr ""
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:114
+#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:109
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
 #: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
+#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:139
+#: sales/customer_credit_invoice.php:139 sales/customer_credit_invoice.php:134
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:251
+#: sales/customer_credit_invoice.php:251 sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:272
+#: sales/customer_credit_invoice.php:272 sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:282
+#: sales/customer_credit_invoice.php:282 sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:283
+#: sales/customer_credit_invoice.php:283 sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:317
+#: sales/customer_credit_invoice.php:317 sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
 #: sales/customer_credit_invoice.php:350
 #: sales/includes/ui/sales_credit_ui.inc:323
+#: sales/customer_credit_invoice.php:348
 msgid "Credit Note Type"
 msgstr ""
 
 #: sales/customer_credit_invoice.php:358
 #: sales/includes/ui/sales_credit_ui.inc:331
+#: sales/customer_credit_invoice.php:356
 msgid "Items Returned to Location"
 msgstr ""
 
 #: sales/customer_credit_invoice.php:363
 #: sales/includes/ui/sales_credit_ui.inc:336
+#: sales/customer_credit_invoice.php:361
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:382
+#: sales/customer_credit_invoice.php:382 sales/customer_credit_invoice.php:380
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -11772,15 +11905,17 @@ msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 #: sales/customer_delivery.php:182 sales/customer_invoice.php:297
+#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:188
+#: sales/customer_delivery.php:188 sales/customer_delivery.php:182
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 #: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
-#: sales/includes/ui/sales_order_ui.inc:244
+#: sales/includes/ui/sales_order_ui.inc:244 sales/customer_delivery.php:285
+#: sales/sales_order_entry.php:494 sales/includes/ui/sales_order_ui.inc:248
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
@@ -11800,7 +11935,9 @@ msgstr ""
 
 #: sales/customer_delivery.php:421 sales/customer_invoice.php:457
 #: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368
+#: sales/includes/ui/sales_order_ui.inc:368 sales/customer_invoice.php:459
+#: sales/includes/ui/sales_order_ui.inc:84
+#: sales/includes/ui/sales_order_ui.inc:372
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
@@ -11815,15 +11952,18 @@ msgid "Max. delivery"
 msgstr ""
 
 #: sales/customer_delivery.php:432 sales/customer_invoice.php:467
-#: sales/includes/ui/sales_order_ui.inc:141
+#: sales/includes/ui/sales_order_ui.inc:141 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Delivered"
 msgstr ""
 
 #: sales/customer_delivery.php:493 sales/customer_invoice.php:552
+#: sales/customer_invoice.php:554
 msgid "Shipping Cost"
 msgstr ""
 
 #: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
+#: sales/includes/ui/sales_order_ui.inc:246
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
@@ -11833,6 +11973,7 @@ msgid "Action For Balance"
 msgstr ""
 
 #: sales/customer_delivery.php:524 sales/customer_invoice.php:581
+#: sales/customer_invoice.php:583
 msgid "Refresh document page"
 msgstr ""
 
@@ -11841,7 +11982,8 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:526 sales/customer_invoice.php:583
-#: sales/sales_order_entry.php:709
+#: sales/sales_order_entry.php:709 sales/customer_invoice.php:585
+#: sales/sales_order_entry.php:713
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11927,6 +12069,7 @@ msgid "Select Delivery to Invoice"
 msgstr ""
 
 #: sales/customer_invoice.php:153 sales/customer_invoice.php:308
+#: sales/customer_invoice.php:302
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
@@ -11944,32 +12087,33 @@ msgstr ""
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:303
+#: sales/customer_invoice.php:303 sales/customer_invoice.php:297
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:383
+#: sales/customer_invoice.php:383 sales/customer_invoice.php:385
 msgid "Payment terms:"
 msgstr ""
 
 #: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409
+#: sales/includes/ui/sales_order_ui.inc:409 sales/customer_invoice.php:388
+#: sales/includes/ui/sales_order_ui.inc:413
 msgid "Payment:"
 msgstr ""
 
-#: sales/customer_invoice.php:463
+#: sales/customer_invoice.php:463 sales/customer_invoice.php:465
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:468
+#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:476
+#: sales/customer_invoice.php:476 sales/customer_invoice.php:478
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:570
+#: sales/customer_invoice.php:570 sales/customer_invoice.php:572
 msgid "Invoice Total"
 msgstr ""
 
@@ -12225,143 +12369,143 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:469
+#: sales/sales_order_entry.php:469 sales/sales_order_entry.php:473
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: sales/sales_order_entry.php:473
+#: sales/sales_order_entry.php:473 sales/sales_order_entry.php:477
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:480
+#: sales/sales_order_entry.php:480 sales/sales_order_entry.php:484
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:511
+#: sales/sales_order_entry.php:511 sales/sales_order_entry.php:515
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:536
+#: sales/sales_order_entry.php:536 sales/sales_order_entry.php:540
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:565
+#: sales/sales_order_entry.php:565 sales/sales_order_entry.php:569
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:566
+#: sales/sales_order_entry.php:566 sales/sales_order_entry.php:570
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:569
+#: sales/sales_order_entry.php:569 sales/sales_order_entry.php:573
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:570
+#: sales/sales_order_entry.php:570 sales/sales_order_entry.php:574
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:575
+#: sales/sales_order_entry.php:575 sales/sales_order_entry.php:579
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:580
+#: sales/sales_order_entry.php:580 sales/sales_order_entry.php:584
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:581
+#: sales/sales_order_entry.php:581 sales/sales_order_entry.php:585
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:585
+#: sales/sales_order_entry.php:585 sales/sales_order_entry.php:589
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:586
+#: sales/sales_order_entry.php:586 sales/sales_order_entry.php:590
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:665
+#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:669
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:666
+#: sales/sales_order_entry.php:666 sales/sales_order_entry.php:670
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:668
+#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:672
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:671
+#: sales/sales_order_entry.php:671 sales/sales_order_entry.php:675
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:672 sales/sales_order_entry.php:676
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:673 sales/sales_order_entry.php:677
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:674
+#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:678
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:676
+#: sales/sales_order_entry.php:676 sales/sales_order_entry.php:680
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:677 sales/sales_order_entry.php:681
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:678 sales/sales_order_entry.php:682
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:679 sales/sales_order_entry.php:683
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:680 sales/sales_order_entry.php:684
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:681
+#: sales/sales_order_entry.php:681 sales/sales_order_entry.php:685
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:684
+#: sales/sales_order_entry.php:684 sales/sales_order_entry.php:688
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:685
+#: sales/sales_order_entry.php:685 sales/sales_order_entry.php:689
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:688
+#: sales/sales_order_entry.php:688 sales/sales_order_entry.php:692
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:710 sales/sales_order_entry.php:714
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:717
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:717 sales/sales_order_entry.php:721
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -12386,7 +12530,7 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php:48
 #: sales/inquiry/customer_inquiry.php.orig:48
 #: sales/inquiry/sales_orders_view.php:243
-#: sales/inquiry/sales_orders_view.php.orig:241
+#: sales/inquiry/sales_orders_view.php.orig:241 sales/manage/customers.php:324
 msgid "Select a customer: "
 msgstr ""
 
@@ -12509,12 +12653,12 @@ msgid "Branch Short Name:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:241 sales/manage/customers.php:290
-#: sales/manage/customers.php.orig:287
+#: sales/manage/customers.php.orig:287 sales/manage/customers.php:256
 msgid "Sales Person:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:242 sales/manage/customers.php:291
-#: sales/manage/customers.php.orig:288
+#: sales/manage/customers.php.orig:288 sales/manage/customers.php:293
 msgid "Sales Area:"
 msgstr ""
 
@@ -12523,11 +12667,11 @@ msgstr ""
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244
+#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245
+#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -12570,6 +12714,7 @@ msgstr ""
 
 #: sales/manage/customer_branches.php:319
 #: sales/includes/ui/sales_order_ui.inc:299
+#: sales/includes/ui/sales_order_ui.inc:303
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -12661,64 +12806,79 @@ msgid "Customer status:"
 msgstr ""
 
 #: sales/manage/customers.php:261 sales/manage/customers.php.orig:258
+#: sales/manage/customers.php:262
 msgid "Discount Percent:"
 msgstr ""
 
 #: sales/manage/customers.php:262 sales/manage/customers.php.orig:259
+#: sales/manage/customers.php:263
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
 #: sales/manage/customers.php:266 sales/manage/customers.php.orig:263
+#: sales/manage/customers.php:267
 msgid "Credit Status:"
 msgstr ""
 
 #: sales/manage/customers.php:279 sales/manage/customers.php.orig:276
+#: sales/manage/customers.php:280
 msgid "Customer branches"
 msgstr ""
 
 #: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
+#: sales/manage/customers.php:282
 msgid "Select or &Add"
 msgstr ""
 
 #: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
+#: sales/manage/customers.php:282
 msgid "&Add or Edit "
 msgstr ""
 
 #: sales/manage/customers.php:299 sales/manage/customers.php.orig:296
+#: sales/manage/customers.php:301
 msgid "Add New Customer"
 msgstr ""
 
 #: sales/manage/customers.php:303 sales/manage/customers.php.orig:300
+#: sales/manage/customers.php:305
 msgid "Update Customer"
 msgstr ""
 
 #: sales/manage/customers.php:304 sales/manage/customers.php.orig:301
+#: sales/manage/customers.php:306
 msgid "Update customer data"
 msgstr ""
 
 #: sales/manage/customers.php:305 sales/manage/customers.php.orig:302
+#: sales/manage/customers.php:307
 msgid "Select this customer and return to document entry."
 msgstr ""
 
 #: sales/manage/customers.php:306 sales/manage/customers.php.orig:303
+#: sales/manage/customers.php:308
 msgid "Delete Customer"
 msgstr ""
 
 #: sales/manage/customers.php:307 sales/manage/customers.php.orig:304
+#: sales/manage/customers.php:309
 msgid "Delete customer data if have been never used"
 msgstr ""
 
 #: sales/manage/customers.php:314 sales/manage/customers.php.orig:311
+#: sales/manage/customers.php:316
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
 #: sales/manage/customers.php:323 sales/manage/customers.php.orig:320
+#: sales/manage/customers.php:325
 msgid "New customer"
 msgstr ""
 
 #: sales/manage/customers.php:345 sales/manage/customers.php.orig:342
+#: sales/manage/customers.php:347
 msgid "Sales &Orders"
 msgstr ""
 
@@ -13285,7 +13445,7 @@ msgstr ""
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:347
+#: sales/includes/cart_class.inc:347 sales/includes/cart_class.inc:352
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -13305,40 +13465,51 @@ msgstr ""
 
 #: sales/includes/db/sales_invoice_db.inc:173
 #: sales/includes/db/sales_invoice_db.inc.orig:176
+#: sales/includes/db/sales_invoice_db.inc:174
 msgid "Cash invoice"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:107
 #: sales/includes/db/sales_order_db.inc:259
+#: sales/includes/db/sales_order_db.inc.orig:107
+#: sales/includes/db/sales_order_db.inc.orig:259
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:264
+#: sales/includes/db/sales_order_db.inc.orig:110
+#: sales/includes/db/sales_order_db.inc.orig:264
 msgid "Below"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:111
 #: sales/includes/db/sales_order_db.inc:265
+#: sales/includes/db/sales_order_db.inc.orig:111
+#: sales/includes/db/sales_order_db.inc.orig:265
 msgid "Please reorder"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:139
+#: sales/includes/db/sales_order_db.inc.orig:139
 msgid "Deleted."
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:94
 #: sales/includes/ui/sales_order_ui.inc:379
+#: sales/includes/ui/sales_order_ui.inc:383
 msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:112
 #: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:643
 msgid "Shipping Company:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:114
 #: sales/includes/ui/sales_order_ui.inc:386
+#: sales/includes/ui/sales_order_ui.inc:390
 msgid "Customer Discount:"
 msgstr ""
 
@@ -13347,103 +13518,129 @@ msgid "This item is already on this document. You have been warned."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:104
+#: sales/includes/ui/sales_order_ui.inc:106
 msgid ""
 "The selected customer and branch are not valid, or the customer does not "
 "have any branches."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:224
+#: sales/includes/ui/sales_order_ui.inc:228
 msgid "Shipping Charge"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:297
+#: sales/includes/ui/sales_order_ui.inc:301
 msgid "No customer found for entered text."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:323
+#: sales/includes/ui/sales_order_ui.inc:327
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:373
+#: sales/includes/ui/sales_order_ui.inc:377
 msgid "Reference number unique for this document type"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:413
 #: sales/includes/ui/sales_order_ui.inc:415
+#: sales/includes/ui/sales_order_ui.inc:417
+#: sales/includes/ui/sales_order_ui.inc:419
 msgid "Price List:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:432
+#: sales/includes/ui/sales_order_ui.inc:436
 msgid "Date of order receive"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:582
+#: sales/includes/ui/sales_order_ui.inc:586
 msgid "Cash payment"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:585
 #: sales/includes/ui/sales_order_ui.inc:617
+#: sales/includes/ui/sales_order_ui.inc:589
+#: sales/includes/ui/sales_order_ui.inc:621
 msgid "Deliver from Location:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:592
 msgid "Cash account:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:595
+#: sales/includes/ui/sales_order_ui.inc:599
 msgid "Delivery Details"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:604
 msgid "Invoice Delivery Details"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:601
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Invoice before"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:605
+#: sales/includes/ui/sales_order_ui.inc:609
 msgid "Quotation Delivery Details"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:614
 msgid "Order Delivery Details"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:627
 msgid "Enter requested day of delivery"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:628
 msgid "Enter Valid until Date"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Deliver To:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:626
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:637
 msgid "Contact Phone Number:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:638
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:639
 msgid "Customer Reference:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:636
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -13671,3 +13868,15 @@ msgstr ""
 #: sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: admin/attachments.php:84
+msgid "No transaction has been selected."
+msgstr ""
+
+#: admin/attachments.php:86
+msgid "Select attachment file."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:127
+msgid "Invoice date:"
+msgstr ""