[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9279] Merge 9276:9278 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9279] Merge 9276:9278 from trunk |
|
Date: |
Fri, 04 May 2012 11:58:05 +0000 |
Revision: 9279
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9279
Author: sigurdne
Date: 2012-05-04 11:58:05 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Merge 9276:9278 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soXport.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/export/default/Agresso
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/js/portico/ajax_workorder_edit.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
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,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275
+
/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,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278
Modified: branches/Version-1_0-branch/property/inc/class.soXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -760,6 +760,30 @@
}
+ public function
update_actual_cost_from_archive($orders_affected)
+ {
+ $orders = array();
+ if($orders_affected)
+ {
+ $sql = 'SELECT order_id, actual_cost FROM
fm_orders_actual_cost_view WHERE order_id IN (' . implode(','
array_keys($orders_affected)) . ')';
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $orders[] = array
+ (
+ 'order_id' =>
$this->db->f('order_id'),
+ 'actual_cost' =>
$this->db->f('actual_cost')
+ );
+ }
+
+ foreach ($orders as $order)
+ {
+ $this->db->query("UPDATE fm_workorder
SET actual_cost = '{$order['actual_cost']}' WHERE id =
'{$order['order_id']}'",__LINE__,__FILE__);
+ }
+ }
+ }
+
// Oppdater beløp på arbeidsordre
// operator="-" ved tilbakerulling
public function correct_actual_cost($order_id, $amount,
$actual_cost_field, $operator)
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -663,11 +663,9 @@
$project['actual_cost'] = 0;
$project['billable_hours'] = 0;
- $sql_workder = 'SELECT contract_sum,
addition, calculation, budget,'
- . '
fm_orders_actual_cost_view.actual_cost,'
+ $sql_workder = 'SELECT contract_sum,
addition, calculation, budget, actual_cost,'
. ' billable_hours,closed'
. " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
- . " {$this->left_join}
fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id"
. " WHERE project_id =
'{$project['project_id']}'";
$this->db->query($sql_workder);
@@ -846,11 +844,10 @@
{
$project_id = (int) $project_id;
$budget = array();
- $this->db->query("SELECT fm_workorder.title,
fm_orders_actual_cost_view.actual_cost, fm_workorder.budget, fm_workorder.id as
workorder_id,fm_workorder.contract_sum,"
+ $this->db->query("SELECT fm_workorder.title,
fm_workorder.actual_cost, fm_workorder.budget, fm_workorder.id as
workorder_id,fm_workorder.contract_sum,"
. " fm_workorder.vendor_id,
fm_workorder.calculation,fm_workorder.rig_addition,fm_workorder.addition,fm_workorder.deviation,fm_workorder.charge_tenant,"
. " fm_workorder_status.descr as status,
fm_workorder.account_id as b_account_id"
. " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
- . " {$this->left_join}
fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id"
. " WHERE project_id={$project_id}");
while ($this->db->next_record())
@@ -1832,18 +1829,15 @@
$table = 'fm_workorder';
$status_table = 'fm_workorder_status';
$title_field = 'fm_workorder.title';
+ $actual_cost = ',actual_cost';
$join_method = "{$this->join}
{$status_table} ON {$table}.status = {$status_table}.id";
if($paid)
{
$join_method .= "
{$this->join} fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id";
+ $actual_cost =
',fm_orders_actual_cost_view.actual_cost';
}
- else
- {
- $join_method .= "
{$this->left_join} fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id";
- }
- $actual_cost =
',fm_orders_actual_cost_view.actual_cost';
$this->_update_status_workorder($execute, $status_new, $ids);
$sql = "SELECT {$table}.id,
$status_table.descr as status ,{$title_field},start_date {$actual_cost} FROM
{$table}"
. " {$join_method}"
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -274,9 +274,6 @@
$joinmethod .= " {$this->join}
fm_workorder_status ON (fm_workorder.status = fm_workorder_status.id))";
$paranthesis .='(';
- $joinmethod .= " {$this->left_join}
fm_orders_actual_cost_view ON (fm_workorder.id =
fm_orders_actual_cost_view.order_id))";
- $paranthesis .='(';
-
$cols .= ',fm_vendor.org_name';
$cols_return[] = 'org_name';
$uicols['input_type'][] = 'hidden';
@@ -303,8 +300,7 @@
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = true;
-// $cols .= ',fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost as actual_cost';
-// $cols .=
',fm_orders_actual_cost_view.actual_cost';
+ $cols .= ',fm_workorder.actual_cost';
$cols_return[] = 'actual_cost';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'actual_cost';
@@ -315,7 +311,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
- $uicols['sortable'][] = false;
+ $uicols['sortable'][] = true;
$joinmethod .= " {$this->left_join} fm_vendor
ON (fm_workorder.vendor_id = fm_vendor.id))";
$paranthesis .='(';
@@ -418,7 +414,7 @@
$ordermethod = " ORDER BY
fm_workorder.id {$sort}";
break;
case 'actual_cost':
- $order_field =
',fm_orders_actual_cost_view.actual_cost';
+ $order_field =
',fm_workorder.actual_cost';
break;
case 'address':
if(isset($GLOBALS['phpgw']->config->config_data['location_at_workorder']) &&
$GLOBALS['phpgw']->config->config_data['location_at_workorder'])
@@ -508,7 +504,7 @@
{
$filtermethod .= " $where
fm_wo_hours_category.id=$wo_hour_cat_id ";
$where= 'AND';
- $group_method = " group by
fm_project.id,{$location_table}.location_code,fm_workorder.id,workorder_id,title,fm_workorder.status,fm_workorder.entry_date,user_lid,fm_workorder.vendor_id,project_owner,{$location_table}.address,fm_vendor.org_name,fm_workorder.combined_cost,fm_orders_actual_cost_view.actual_cost,fm_workorder.act_vendor_cost";
+ $group_method = " group by
fm_project.id,{$location_table}.location_code,fm_workorder.id,workorder_id,title,fm_workorder.status,fm_workorder.entry_date,user_lid,fm_workorder.vendor_id,project_owner,{$location_table}.address,fm_vendor.org_name,fm_workorder.combined_cost,fm_workorder.actual_cost,fm_workorder.act_vendor_cost";
}
if ($b_group)
Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso
2012-05-04 11:58:05 UTC (rev 9279)
@@ -38,6 +38,7 @@
var $old_files_deleted;
var $debug;
+ protected $orders_affected = array();
function export_conv()
{
@@ -390,6 +391,8 @@
if($BilagOverf[$i]['pmwrkord_code'])
{
+
$orders_affected[$BilagOverf[$i]['pmwrkord_code']] = true;
+
$Belop = sprintf("%01.2f",
$BilagOverf[$i]['ordrebelop'])*100;
if ($BilagOverf[$i]['dimd'] % 2 == 0)
@@ -698,6 +701,8 @@
if($oRsUnderbilag[$i]['pmwrkord_code'])
{
+
$orders_affected[$BilagOverf[$i]['pmwrkord_code']] = true;
+
//Oppdater beløp på arbeidsordre
if ($download=='on' &&
!$pre_transfer)
{
@@ -916,6 +921,8 @@
if($transfer_ok)
{
+
$this->soXport->update_actual_cost_from_archive($this->orders_affected);
+
$this->db->transaction_commit();
$message = 'Ankomstregistrering:
periode: '.$periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' .
$Filnavn;
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-05-04 11:58:05 UTC (rev 9279)
@@ -42,6 +42,7 @@
var $client_code = 14;
protected $connection = false;
protected $global_lock = false;
+ protected $orders_affected = array();
function __construct()
{
@@ -456,6 +457,8 @@
if($line['pmwrkord_code'])
{
+
$orders_affected[$line['pmwrkord_code']] = true;
+
$Belop = sprintf("%01.2f",
$line['ordrebelop'])*100;
if ($line['dimd'] % 2 == 0)
@@ -732,6 +735,8 @@
if($line['order_id'])
{
+ $orders_affected[$line['order_id']] =
true;
+
//Oppdater beløp på arbeidsordre
if ($download=='on')
{
@@ -891,6 +896,8 @@
if($transfer_ok)
{
+
$this->soXport->update_actual_cost_from_archive($this->orders_affected);
+
if ( !$this->global_lock )
{
$this->db->transaction_commit();
Modified: branches/Version-1_0-branch/property/js/portico/ajax_workorder_edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/portico/ajax_workorder_edit.js
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/js/portico/ajax_workorder_edit.js
2012-05-04 11:58:05 UTC (rev 9279)
@@ -80,6 +80,10 @@
});
$("#workorder_cancel").live("submit", function(e){
+ if($("#lean").val() == 0)
+ {
+ return;
+ }
e.preventDefault();
parent.closeJS_remote();
// parent.hide_popupBox();
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-05-04
11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-05-04
11:58:05 UTC (rev 9279)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.644';
+ $setup_info['property']['version'] = '0.9.17.645';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -505,6 +505,7 @@
'deviation' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True),
'act_mtrl_cost' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'act_vendor_cost' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
+ 'actual_cost' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'addition' => array('type' => 'int','precision'
=> '4','nullable' => True),
'rig_addition' => array('type' =>
'int','precision' => '4','nullable' => True),
'account_id' => array('type' =>
'varchar','precision' => '20','nullable' => True),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -6303,7 +6303,7 @@
'ecodimb' =>
$GLOBALS['phpgw_setup']->oProc->f('ecodimb'),
'user_id' =>
$GLOBALS['phpgw_setup']->oProc->f('account_id'),
'role_id' =>
$GLOBALS['phpgw_setup']->oProc->f('responsibility_id') == 2 ? 3 : 2,
- 'default_user' =>
$GLOBALS['phpgw_setup']->oProc->f('responsibility_id') == 2 ? 1 : '',
+ 'default_user' =>
$GLOBALS['phpgw_setup']->oProc->f('responsibility_id') == 2 ? 1 : '',
'active_from' =>
$GLOBALS['phpgw_setup']->oProc->f('active_from'),
'active_to' =>
$GLOBALS['phpgw_setup']->oProc->f('active_to'),
'created_on' =>
$GLOBALS['phpgw_setup']->oProc->f('created_on'),
@@ -6350,3 +6350,48 @@
}
}
+ /**
+ * Update property version from 0.9.17.643 to 0.9.17.644
+ * Add view on fm_ecobilag
+ */
+ $test[] = '0.9.17.644';
+ function property_upgrade0_9_17_644()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','actual_cost',array(
+ 'type' => 'decimal',
+ 'precision' => '20',
+ 'scale' => '2',
+ 'nullable' => true,
+ 'default' => '0.00'
+ )
+ );
+
+ $sql = 'SELECT order_id, actual_cost FROM
fm_orders_actual_cost_view';
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ $orders = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $orders[] = array
+ (
+ 'order_id' =>
$GLOBALS['phpgw_setup']->oProc->f('order_id'),
+ 'actual_cost' =>
$GLOBALS['phpgw_setup']->oProc->f('actual_cost')
+ );
+ }
+ foreach ($orders as $order)
+ {
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE
fm_workorder SET actual_cost = '{$order['actual_cost']}' WHERE id =
'{$order['order_id']}'",__LINE__,__FILE__);
+ }
+
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.645';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -277,8 +277,6 @@
if($so->create_account($reg_info['reg_lid'],$reg_info['reg_info']))
{
$info =
unserialize(base64_decode($reg_info['reg_info']));
- unset($info['passwd']);
- unset($info['passwd_confirm']);
$body = <<<HTML
@@ -289,10 +287,16 @@
<a href='$url'>Login.</a>
+ User: {$reg_info['reg_lid']}
+ Password:{$info['passwd']}
+
If you did not request this account, simply ignore this message.
{$support_email_text} {$support_email}
HTML;
+ unset($info['passwd']);
+ unset($info['passwd_confirm']);
+
try
{
// $info['email'] =
'address@hidden';
Modified: branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -79,43 +79,70 @@
. time() . "', reg_info='" .
base64_encode(serialize($fields))
. "' WHERE
reg_lid='$account_lid'",__LINE__,__FILE__);
- if ($this->config['activate_account'] ==
'pending_approval' || $this->config['activate_account'] =='immediately')
+ if ($this->config['activate_account'] ==
'pending_approval' )
{
return $this->reg_id;
}
- $smtp = createobject('phpgwapi.send');
+ if($this->config['activate_account'] =='immediately')
+ {
+ $url =
$GLOBALS['phpgw']->link('/login.php',array( 'logindomain' =>
$GLOBALS['phpgw_info']['user']['domain']),false,true);
+ $body = <<<HTML
- $GLOBALS['phpgw']->template->set_file(array(
- 'message' => 'confirm_email.tpl'
- ));
+ Hi {$info['n_given']} {$info['n_family']},
- if ($fields['n_given'])
- {
- $GLOBALS['phpgw']->template->set_var
('firstname', $fields['n_given'] . ' ');
+ This is a confirmation email for your new account on
{$GLOBALS['phpgw_info']['server']['system_name']}::{$GLOBALS['phpgw_info']['server']['site_title']}.
+ Click on the following link to log into your account.
+
+ <a href='$url'>Login.</a>
+
+ User: {$account_lid}
+ Password:{$fields['passwd']}
+
+ If you did not request this account, simply ignore this message.
+ {$support_email_text} {$support_email}
+
+HTML;
+ $body = nl2br($body);
}
-
- if ($fields['n_family'])
+ else
{
- $GLOBALS['phpgw']->template->set_var
('lastname', $fields['n_family'] . ' ');
- }
+ $GLOBALS['phpgw']->template->set_file(array(
+ 'message' => 'confirm_email.tpl'
+ ));
- $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.step4', 'reg_id'=> $this->reg_id, 'logindomain' =>
$_REQUEST['logindomain']),false,true);
-
$GLOBALS['phpgw']->template->set_var('activate_url',"</br><a
href='$url'>Link.</a></br>");
+ if ($fields['n_given'])
+ {
+ $GLOBALS['phpgw']->template->set_var
('firstname', $fields['n_given'] . ' ');
+ }
- if ($this->config['support_email'])
- {
- $GLOBALS['phpgw']->template->set_var
('support_email_text', lang ('Report all problems and abuse to'));
- $GLOBALS['phpgw']->template->set_var
('support_email', $this->config['support_email']);
+ if ($fields['n_family'])
+ {
+ $GLOBALS['phpgw']->template->set_var
('lastname', $fields['n_family'] . ' ');
+ }
+
+
+ $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.step4', 'reg_id'=> $this->reg_id, 'logindomain' =>
$_REQUEST['logindomain']),false,true);
+
$GLOBALS['phpgw']->template->set_var('activate_url',"</br><a
href='$url'>Link.</a></br>");
+
+ if ($this->config['support_email'])
+ {
+ $GLOBALS['phpgw']->template->set_var
('support_email_text', lang ('Report all problems and abuse to'));
+ $GLOBALS['phpgw']->template->set_var
('support_email', $this->config['support_email']);
+ }
+
+ $body =
$GLOBALS['phpgw']->template->fp('out','message');
}
$subject = $this->config['subject_confirm'] ?
lang($this->config['subject_confirm']) : lang('Account registration');
$noreply = $this->config['mail_nobody'] ? ('No reply <'
. $this->config['mail_nobody'] . '>') : ('No reply <noreply@' .
$GLOBALS['phpgw_info']['server']['hostname'] . '>');
+ $smtp = createobject('phpgwapi.send');
+
try
{
-
$smtp->msg('email',$fields['email'],$subject,$GLOBALS['phpgw']->template->fp('out','message'),'','','',$noreply,'','html');
+
$smtp->msg('email',$fields['email'],$subject,$body,'','','',$noreply,'','html');
}
catch(Exception $e)
{
Modified: branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-05-04 11:56:57 UTC (rev 9278)
+++ branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-05-04 11:58:05 UTC (rev 9279)
@@ -228,57 +228,6 @@
$this->template->set_block ('form',
'other_fields_proto', 'other_fields_list');
reset ($this->fields);
-/*
- $this->fields['loc1'] = array
- (
- 'field_name' => 'loc1',
- 'field_text' => 'Eiendom',
- 'field_type' => 'location',
- 'field_values' => '',
- 'field_required' => 'Y',
- 'field_order' => 0
- );
-
- $this->fields['loc2'] = array
- (
- 'field_name' => 'loc2',
- 'field_text' => 'Bygning',
- 'field_type' => 'location',
- 'field_values' => '',
- 'field_required' => 'N',
- 'field_order' => 0
- );
-
- $this->fields['loc3'] = array
- (
- 'field_name' => 'loc3',
- 'field_text' => 'Etasje',
- 'field_type' => 'location',
- 'field_values' => '',
- 'field_required' => 'N',
- 'field_order' => 0
- );
-
- $this->fields['loc4'] = array
- (
- 'field_name' => 'loc4',
- 'field_text' => 'Sone',
- 'field_type' => 'location',
- 'field_values' => '',
- 'field_required' => 'N',
- 'field_order' => 0
- );
-
- $this->fields['loc5'] = array
- (
- 'field_name' => 'loc5',
- 'field_text' => 'Rom',
- 'field_type' => 'location',
- 'field_values' => '',
- 'field_required' => 'N',
- 'field_order' => 0
- );
-*/
//_debug_array($this->fields);
foreach ($this->fields as $num => $field_info)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9279] Merge 9276:9278 from trunk,
Sigurd Nes <=