Skip to content
Permalink
Browse files

Synch with upstream and stable repo

  • Loading branch information...
apmuthu committed Mar 25, 2015
1 parent 89e367a commit 637b97953329ad943ae2ff312ac38f4ebebd5782
Showing with 4,397 additions and 3,084 deletions.
  1. +255 −1 core/CHANGELOG.txt
  2. +5 −5 core/access/login.php
  3. +1 −1 core/access/logout.php
  4. +4 −4 core/access/password_reset.php
  5. +1 −1 core/admin/backups.php
  6. +0 −14 core/admin/company_preferences.php
  7. +1 −1 core/admin/create_coy.php
  8. +1 −1 core/admin/crm_categories.php
  9. +2 −2 core/admin/db/attachments_db.inc
  10. +1 −12 core/admin/db/company_db.inc
  11. +14 −12 core/admin/db/fiscalyears_db.inc
  12. +23 −23 core/admin/db/transactions_db.inc
  13. +22 −19 core/admin/db/voiding_db.inc
  14. +0 −49 core/admin/gl_setup.php
  15. +3 −1 core/admin/includes/fa_patch.class.inc
  16. +1 −1 core/admin/security_roles.php
  17. +3 −3 core/admin/void_transaction.php
  18. +31 −20 core/gl/accruals.php
  19. +1 −1 core/gl/gl_bank.php
  20. +270 −40 core/gl/gl_journal.php
  21. +12 −0 core/gl/includes/db/gl_db_accounts.inc
  22. +10 −10 core/gl/includes/db/gl_db_bank_accounts.inc
  23. +38 −9 core/gl/includes/db/gl_db_banking.inc
  24. +138 −182 core/gl/includes/db/gl_db_trans.inc
  25. +166 −0 core/gl/includes/db/gl_journal.inc
  26. +1 −0 core/gl/includes/gl_db.inc
  27. +2 −2 core/gl/includes/ui/gl_bank_ui.inc
  28. +54 −44 core/gl/includes/ui/gl_journal_ui.inc
  29. +2 −2 core/gl/inquiry/balance_sheet.php
  30. +23 −8 core/gl/inquiry/journal_inquiry.php
  31. +1 −1 core/gl/inquiry/profit_loss.php
  32. +21 −11 core/gl/manage/gl_quick_entries.php
  33. +1 −1 core/gl/view/bank_transfer_view.php
  34. +2 −2 core/gl/view/gl_deposit_view.php
  35. +2 −2 core/gl/view/gl_payment_view.php
  36. +48 −20 core/gl/view/gl_trans_view.php
  37. +15 −7 core/includes/db/audit_trail_db.inc
  38. +2 −1 core/includes/db/connect_db_mysql.inc
  39. +2 −2 core/includes/db/connect_db_mysqli.inc
  40. +28 −19 core/includes/db/inventory_db.inc
  41. +1 −1 core/includes/page/footer.inc
  42. +3 −3 core/includes/page/header.inc
  43. +4 −4 core/includes/prefs/sysprefs.inc
  44. +1 −1 core/includes/session.inc
  45. +1 −1 core/includes/system_tests.inc
  46. +3 −0 core/includes/types.inc
  47. +43 −22 core/includes/ui/allocation_cart.inc
  48. +1 −1 core/includes/ui/contacts_view.inc
  49. +2 −2 core/includes/ui/db_pager_view.inc
  50. +262 −48 core/includes/ui/items_cart.inc
  51. +53 −17 core/includes/ui/ui_controls.inc
  52. +20 −11 core/includes/ui/ui_input.inc
  53. +25 −1 core/includes/ui/ui_lists.inc
  54. +5 −0 core/includes/ui/ui_msgs.inc
  55. +80 −44 core/includes/ui/ui_view.inc
  56. +1 −1 core/install/index.php
  57. +1 −1 core/inventory/adjustments.php
  58. +13 −7 core/inventory/includes/db/items_trans_db.inc
  59. +2 −2 core/inventory/includes/item_adjustments_ui.inc
  60. +2 −2 core/inventory/includes/stock_transfers_ui.inc
  61. +1 −1 core/inventory/manage/item_categories.php
  62. +1 −1 core/inventory/manage/item_codes.php
  63. +1 −1 core/inventory/manage/item_units.php
  64. +1 −1 core/inventory/manage/movement_types.php
  65. +1 −1 core/inventory/manage/sales_kits.php
  66. +1 −1 core/inventory/prices.php
  67. +1 −1 core/inventory/purchasing_data.php
  68. +1 −1 core/inventory/reorder_level.php
  69. +1 −1 core/inventory/transfers.php
  70. +2 −2 core/inventory/view/view_adjustment.php
  71. +2 −2 core/inventory/view/view_transfer.php
  72. +1,928 −1,879 core/lang/new_language_template/LC_MESSAGES/empty.po
  73. +9 −5 core/manufacturing/includes/db/work_order_costing_db.inc
  74. +8 −3 core/manufacturing/includes/db/work_orders_db.inc
  75. +3 −3 core/manufacturing/includes/manufacturing_ui.inc
  76. +1 −1 core/manufacturing/includes/work_order_issue_ui.inc
  77. +1 −1 core/manufacturing/manage/bom_edit.php
  78. +1 −1 core/manufacturing/manage/work_centres.php
  79. +8 −2 core/manufacturing/search_work_orders.php
  80. +1 −1 core/manufacturing/work_order_issue.php
  81. +2 −2 core/purchasing/allocations/supplier_allocation_main.php
  82. +11 −12 core/purchasing/includes/db/invoice_db.inc
  83. +9 −3 core/purchasing/includes/db/po_db.inc
  84. +9 −7 core/purchasing/includes/db/supp_trans_db.inc
  85. +58 −43 core/purchasing/includes/db/suppalloc_db.inc
  86. +10 −18 core/purchasing/includes/db/suppliers_db.inc
  87. +3 −6 core/purchasing/includes/po_class.inc
  88. +4 −10 core/purchasing/includes/purchasing_db.inc
  89. +1 −3 core/purchasing/includes/supp_trans_class.inc
  90. +2 −2 core/purchasing/includes/ui/grn_ui.inc
  91. +7 −15 core/purchasing/includes/ui/invoice_ui.inc
  92. +3 −14 core/purchasing/includes/ui/po_ui.inc
  93. +21 −12 core/purchasing/inquiry/supplier_allocation_inquiry.php
  94. +1 −1 core/purchasing/inquiry/supplier_inquiry.php
  95. +2 −5 core/purchasing/manage/suppliers.php
  96. +0 −5 core/purchasing/po_entry_items.php
  97. +1 −1 core/purchasing/po_receive_items.php
  98. +0 −4 core/purchasing/supplier_invoice.php
  99. +5 −5 core/purchasing/supplier_payment.php
  100. +1 −1 core/purchasing/view/view_grn.php
  101. +2 −2 core/purchasing/view/view_po.php
  102. +3 −3 core/purchasing/view/view_supp_credit.php
  103. +3 −3 core/purchasing/view/view_supp_invoice.php
  104. +1 −1 core/purchasing/view/view_supp_payment.php
  105. +3 −2 core/reporting/includes/header2.inc
  106. +3 −1 core/reporting/includes/reporting.inc
  107. +1 −1 core/reporting/includes/reports_classes.inc
  108. +35 −20 core/reporting/rep101.php
  109. +14 −8 core/reporting/rep102.php
  110. +4 −1 core/reporting/rep107.php
  111. +3 −0 core/reporting/rep108.php
  112. +3 −0 core/reporting/rep109.php
  113. +3 −0 core/reporting/rep111.php
  114. +3 −0 core/reporting/rep112.php
  115. +3 −0 core/reporting/rep113.php
  116. +3 −3 core/reporting/rep202.php
  117. +5 −2 core/reporting/rep209.php
  118. +3 −0 core/reporting/rep210.php
  119. +4 −4 core/reporting/rep709.php
  120. +1 −1 core/sales/create_recurrent_invoices.php
  121. +1 −1 core/sales/credit_note_entry.php
  122. +5 −4 core/sales/customer_credit_invoice.php
  123. +4 −4 core/sales/customer_delivery.php
  124. +5 −4 core/sales/customer_invoice.php
  125. +2 −2 core/sales/customer_payments.php
  126. +5 −0 core/sales/includes/cart_class.inc
  127. +10 −0 core/sales/includes/db/branches_db.inc
  128. +27 −8 core/sales/includes/db/cust_trans_db.inc
  129. +81 −52 core/sales/includes/db/custalloc_db.inc
  130. +10 −9 core/sales/includes/db/customers_db.inc
  131. +1 −1 core/sales/includes/db/sales_credit_db.inc
  132. +1 −1 core/sales/includes/db/sales_delivery_db.inc
  133. +10 −5 core/sales/includes/db/sales_invoice_db.inc
  134. +2 −2 core/sales/includes/ui/sales_credit_ui.inc
  135. +7 −4 core/sales/includes/ui/sales_order_ui.inc
  136. +5 −3 core/sales/inquiry/customer_allocation_inquiry.php
  137. +5 −4 core/sales/inquiry/customer_inquiry.php
  138. +1 −1 core/sales/manage/sales_areas.php
  139. +1 −1 core/sales/manage/sales_groups.php
  140. +1 −1 core/sales/manage/sales_people.php
  141. +1 −1 core/sales/manage/sales_types.php
  142. +1 −1 core/sales/sales_order_entry.php
  143. +6 −6 core/sales/view/view_credit.php
  144. +7 −7 core/sales/view/view_dispatch.php
  145. +7 −7 core/sales/view/view_invoice.php
  146. +1 −1 core/sales/view/view_receipt.php
  147. +3 −3 core/sales/view/view_sales_order.php
  148. +74 −3 core/sql/alter2.4.sql
  149. +57 −33 core/sql/en_US-demo.sql
  150. +37 −13 core/sql/en_US-new.sql
  151. +1 −1 core/taxes/item_tax_types.php
  152. +21 −27 core/themes/aqua/renderer.php
  153. +28 −27 core/themes/cool/renderer.php
  154. +16 −14 core/themes/default/renderer.php
@@ -1,7 +1,7 @@
/**
* @version $Id$
* @package FrontAccounting
* @copyright (C) 2005 - 2011 FrontAccounting, LLC
* @copyright (C) 2005 - 2014 FrontAccounting, LLC
* @license http://www.gnu.org/copyleft/gpl-3.0.html GNU/GPL
* FrontAccounting is Free Software
*/
@@ -10,6 +10,260 @@
------------
This is a changelog for FrontAccounting All releases.

2015-03-23 16:27 +0100 Joe
(3456) Release 2.3.23
version.php

2015-03-14 16:05 +0100 Janusz Dobrowolski
(3455) Additional cleanups in standard themes.
themes/aqua/renderer.php
themes/cool/renderer.php
themes/default/renderer.php

2015-03-12 13:00 +0100 Janusz Dobrowolski
(3454) Fixed many issues in output HTML code according to HTML 4.01 Transitional format.
access/login.php
access/logout.php
access/password_reset.php
admin/create_coy.php
admin/crm_categories.php
admin/db/attachments_db.inc
admin/inst_upgrade.php
admin/security_roles.php
gl/gl_bank.php
gl/gl_journal.php
gl/includes/ui/gl_bank_ui.inc
gl/includes/ui/gl_journal_ui.inc
gl/inquiry/balance_sheet.php
gl/inquiry/profit_loss.php
gl/view/bank_transfer_view.php
gl/view/gl_deposit_view.php
gl/view/gl_payment_view.php
gl/view/gl_trans_view.php
includes/page/footer.inc
includes/page/header.inc
includes/system_tests.inc
includes/ui/allocation_cart.inc
includes/ui/contacts_view.inc
includes/ui/db_pager_view.inc
includes/ui/ui_controls.inc
includes/ui/ui_input.inc
includes/ui/ui_lists.inc
includes/ui/ui_msgs.inc
includes/ui/ui_view.inc
includes/ui/view_package.php
install/index.php
inventory/adjustments.php
inventory/includes/item_adjustments_ui.inc
inventory/includes/stock_transfers_ui.inc
inventory/manage/item_categories.php
inventory/manage/item_codes.php
inventory/manage/item_units.php
inventory/manage/movement_types.php
inventory/manage/sales_kits.php
inventory/prices.php
inventory/purchasing_data.php
inventory/reorder_level.php
inventory/transfers.php
inventory/view/view_adjustment.php
inventory/view/view_transfer.php
manufacturing/includes/manufacturing_ui.inc
manufacturing/includes/work_order_issue_ui.inc
manufacturing/manage/bom_edit.php
manufacturing/manage/work_centres.php
manufacturing/work_order_issue.php
purchasing/includes/ui/grn_ui.inc
purchasing/includes/ui/invoice_ui.inc
purchasing/includes/ui/po_ui.inc
purchasing/inquiry/supplier_inquiry.php
purchasing/po_receive_items.php
purchasing/supplier_payment.php
purchasing/view/view_grn.php
purchasing/view/view_po.php
purchasing/view/view_supp_credit.php
purchasing/view/view_supp_invoice.php
purchasing/view/view_supp_payment.php
reporting/includes/reports_classes.inc
sales/create_recurrent_invoices.php
sales/credit_note_entry.php
sales/customer_credit_invoice.php
sales/customer_delivery.php
sales/customer_invoice.php
sales/customer_payments.php
sales/includes/ui/sales_credit_ui.inc
sales/includes/ui/sales_order_ui.inc
sales/inquiry/customer_inquiry.php
sales/manage/sales_areas.php
sales/manage/sales_groups.php
sales/manage/sales_people.php
sales/manage/sales_types.php
sales/sales_order_entry.php
sales/view/view_credit.php
sales/view/view_dispatch.php
sales/view/view_invoice.php
sales/view/view_receipt.php
sales/view/view_sales_order.php
taxes/item_tax_types.php
themes/aqua/renderer.php
themes/cool/renderer.php
themes/default/renderer.php

2015-02-20 01:44 +0100 Joe
(3453) Rerun. The aging reports / inquiries had a 1 day error in presentation. Fixed.
purchasing/includes/db/suppliers_db.inc
reporting/rep102.php
reporting/rep202.php
sales/includes/db/customers_db.inc
sales/inquiry/customer_inquiry.php

2015-02-19 17:48 +0100 Joe
(3452) The aging reports / inquiries had a 1 day error in presentation. Fixed.
purchasing/includes/db/suppliers_db.inc
reporting/rep102.php
reporting/rep202.php
sales/includes/db/customers_db.inc

2015-02-19 10:17 +0100 Joe
(3451) Allow search by Id in search work orders.
manufacturing/includes/db/work_orders_db.inc
manufacturing/search_work_orders.php

2015-02-13 22:46 +0100 Joe
(3450) Rerun of rep107. Currency filter not working in documents.
reporting/rep107.php

2015-02-12 21:50 +0100 Joe
(3449) Currency filter not working in documents.
reporting/rep107.php
reporting/rep108.php
reporting/rep109.php
reporting/rep111.php
reporting/rep112.php
reporting/rep113.php
reporting/rep209.php
reporting/rep210.php

2015-02-10 08:33 +0100 Joe
(3448) Moved page number, when more than 1 page, on documents down 2 lines.
reporting/includes/header2.inc

2015-01-24 10:25 +0100 Joe
(3447) Fixed Delivery note bug : Parent constraints not working if sales order line deleted after delivery
sales/includes/cart_class.inc

2015-01-17 08:50 +0100 Joe
(3446) Missing update of shipping tax when crediting an invoice.
sales/customer_credit_invoice.php

2014-12-31 12:55 +0100 Janusz Dobrowolski
(3445) Fixed error handling (logged in debug instead of production mode).
includes/errors.inc

2014-12-31 12:55 +0100 Janusz Dobrowolski
(3444) Purchase order reference was not restored after last PO cancelation.
purchasing/includes/db/po_db.inc

2014-12-22 19:11 +0100 Janusz Dobrowolski
(3443) Reverting last last two commits mistakenly pushed to stable branch.
sql/en_US-demo.sql
sql/en_US-new.sql

2014-12-21 17:32 +0100 Janusz Dobrowolski
(3442) Removed redundant index on supp_trans.type.
sql/en_US-new.sql

2014-12-20 17:16 +0100 Janusz Dobrowolski
(3441) Removed redundant indexes on cust_branch & supp_trans tables
sql/en_US-demo.sql
sql/en_US-new.sql

2014-12-19 00:22 +0100 Joe
(3440) Extended email entries.
admin/company_preferences.php
inventory/manage/locations.php

2014-12-17 15:33 +0100 Joe
(3439) Fixed Quote Valid Days in System and GL Setup, Setup tab.
admin/gl_setup.php
includes/prefs/sysprefs.inc
sales/includes/ui/sales_order_ui.inc

2014-12-08 20:14 +0100 Janusz Dobrowolski
(3438) Fixed problems with latin2 encoding due to changes in htmlspecialchars() behaviour in newer php versions.
includes/db/connect_db.inc
includes/session.inc

2014-11-22 11:54 +0100 Cambell
(3437) Further fixes to javascript multiple class handling.
js/inserts.js
js/utils.js

2014-11-21 10:18 +0100 Janusz Dobrowolski
(3436) [0002950] Fixed false quantity on hand errors on sales delivery.
sales/customer_delivery.php
sales/includes/cart_class.inc

2014-11-21 10:17 +0100 Janusz Dobrowolski
(3435) Fixed warning during database restore.
admin/db/maintenance_db.inc

2014-11-17 10:21 +0100 Janusz Dobrowolski
(3434) Fixed warning about non-existing HTTP_USER_AGENT session variable on some Plesk configurations.
includes/session.inc

2014-11-19 00:07 +0100 Joe
(3433) Fixed better CSS combobox select.
themes/aqua/default.css
themes/cool/default.css
themes/default/default.css

2014-11-17 11:04 +0100 Joe
(3432) Fixed ECB URLs moved permanently.
gl/includes/db/gl_db_rates.inc

2014-11-13 21:25 +0700 Cambell
(3431) Javascript now works with multiple classes on elements.
js/inserts.js
js/utils.js

2014-11-07 07:50 +0100 Joe
(3430) Fixed deprecated preg_replace in php >= 5.3.0 with the /e flag in utf8 reports.
reporting/includes/html_entity_decode_php4.php

2014-10-27 21:34 +0100 Joe
(3429) Improved calculation of standard cost in advanced manufacturing even if qoh = 0.
manufacturing/includes/db/work_orders_db.inc

2014-10-27 18:26 +0100 Janusz Dobrowolski
(3428) Fixed 'C' english language display on Install/Update Languages page, to allow its selection on first page.
admin/inst_lang.php

2014-10-15 00:53 +0200 Janusz Dobrowolski
(3427) Restoring compressed sql files sometimes failed due to nasty bug in php gzfile function.
admin/db/maintenance_db.inc

2014-10-08 20:50 +0200 Janusz Dobrowolski
(3426) Fixed contact record creation when new customer is added (reference/name were superseded).
sales/manage/customers.php

2014-10-01 23:08 +0200 Joe
(3425) Improved layout Reports Customer / Supplier Balances.
reporting/rep101.php
reporting/rep201.php

2014-10-01 13:32 +0200 Joe
(3424) Wrong domestic open balance in Report Supplier Balance for currency suppliers.
reporting/rep201.php

2014-09-29 16:32 +0200 Joe
(3423) Clean up. Standard COAs.
sql/en_US-demo.sql
sql/en_US-new.sql

2014-09-29 16:06 +0200 Joe
(3422) Changelog change
CHANGELOG.txt

2014-09-29 16:04 +0200 Joe
(3421) Changelog change
CHANGELOG.txt
@@ -36,7 +36,7 @@ function defaultCompany()
if (check_faillog())
{
$blocked_msg = '<span class=redfg>'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
$blocked_msg = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
$js .= "<script>setTimeout(function() {
document.getElementsByName('SubmitUser')[0].disabled=0;
@@ -58,7 +58,7 @@ function defaultCompany()
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
echo "<html dir='$rtl' >\n";
echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' >\n";
echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
send_scripts();
@@ -79,14 +79,14 @@ function defaultCompany()
start_row();
echo "<td align='center' colspan=2>";
if (!$login_timeout) { // FA logo
echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
} else {
echo "<font size=5>"._('Authorization timeout')."</font>";
}
echo "</td>\n";
end_row();
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' />\n";
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\n";
if (!$login_timeout)
table_section_title(_("Version")." $version Build ".$SysPrefs->build_version." - "._("Login"));
$value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($SysPrefs->allow_demo_mode ? "demouser":"");
@@ -119,7 +119,7 @@ function defaultCompany()
};
end_table(1);
echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser'"
.($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." /></center>\n";
.($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." ></center>\n";
foreach($_SESSION['timeout']['post'] as $p => $val) {
// add all request variables to be resend together with login data
@@ -22,7 +22,7 @@
echo "<table width='100%' border='0'>
<tr>
<td align='center'><img src='$path_to_root/themes/default/images/logo_frontaccounting.png' alt='FrontAccounting' width='250' height='50' onload='fixPNG(this)' /></td>
<td align='center'><img src='$path_to_root/themes/default/images/logo_frontaccounting.png' alt='FrontAccounting' width='250' height='50' onload='fixPNG(this)' ></td>
</tr>
<tr>
<td>&nbsp;</td>
@@ -36,7 +36,7 @@ function defaultCompany()
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
echo "<html dir='$rtl' >\n";
echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' >\n";
echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
send_scripts();
@@ -53,11 +53,11 @@ function defaultCompany()
start_table(false, "class='login'");
start_row();
echo "<td align='center' colspan=2>";
echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
echo "</td>\n";
end_row();
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' />\n";
echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\n";
table_section_title(_("Version")." $version Build ".$SysPrefs->build_version." - "._("Password reset"));
text_row(_("Email"), "email_entry_field", "", 20, 30);
@@ -80,7 +80,7 @@ function defaultCompany()
end_row();
end_table(1);
echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Send password -->")."&nbsp;&nbsp;' name='SubmitReset'
onclick='set_fullmode();' /></center>\n";
onclick='set_fullmode();'></center>\n";
end_form(1);
$Ajax->addScript(true, "document.forms[0].password.focus();");
@@ -140,7 +140,7 @@ function download_file($filename)
if ($backup_name) {
if (db_import($backup_path, $conn))
display_notification(_("Restore backup completed."));
refresh_sys_prefs(); // re-read system setup
$SysPrefs->refesh(); // re-read system setup
} else
display_error(_("Select backup file first."));
}
@@ -117,20 +117,6 @@
$Ajax->activate('_page_body');
} /* end of if submit */
//---------------------------------------------------------------------------------------------
if (get_company_pref('bcc_email') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
set_company_pref('bcc_email', 'setup.company', 'varchar', 100, '');
refresh_sys_prefs();
}
if (get_company_pref('alternative_tax_include_on_docs') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
set_company_pref('alternative_tax_include_on_docs', 'setup.company', 'tinyint', 1, '0');
refresh_sys_prefs();
}
if (get_company_pref('suppress_tax_rates') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
set_company_pref('suppress_tax_rates', 'setup.company', 'tinyint', 1, '0');
refresh_sys_prefs();
}
start_form(true);
$myrow = get_company_prefs();
@@ -245,7 +245,7 @@ function display_companies()
$coyno = user_company();
echo "
<script language='javascript'>
<script type='text/javascript'>
function deleteCompany(id, name) {
if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
return

0 comments on commit 637b979

Please sign in to comment.
You can’t perform that action at this time.