[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9002] Merge 8994:9001 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9002] Merge 8994:9001 from trunk |
|
Date: |
Wed, 21 Mar 2012 08:02:09 +0000 |
Revision: 9002
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9002
Author: sigurdne
Date: 2012-03-21 08:02:08 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
Merge 8994:9001 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/catch/setup/setup.inc.php
branches/Version-1_0-branch/catch/setup/tables_current.inc.php
branches/Version-1_0-branch/catch/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.historylog.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -467,9 +467,9 @@
$body = "testmelding fra Aktivitetsoversikt";
}
- var_dump($subject);
- var_dump($body);
- var_dump($activity->get_organization_id() . " ; " .
$activity->get_group_id());
+// var_dump($subject);
+// var_dump($body);
+// var_dump($activity->get_organization_id() . " ; " .
$activity->get_group_id());
if($activity->get_group_id() && $activity->get_group_id() > 0)
{
Modified: branches/Version-1_0-branch/catch/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/setup.inc.php 2012-03-21
06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/catch/setup/setup.inc.php 2012-03-21
08:02:08 UTC (rev 9002)
@@ -27,7 +27,7 @@
*/
$setup_info['catch']['name'] = 'catch';
- $setup_info['catch']['version'] = '0.9.17.512';
+ $setup_info['catch']['version'] = '0.9.17.513';
$setup_info['catch']['app_order'] = 20;
$setup_info['catch']['enable'] = 1;
$setup_info['catch']['globals_checked'] = True;
Modified: branches/Version-1_0-branch/catch/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/tables_current.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/catch/setup/tables_current.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -86,6 +86,7 @@
'history_owner' => array('type' =>
'int','precision' => '4','nullable' => False),
'history_status' => array('type' =>
'char','precision' => '2','nullable' => False),
'history_new_value' => array('type' =>
'text','nullable' => False),
+ 'history_old_value' => array('type' =>
'text','nullable' => true),
'history_timestamp' => array('type' =>
'timestamp','nullable' => False,'default' => 'current_timestamp')
),
'pk' => array('history_id'),
Modified: branches/Version-1_0-branch/catch/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/tables_update.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/catch/setup/tables_update.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -364,3 +364,23 @@
}
}
+ /**
+ * Update catch version from 0.9.17.512 to 0.9.17.513
+ * Add history_old_value
+ */
+
+ $test[] = '0.9.17.512';
+ function catch_upgrade0_9_17_512()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_catch_history','history_old_value',array('type'
=> 'text','nullable' => true));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['catch']['currentver'] =
'0.9.17.513';
+ return $GLOBALS['setup_info']['catch']['currentver'];
+ }
+ }
+
+
Modified: branches/Version-1_0-branch/property/inc/class.historylog.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.historylog.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/property/inc/class.historylog.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -63,6 +63,10 @@
{
$selector = 'entity';
}
+ else if(substr($appname,0,5)=='catch')
+ {
+ $selector = 'catch';
+ }
else
{
$selector = $appname;
@@ -70,30 +74,31 @@
switch($selector)
{
- case 'request':
- $this->table='fm_request_history';
+ case 'request':
+ $this->table='fm_request_history';
+ break;
+ case 'workorder':
+ $this->table='fm_workorder_history';
+ break;
+ case 'project':
+ $this->table='fm_project_history';
+ break;
+ case 'tts':
+ $this->table='fm_tts_history';
+ break;
+ case 'document':
+ $this->table='fm_document_history';
+ break;
+ case 'entity':
+ case 'catch':
+ $this->table ="fm_{$selector}_history";
+ $this->attrib_id_field =
',history_attrib_id';
+ break;
+ case 's_agreement':
+ $this->table='fm_s_agreement_history';
+ $this->attrib_id_field =
',history_attrib_id';
+ $this->detail_id_field =
',history_detail_id';
break;
- case 'workorder':
- $this->table='fm_workorder_history';
- break;
- case 'project':
- $this->table='fm_project_history';
- break;
- case 'tts':
- $this->table='fm_tts_history';
- break;
- case 'document':
- $this->table='fm_document_history';
- break;
- case 'entity':
- $this->table='fm_entity_history';
- $this->attrib_id_field = ',history_attrib_id';
- break;
- case 's_agreement':
- $this->table='fm_s_agreement_history';
- $this->attrib_id_field = ',history_attrib_id';
- $this->detail_id_field = ',history_detail_id';
- break;
}
$this->appname = $appname;
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -671,9 +671,11 @@
$this->db->query($sql_workder);
while ($this->db->next_record())
{
+ $closed = false;
if($this->db->f('closed'))
{
$_sum = 0;
+ $closed = true;
}
else if($this->db->f('contract_sum') >
0)
{
@@ -693,7 +695,21 @@
}
$_actual_cost =
(int)$this->db->f('actual_cost');
- $project['combined_cost'] +=
($_sum - $_actual_cost);
+
+ if($closed)
+ {
+ $__actual_cost = 0;
+ }
+ else
+ {
+ $__actual_cost = $_actual_cost;
+ }
+
+ $project['combined_cost'] +=
($_sum - $__actual_cost);
+ if($project['combined_cost'] < 0)
+ {
+ $project['combined_cost'] = 0;
+ }
$project['actual_cost'] +=
$_actual_cost;
$project['billable_hours'] +=
(int)$this->db->f('billable_hours');
}
@@ -1412,6 +1428,7 @@
$this->db->query("UPDATE fm_project SET budget
= {$new_budget_new_project}, reserve = reserve + {$reserve_old_project} WHERE
id = {$new_project_id}" ,__LINE__,__FILE__);
$this->db->query("UPDATE fm_project SET budget
= 0, reserve = 0 WHERE id = " . (int)$project['id'] ,__LINE__,__FILE__);
$this->db->query("DELETE FROM fm_project_budget
WHERE project_id = " . (int)$project['id'] ,__LINE__,__FILE__);
+
$historylog->add('RM',(int)$project['id'],"Budsjett og alle bestillinger er
flyttet fra prosjekt {$project['id']} til prosjekt {$new_project_id}");
}
$receipt['id'] = $project['id'];
@@ -1588,7 +1605,7 @@
'project_id' =>
$project_id,
'year'
=> $year ,
'budget'
=> 0,
- 'sum_orders'
=> isset($cost_info['sum_orders']) && $cost_info['sum_orders'] ?
$cost_info['sum_orders'] : 0,
+ 'sum_orders' =>
isset($cost_info['sum_orders']) && $cost_info['sum_orders'] > 0 ?
$cost_info['sum_orders'] : 0,
'actual_cost' =>
isset($cost_info['actual_cost']) && $cost_info['actual_cost'] ?
$cost_info['actual_cost'] : 0,
'user_id'
=> 0,
'entry_date' => 0,
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -1023,7 +1023,7 @@
$values = $this->bocommon->validate_db_insert($values);
$this->db->query("INSERT INTO fm_workorder
(id,num,project_id,title,access,entry_date,start_date,end_date,status,"
- .
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id,ecodimb,category,billable_hours,contract_sum,approved,'mail_recipients
$cols) "
+ .
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id,ecodimb,category,billable_hours,contract_sum,approved,mail_recipients
$cols) "
. "VALUES ( $values $vals)",__LINE__,__FILE__);
$this->db->query("INSERT INTO fm_orders (id,type)
VALUES ({$id},'workorder')");
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -1385,7 +1385,7 @@
if(!isset($values['workorder_budget']) && $save)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiworkorder.edit', 'project_id'=> $id));
+//
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiworkorder.edit', 'project_id'=> $id));
}
if
(!$this->bocommon->check_perms($values['grants'],PHPGW_ACL_EDIT))
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-03-21 06:14:01 UTC (rev 9001)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-03-21 08:02:08 UTC (rev 9002)
@@ -579,15 +579,24 @@
$duplicate = true;
$_bilagsnr_ut =
$this->db->f('bilagsnr_ut');
$bilagsnr = $this->db->f('bilagsnr');
- $receipt =
$this->export->RullTilbake(false,false,$_bilagsnr_ut);
+ $__bilagsnr = $_bilagsnr_ut ?
$_bilagsnr_ut : $bilagsnr;
+
+ if($_bilagsnr_ut)
+ {
+ $receipt =
$this->export->RullTilbake(false,false,$_bilagsnr_ut);
+ }
+ else
+ {
+ $receipt =
$this->export->RullTilbake(false,false,false,$bilagsnr);
+ }
if( isset($receipt['message']) )
{
- $this->receipt['message'][] =
array('msg' => "Bilag rullet tilbake fra historikk : {$_bilagsnr_ut}");
+ $this->receipt['message'][] =
array('msg' => "Bilag rullet tilbake fra historikk : {$__bilagsnr}");
}
else
{
- $this->receipt['error'][] =
array('msg' => "Bilag ikke rullet tilbake fra historikk : {$_bilagsnr_ut},
extern ref: {$_data['SCANNINGNO']}");
+ $this->receipt['error'][] =
array('msg' => "Bilag ikke rullet tilbake fra historikk : {$__bilagsnr}, extern
ref: {$_data['SCANNINGNO']}");
}
unset($_bilagsnr_ut);
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-03-21 06:14:01 UTC (rev 9001)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-03-21 08:02:08 UTC (rev 9002)
@@ -199,7 +199,7 @@
}
- protected function select_invoice_rollback($date,
$Filnavn,$rollback_voucher)
+ protected function select_invoice_rollback($date,
$Filnavn,$rollback_voucher,$rollback_internal_voucher)
{
$date_array = phpgwapi_datetime::date_array($date);
$day = $date_array['day'];
@@ -235,6 +235,11 @@
$rollback_voucher = (int)$rollback_voucher;
$sql="SELECT * FROM fm_ecobilagoverf WHERE
bilagsnr_ut = {$rollback_voucher} AND manual_record IS NULL";
}
+ else if($rollback_internal_voucher)
+ {
+ $rollback_internal_voucher =
(int)$rollback_internal_voucher;
+ $sql="SELECT * FROM fm_ecobilagoverf WHERE
bilagsnr = {$rollback_internal_voucher} AND manual_record IS NULL";
+ }
else
{
$sql="SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' AND $datepart_year=$year AND $datepart_month=$month AND
$datepart_day= $day";
@@ -416,9 +421,9 @@
$this->log_error($batchid,$error_desr);
}
- public function RullTilbake($Filnavn, $date,$rollback_voucher)
+ public function RullTilbake($Filnavn,
$date,$rollback_voucher,$rollback_internal_voucher)
{
- $voucher = $this->select_invoice_rollback($date,
$Filnavn,$rollback_voucher);
+ $voucher = $this->select_invoice_rollback($date,
$Filnavn,$rollback_voucher,$rollback_internal_voucher);
if ( $this->db->get_transaction() )
{
@@ -464,7 +469,7 @@
{
$fil_katalog =
$this->config->config_data['export']['path'];
- if($rollback_voucher)
+ if($rollback_voucher ||
$rollback_internal_voucher)
{
if ( !$this->global_lock )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9002] Merge 8994:9001 from trunk,
Sigurd Nes <=