projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e1a4c7
)
Double semicolon line endings fixed by @apmuthu.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Thu, 17 Jan 2019 07:25:14 +0000
(08:25 +0100)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Thu, 17 Jan 2019 07:25:14 +0000
(08:25 +0100)
admin/attachments.php
patch
|
blob
|
history
fixed_assets/includes/fa_classes_db.inc
patch
|
blob
|
history
inventory/view/view_transfer.php
patch
|
blob
|
history
js/behaviour.js
patch
|
blob
|
history
manufacturing/view/wo_issue_view.php
patch
|
blob
|
history
purchasing/view/view_po.php
patch
|
blob
|
history
reporting/rep451.php
patch
|
blob
|
history
sales/customer_credit_invoice.php
patch
|
blob
|
history
sales/includes/db/customers_db.inc
patch
|
blob
|
history
taxes/tax_groups.php
patch
|
blob
|
history
diff --git
a/admin/attachments.php
b/admin/attachments.php
index 421c040662f5fa309a25f51a4009149c72c58ab1..e92276ed87fd2934596504ff9147e178394a4542 100644
(file)
--- a/
admin/attachments.php
+++ b/
admin/attachments.php
@@
-169,7
+169,7
@@
function viewing_controls()
start_row();
systypes_list_cells(_("Type:"), 'filterType', null, true);
if (list_updated('filterType'))
start_row();
systypes_list_cells(_("Type:"), 'filterType', null, true);
if (list_updated('filterType'))
- $selected_id = -1;
;
+ $selected_id = -1;
end_row();
end_table(1);
end_row();
end_table(1);
diff --git
a/fixed_assets/includes/fa_classes_db.inc
b/fixed_assets/includes/fa_classes_db.inc
index 919f053b2fe4405c44bdb3464e20880887b6659b..37fb5cebb082753cb18c81ada98940e8c03c71b4 100644
(file)
--- a/
fixed_assets/includes/fa_classes_db.inc
+++ b/
fixed_assets/includes/fa_classes_db.inc
@@
-21,7
+21,7
@@
function get_fixed_asset_classes()
function get_fixed_asset_classname($class)
{
function get_fixed_asset_classname($class)
{
- $sql="SELECT description FROM ".TB_PREF."stock_fa_class WHERE fa_class_id = ".db_escape($class);
;
+ $sql="SELECT description FROM ".TB_PREF."stock_fa_class WHERE fa_class_id = ".db_escape($class);
$result = db_query($sql,"fixed asset class name could not be retrieved");
$result = db_query($sql,"fixed asset class name could not be retrieved");
diff --git
a/inventory/view/view_transfer.php
b/inventory/view/view_transfer.php
index cb27e24f1f66de575723427adb63222c8e496433..f9c77816e9f0acfd9dbef5c0a0f9e46514372da2 100644
(file)
--- a/
inventory/view/view_transfer.php
+++ b/
inventory/view/view_transfer.php
@@
-61,7
+61,7
@@
while ($item = db_fetch($transfer_items))
label_cell($item['description']);
qty_cell($item['qty'], false, get_qty_dec($item['stock_id']));
label_cell($item['units']);
label_cell($item['description']);
qty_cell($item['qty'], false, get_qty_dec($item['stock_id']));
label_cell($item['units']);
- end_row();
;
+ end_row();
}
}
}
}
diff --git
a/js/behaviour.js
b/js/behaviour.js
index b225ca204f76609385c51aa0af0dc49f0e1213fa..fa812c8be7152bbfaad52d1eb0563cd1c8ecafb5 100644
(file)
--- a/
js/behaviour.js
+++ b/
js/behaviour.js
@@
-3,12
+3,12
@@
of Simon Willison (see comments by Simon below).
Small fixes by J.Dobrowolski for Front Accounting May 2008
Description:
of Simon Willison (see comments by Simon below).
Small fixes by J.Dobrowolski for Front Accounting May 2008
Description:
-
+
Uses css selectors to apply javascript behaviours to enable
unobtrusive javascript in html documents.
Uses css selectors to apply javascript behaviours to enable
unobtrusive javascript in html documents.
-
- Usage:
-
+
+ Usage:
+
var myrules = {
'b.someclass' : function(element){
element.onclick = function(){
var myrules = {
'b.someclass' : function(element){
element.onclick = function(){
@@
-21,42
+21,42
@@
}
}
};
}
}
};
-
+
Behaviour.register(myrules);
Behaviour.register(myrules);
-
+
// Call Behaviour.apply() to re-apply the rules (if you
// update the dom, etc).
License:
// Call Behaviour.apply() to re-apply the rules (if you
// update the dom, etc).
License:
-
+
This file is entirely BSD licensed.
This file is entirely BSD licensed.
-
+
More information:
More information:
-
+
http://ripcord.co.nz/behaviour/
http://ripcord.co.nz/behaviour/
-
-*/
+
+*/
var Behaviour = {
list : new Array,
var Behaviour = {
list : new Array,
-
+
register : function(sheet){
Behaviour.list.push(sheet);
},
register : function(sheet){
Behaviour.list.push(sheet);
},
-
+
start : function(){
Behaviour.addLoadEvent(function(){
Behaviour.apply();
});
},
start : function(){
Behaviour.addLoadEvent(function(){
Behaviour.apply();
});
},
-
+
apply : function(){
for (h=0;sheet=Behaviour.list[h];h++){
for (selector in sheet){
var sels = selector.split(',');
for (var n = 0; n < sels.length; n++) {
list = document.getElementsBySelector(sels[n]);
apply : function(){
for (h=0;sheet=Behaviour.list[h];h++){
for (selector in sheet){
var sels = selector.split(',');
for (var n = 0; n < sels.length; n++) {
list = document.getElementsBySelector(sels[n]);
-
+
if (!list){
continue;
}
if (!list){
continue;
}
@@
-68,10
+68,10
@@
var Behaviour = {
}
}
},
}
}
},
-
+
addLoadEvent : function(func){
var oldonload = window.onload;
addLoadEvent : function(func){
var oldonload = window.onload;
-
+
if (typeof window.onload != 'function') {
window.onload = func;
} else {
if (typeof window.onload != 'function') {
window.onload = func;
} else {
@@
-90,13
+90,13
@@
Behaviour.start();
document.getElementsBySelector(selector)
- returns an array of element objects from the current document
document.getElementsBySelector(selector)
- returns an array of element objects from the current document
- matching the CSS selector. Selectors can contain element names,
+ matching the CSS selector. Selectors can contain element names,
class names and ids and can be nested. For example:
class names and ids and can be nested. For example:
-
+
elements = document.getElementsBySelect('div#main p a.external')
elements = document.getElementsBySelect('div#main p a.external')
-
- Will return an array of all 'a' elements with 'external' in their
- class attribute that are contained inside 'p' elements that are
+
+ Will return an array of all 'a' elements with 'external' in their
+ class attribute that are contained inside 'p' elements that are
contained inside the 'div' element which has id="main"
New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
contained inside the 'div' element which has id="main"
New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
@@
-104,7
+104,7
@@
Behaviour.start();
Version 0.4 - Simon Willison, March 25th 2003
-- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
Version 0.4 - Simon Willison, March 25th 2003
-- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
- -- Opera 7 fails
+ -- Opera 7 fails
*/
function getAllChildren(e) {
*/
function getAllChildren(e) {
@@
-121,7
+121,7
@@
document.getElementsBySelector = function(selector) {
var tokens = selector.split(' ');
var currentContext = new Array(document);
for (var i = 0; i < tokens.length; i++) {
var tokens = selector.split(' ');
var currentContext = new Array(document);
for (var i = 0; i < tokens.length; i++) {
- token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');
;
+ token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');
if (token.indexOf('#') > -1) {
// Token is an ID selector
var bits = token.split('#');
if (token.indexOf('#') > -1) {
// Token is an ID selector
var bits = token.split('#');
@@
-168,7
+168,7
@@
document.getElementsBySelector = function(selector) {
continue; // Skip to next token
}
// Code to deal with attribute selectors
continue; // Skip to next token
}
// Code to deal with attribute selectors
-/* Original reg expression /^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+/* Original reg expression /^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
was replaced by new RegExp() cuz compressor fault */
if (token.match(new RegExp('^(\\w*)\\[(\\w+)([=~\\|\\^\\$\\*]?)=?"?([^\\]"]*)"?\\]$'))) {
var tagName = RegExp.$1;
was replaced by new RegExp() cuz compressor fault */
if (token.match(new RegExp('^(\\w*)\\[(\\w+)([=~\\|\\^\\$\\*]?)=?"?([^\\]"]*)"?\\]$'))) {
var tagName = RegExp.$1;
@@
-199,7
+199,7
@@
document.getElementsBySelector = function(selector) {
case '=': // Equality
checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
break;
case '=': // Equality
checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
break;
- case '~': // Match one of space seperated words
+ case '~': // Match one of space seperated words
checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.match(new RegExp('\\b'+attrValue+'\\b'))); };
break;
case '|': // Match start with value followed by optional hyphen
checkFunction = function(e) { var a=e.getAttribute(attrName); return (a && a.match(new RegExp('\\b'+attrValue+'\\b'))); };
break;
case '|': // Match start with value followed by optional hyphen
@@
-228,11
+228,11
@@
document.getElementsBySelector = function(selector) {
// alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
continue; // Skip to next token
}
// alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
continue; // Skip to next token
}
-
+
if (!currentContext[0]){
return;
}
if (!currentContext[0]){
return;
}
-
+
// If we get here, token is JUST an element (not a class or ID selector)
tagName = token;
var found = new Array;
// If we get here, token is JUST an element (not a class or ID selector)
tagName = token;
var found = new Array;
@@
-248,12
+248,12
@@
document.getElementsBySelector = function(selector) {
return currentContext;
}
return currentContext;
}
-/* That revolting regular expression explained
+/* That revolting regular expression explained
/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
\---/ \---/\-------------/ \-------/
| | | |
| | | The value
| | ~,|,^,$,* or =
/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
\---/ \---/\-------------/ \-------/
| | | |
| | | The value
| | ~,|,^,$,* or =
- | Attribute
+ | Attribute
Tag
*/
Tag
*/
diff --git
a/manufacturing/view/wo_issue_view.php
b/manufacturing/view/wo_issue_view.php
index ad0dfda90845bb44512708621ce1bfa824cb9256..cbad96a01986c498508fbb80be8a63ad96f4b4a0 100644
(file)
--- a/
manufacturing/view/wo_issue_view.php
+++ b/
manufacturing/view/wo_issue_view.php
@@
-91,7
+91,7
@@
function display_wo_issue_details($issue_no)
qty_cell($myrow["qty_issued"], false, get_qty_dec($myrow["stock_id"]));
label_cell($myrow["units"]);
amount_cell($myrow["unit_cost"]);
qty_cell($myrow["qty_issued"], false, get_qty_dec($myrow["stock_id"]));
label_cell($myrow["units"]);
amount_cell($myrow["unit_cost"]);
- end_row();
;
+ end_row();
$j++;
If ($j == 12)
$j++;
If ($j == 12)
diff --git
a/purchasing/view/view_po.php
b/purchasing/view/view_po.php
index e84e4e33139039424ee3820a42c2d8164779d418..be8826440cf41ee4f5109c31933861e6a494f8de 100644
(file)
--- a/
purchasing/view/view_po.php
+++ b/
purchasing/view/view_po.php
@@
-123,7
+123,7
@@
if (db_num_rows($grns_result) > 0)
label_cell(sql2date($myrow["delivery_date"]));
end_row();
}
label_cell(sql2date($myrow["delivery_date"]));
end_row();
}
- end_table();
;
+ end_table();
}
$invoice_result = get_po_invoices_credits($_GET['trans_no']);
}
$invoice_result = get_po_invoices_credits($_GET['trans_no']);
diff --git
a/reporting/rep451.php
b/reporting/rep451.php
index 5d73ff79d287032ee5834ae6917ffd130301f3b5..88a1a69b41d5ec4ddab3160de516e2bdd923d7b5 100644
(file)
--- a/
reporting/rep451.php
+++ b/
reporting/rep451.php
@@
-134,7
+134,7
@@
function print_fixed_assets_valuation_report()
$rep->NewLine();
}
$UnitCost = $trans['purchase_cost'];
$rep->NewLine();
}
$UnitCost = $trans['purchase_cost'];
- $Depreciation = $trans['purchase_cost'] - $trans['material_cost'];
;
+ $Depreciation = $trans['purchase_cost'] - $trans['material_cost'];
$Balance = $trans['material_cost'];
if ($detail)
{
$Balance = $trans['material_cost'];
if ($detail)
{
diff --git
a/sales/customer_credit_invoice.php
b/sales/customer_credit_invoice.php
index af42db4c0378e497a870c5c8fb567cfb38c48e77..e482386b971a7f9f14998fca9fd46cc814b75e6b 100644
(file)
--- a/
sales/customer_credit_invoice.php
+++ b/
sales/customer_credit_invoice.php
@@
-87,7
+87,7
@@
function can_process()
global $Refs;
if (!is_date($_POST['CreditDate'])) {
global $Refs;
if (!is_date($_POST['CreditDate'])) {
- display_error(_("The entered date is invalid."));
;
+ display_error(_("The entered date is invalid."));
set_focus('CreditDate');
return false;
} elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
set_focus('CreditDate');
return false;
} elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
@@
-98,14
+98,14
@@
function can_process()
if ($_SESSION['Items']->trans_no==0) {
if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
if ($_SESSION['Items']->trans_no==0) {
if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
- display_error(_("You must enter a reference."));
;
+ display_error(_("You must enter a reference."));
set_focus('ref');
return false;
}
}
if (!check_num('ChargeFreightCost', 0)) {
set_focus('ref');
return false;
}
}
if (!check_num('ChargeFreightCost', 0)) {
- display_error(_("The entered shipping cost is invalid or less than zero."));
;
+ display_error(_("The entered shipping cost is invalid or less than zero."));
set_focus('ChargeFreightCost');
return false;
}
set_focus('ChargeFreightCost');
return false;
}
diff --git
a/sales/includes/db/customers_db.inc
b/sales/includes/db/customers_db.inc
index 675e1b736c6e589cce25403e049e9bc72586e769..0dfc17e28e85fa9ddf1ad0de89fa026fb6b9b700 100644
(file)
--- a/
sales/includes/db/customers_db.inc
+++ b/
sales/includes/db/customers_db.inc
@@
-55,7
+55,7
@@
function delete_customer($customer_id)
begin_transaction();
delete_entity_contacts('customer', $customer_id);
begin_transaction();
delete_entity_contacts('customer', $customer_id);
- $sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($customer_id);
;
+ $sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($customer_id);
db_query($sql,"cannot delete customer");
commit_transaction();
}
db_query($sql,"cannot delete customer");
commit_transaction();
}
diff --git
a/taxes/tax_groups.php
b/taxes/tax_groups.php
index 889db60e9b7928af11fb66b7efdf8fb146fb416b..16873e04ecf2724e849795ea1a2ef1a522827365 100644
(file)
--- a/
taxes/tax_groups.php
+++ b/
taxes/tax_groups.php
@@
-139,7
+139,7
@@
while ($myrow = db_fetch($result))
inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
- end_row();
;
+ end_row();
}
inactive_control_row($th);
}
inactive_control_row($th);