Early payment discount option moved from branch to payment terms.

[fa-stable.git] / manufacturing / includes / db / work_orders_db.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 05ddbb6b4075247e1c7cee399f015ec0c8aac3d3..2e602a6f574c47cd3fdf6ad881f0180e8337b686 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -17,7 +17,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 {
        global $Refs;
 
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        $args = func_get_args();
        $args = (object)array_combine(array('wo_ref', 'loc_code', 'units_reqd', 'stock_id',
                'type', 'date_', 'required_by', 'memo_', 'costs', 'cr_acc', 'labour', 'cr_lab_acc'), $args);
@@ -74,7 +74,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
                                        $date_, $required_by, $memo_)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        $args = func_get_args();
        $args = (object)array_combine(array('woid', 'loc_code', 'units_reqd', 'stock_id',
                'date_', 'required_by', 'memo_'), $args);
@@ -100,7 +100,7 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 
 function delete_work_order($woid, $stock_id, $qty, $date)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        hook_db_prevoid(ST_WORKORDER, $woid);
 
        // delete the work order requirements
@@ -122,10 +122,12 @@ function get_work_order($woid, $allow_null=false)
 {
     $sql = "SELECT wo.*,st.description As StockItemName,l.location_name,
                l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_account
-               FROM ".TB_PREF."workorders wo, "
+                       FROM ".TB_PREF."workorders wo
+                       LEFT JOIN ".TB_PREF."voided v ON v.id=wo.id and v.type=".ST_WORKORDER.","
                        .TB_PREF."stock_master st, "
                        .TB_PREF."locations l
-               WHERE st.stock_id=wo.stock_id
+               WHERE ISNULL(v.id)
+               AND st.stock_id=wo.stock_id
                AND     l.loc_code=wo.loc_code
                AND wo.id=".db_escape($woid)."
                GROUP BY wo.id";
@@ -177,7 +179,7 @@ function work_order_has_payments($woid)
 
 function release_work_order($woid, $releaseDate, $memo_)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
 
        $myrow = get_work_order($woid);
        $stock_id = $myrow["stock_id"];
@@ -257,7 +259,7 @@ function reopen_work_order($woid)
 */
 function void_work_order($woid)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        hook_db_prevoid(ST_WORKORDER, $woid);
 
        $work_order = get_work_order($woid);
@@ -287,8 +289,7 @@ function void_work_order($woid)
        void_wo_requirements($woid);
 
        // close workorder
-       // FIXME: due to bug in 2.4 db scheme (conflicting wo_ref unique key) we have to fix wo_ref here:
-       $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0, wo_ref=CONCAT(wo_ref, ' ', '".uniqid()."') WHERE id = "
+       $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
                .db_escape($woid);
        db_query($sql, "The work order couldn't be voided");