projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Advanced Manufacturing payments to be more flexible and simpler. Removed...
[fa-stable.git]
/
includes
/
types.inc
diff --git
a/includes/types.inc
b/includes/types.inc
index d4f3c4a17bc4c676203a302cb6cadb718c8c2663..38c3101b39009e04d9247cf99647ce98abe25059 100644
(file)
--- a/
includes/types.inc
+++ b/
includes/types.inc
@@
-216,8
+216,8
@@
class payment_person_types
$qe = get_quick_entry($person_id);
return ($full?payment_person_types::type_name($type) . " ":"") . $qe["description"];
case payment_person_types::WorkOrder() :
$qe = get_quick_entry($person_id);
return ($full?payment_person_types::type_name($type) . " ":"") . $qe["description"];
case payment_person_types::WorkOrder() :
-
$wo = get_work_order($person_id)
;
- return
($full?payment_person_types::type_name($type) . " ":"") . $wo["wo_ref"
];
+
global $wo_cost_types
;
+ return
$wo_cost_types[$person_id
];
case payment_person_types::customer() :
return ($full?payment_person_types::type_name($type) . " ":"") . get_customer_name($person_id);
case payment_person_types::supplier() :
case payment_person_types::customer() :
return ($full?payment_person_types::type_name($type) . " ":"") . get_customer_name($person_id);
case payment_person_types::supplier() :
@@
-309,6
+309,14
@@
class wo_types
}
}
}
}
+define('WO_LABOUR', 0);
+define('WO_OVERHEAD', 1);
+
+$wo_cost_types = array(
+ WO_LABOUR => _("Labour Cost"),
+ WO_OVERHEAD => _("Overhead Cost"),
+);
+
$quick_actions = array(
'=' => _('Remainder'), // post current base amount to GL account
'a' => _('Amount'), // post amount to GL account
$quick_actions = array(
'=' => _('Remainder'), // post current base amount to GL account
'a' => _('Amount'), // post amount to GL account
@@
-337,6
+345,4
@@
$quick_entry_types = array(
QE_SUPPINV => _("Supplier Invoice/Credit")
);
QE_SUPPINV => _("Supplier Invoice/Credit")
);
-
-
?>
\ No newline at end of file
?>
\ No newline at end of file