[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9426] Merge 9418:9425 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9426] Merge 9418:9425 from trunk |
|
Date: |
Wed, 23 May 2012 09:45:30 +0000 |
Revision: 9426
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9426
Author: sigurdne
Date: 2012-05-23 09:45:30 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Merge 9418:9425 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
branches/Version-1_0-branch/property/js/tinybox2/style.css
branches/Version-1_0-branch/property/js/yahoo/property.js
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,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417
+
/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,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425
Modified: branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -45,6 +45,7 @@
public function __construct()
{
+ $GLOBALS['phpgw']->translation->add_app('property');
$this->location_id =
phpgw::get_var('location_id', 'int', 'REQUEST', 0);
$location_info =
$GLOBALS['phpgw']->locations->get_name($this->location_id);
$this->acl_location =
$location_info['location'];
@@ -606,11 +607,11 @@
(
'menuaction' =>
'frontend.uihelpdesk.add_ticket',
'noframework' => 1,
- 'target'
=> '_lightbox',
+// 'target'
=> '_blank',
+ 'target'
=> '_tinybox',
'p_entity_id' =>
$this->entity_id,
'p_cat_id'
=> $this->cat_id,
'type'
=> $this->type,
- 'target'
=> '_blank',
'bypass'
=> true,
'origin'
=> ".{$this->type}.{$this->entity_id}.{$this->cat_id}",
)),
@@ -618,6 +619,8 @@
);
}
+ $GLOBALS['phpgw']->js->validate_file('tinybox2',
'packed' , 'property');
+
$GLOBALS['phpgw']->css->add_external_file('property/js/tinybox2/style.css');
$jasper = execMethod('property.sojasper.read',
array('location_id' =>
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
$this->acl_location)));
@@ -877,7 +880,6 @@
public function view()
{
- $GLOBALS['phpgw']->translation->add_app('property');
$bo = & $this->bo;
$id = phpgw::get_var('id');
$values = $bo->read_single(array('id' => $id,
'entity_id' => $this->entity_id, 'cat_id' => $this->cat_id, 'view' => true));
Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -48,6 +48,7 @@
phpgwapi_cache::session_set('frontend','tab',$GLOBALS['phpgw']->locations->get_id('frontend','.ticket'));
parent::__construct();
$this->location_code =
$this->header_state['selected_location'];
+ $GLOBALS['phpgw']->translation->add_app('property');
}
public function index()
@@ -517,12 +518,36 @@
public function add_ticket()
{
+
+ $values = phpgw::get_var('values');
+
+ $bypass = phpgw::get_var('bypass',
'bool');
+ if($bypass)
+ {
+ $boadmin_entity =
CreateObject('property.boadmin_entity');
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+
+ if($p_entity_id && $p_cat_id)
+ {
+ $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
+
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
+
+ $id = phpgw::get_var('p_num');
+ $item =
execMethod('property.boentity.read_single',(array('id' => $id, 'entity_id' =>
$p_entity_id, 'cat_id' => $p_cat_id, 'view' => true)));
+ }
+
+ }
+
$bo = CreateObject('property.botts',true);
$boloc = CreateObject('property.bolocation',true);
$location_details =
$boloc->read_single($this->location_code, array('noattrib' => true));
- $values = phpgw::get_var('values');
+
$missingfields = false;
$msglog = array();
@@ -668,10 +693,11 @@
'locationdesc' =>
$values['locationdesc'],
'description' =>
$values['description'],
'noform' => $noform,
- 'category_list' => $category_list
+ 'category_list' => $category_list,
+ 'custom_attributes' => array('attributes'
=> $item['attributes']),
);
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','helpdesk'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','helpdesk','attributes_view'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('add_ticket' => $data));
}
Modified: branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
2012-05-23 09:45:30 UTC (rev 9426)
@@ -50,7 +50,7 @@
</script>
</xsl:when>
</xsl:choose>
- <h2>Ny skademelding</h2>
+ <h2>Ny melding</h2>
<form ENCTYPE="multipart/form-data" name="form" method="post"
action="{form_action}">
<table cellpadding="0" cellspacing="0" width="100%">
<xsl:choose>
@@ -66,7 +66,7 @@
<xsl:if test="noform != 1">
<tr>
- <td class="th_text" valign="top">
+ <td class="th_text" valign="top">
<xsl:value-of select="php:function('lang',
'category')" />
</td>
<td class="th_text" valign="top">
@@ -126,6 +126,17 @@
<input type="submit" name="values[save]"
value="{$lang_send}" title='{$lang_send}'/>
</td>
</tr>
+ <tr>
+ <td>
+ </td>
+ <td >
+ <li>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
+ <hr/>
+ </li>
+ </td>
+ </tr>
+
</xsl:if>
</table>
</form>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2012-05-23
07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2012-05-23
09:45:30 UTC (rev 9426)
@@ -42,7 +42,7 @@
}
if ($sender == '')
{
- $sender =
$GLOBALS['phpgw_info']['user']['fullname'].'
<'.$GLOBALS['phpgw_info']['user']['preferences']['email']['address'].'>';
+ $sender =
$GLOBALS['phpgw_info']['user']['fullname'];
}
switch( $service )
@@ -67,6 +67,7 @@
else
{
$smtp->From = $from_array[0];
+ $smtp->FromName = $sender;
}
/*
if(strpos($to,','))
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -516,7 +516,7 @@
$sum_workorder_calculation+=
$workorder_data[$i]['calculation'];
$sum_workorder_actual_cost+=
$workorder_data[$i]['actual_cost'];
-
$values['workorder_budget'][$i]['title']=$workorder_data[$i]['title'];
+
$values['workorder_budget'][$i]['title']=htmlentities($workorder_data[$i]['title']);
$values['workorder_budget'][$i]['workorder_id']=$workorder_data[$i]['workorder_id'];
$values['workorder_budget'][$i]['contract_sum']=(float)number_format($workorder_data[$i]['contract_sum']
* (1+(((int)$workorder_data[$i]['addition_percentage'])/100)), 2, ',', '');
$values['workorder_budget'][$i]['budget']=
$workorder_data[$i]['budget'];
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -2213,11 +2213,11 @@
$where = 'AND';
}
- $sql = "SELECT bilagsnr,bilagsnr_ut, org_name,
currency, kreditnota, fm_ecoart.descr as type, godkjentbelop, oppsynsigndato,
saksigndato,budsjettsigndato"
+ $sql = "SELECT bilagsnr,bilagsnr_ut, org_name,
currency, kreditnota, fm_ecoart.descr as type, godkjentbelop, forfallsdato,
oppsynsigndato, saksigndato,budsjettsigndato"
." FROM fm_ecobilag"
." {$this->join} fm_vendor ON fm_vendor.id =
fm_ecobilag.spvend_code"
." {$this->join} fm_ecoart ON fm_ecoart.id =
fm_ecobilag.artid"
- ." $filtermethod $querymethod ORDER BY bilagsnr";
+ ." $filtermethod $querymethod ORDER BY forfallsdato
ASC, bilagsnr ASC";
$lang_voucer = lang('voucher id');
$lang_vendor = lang('vendor');
@@ -2225,6 +2225,7 @@
$lang_parked = lang('parked');
$lang_type = lang('type');
$lang_approved_amount = lang('approved amount');
+ $lang_payment_date = lang('payment date');
$this->db->query($sql,__LINE__,__FILE__);
$values = array();
@@ -2238,6 +2239,7 @@
$values[$bilagsnr]['currency']
= $this->db->f('currency');
$values[$bilagsnr]['kreditnota']
= $this->db->f('kreditnota');
$values[$bilagsnr]['type']
= $this->db->f('type');
+ $values[$bilagsnr]['payment_date']
= $this->db->f('forfallsdato');
if(isset($values[$bilagsnr]['godkjentbelop']))
{
@@ -2268,11 +2270,13 @@
$voucers = array();
foreach ($values as $bilagsnr => $entry)
{
+ $payment_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],strtotime($entry['payment_date']));
$status = $entry['status'];
sort($status);
$voucher_id = $entry['bilagsnr_ut'] ?
$entry['bilagsnr_ut'] : $bilagsnr;
- $name = sprintf("{$lang_voucer}:% 8s |
{$lang_vendor}:% 20s | {$lang_currency}:% 3s | {$lang_parked}: % 1s |
{$lang_type}: % 12s | {$lang_approved_amount}: % 19s | Status: % 1s",
+ $name = sprintf("{$lang_payment_date}: % 10s |
{$lang_voucer}:% 8s | {$lang_vendor}: % 50s | {$lang_currency}: % 3s |
{$lang_parked}: % 1s | {$lang_type}: % 12s | {$lang_approved_amount}: % 19s |
Status: % 1s",
+ $payment_date,
$voucher_id,
trim(strtoupper($entry['org_name'])),
$entry['currency'],
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-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -1408,6 +1408,7 @@
if($this->db->next_record())
{
$sql = "UPDATE
fm_project_budget SET budget = budget + {$entry['budget']} WHERE project_id =
{$new_project_id} AND year = {$entry['year']}";
+
$this->db->query($sql,__LINE__,__FILE__);
}
else
{
@@ -1445,6 +1446,7 @@
{
$historylog->add('B',$new_project_id,
$new_budget_new_project, $old_budget_new_project);
}
+
$this->db->query("UPDATE fm_workorder SET
project_id = {$new_project_id} WHERE project_id =
{$project['id']}",__LINE__,__FILE__);
$this->db->query("UPDATE fm_project SET reserve
= 0 WHERE reserve IS NULL AND id = {$new_project_id}" ,__LINE__,__FILE__);
$this->db->query("UPDATE fm_project SET budget
= {$new_budget_new_project}, reserve = reserve + {$reserve_old_project} WHERE
id = {$new_project_id}" ,__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -1379,6 +1379,12 @@
{
$_location_data =
$values['location_data'];
}
+ else if(isset($values['location']) &&
is_array($values['location']))
+ {
+ $location_code=implode("-",
$values['location']);
+ $values['extra']['view'] = true;
+ $_location_data =
$bolocation->read_single($location_code,$values['extra']);
+ }
else
{
if(isset($project['location_data']) &&
$project['location_data'])
Modified: branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2012-05-23 07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2012-05-23 09:45:30 UTC (rev 9426)
@@ -232,11 +232,14 @@
case 'int4':
// Check if
input starts with - (optional) and then only
// contains
numbers
+ /*
if(
preg_match('@^[-]?[0-9]+$@', $insert_value) !== 1 )
{
$val_errors[] = lang('Input for field "%1" is "%2", but should be int (%3)',
$field_info->name, $insert_value, $file);
}
+ */
+ $insert_value =
$insert_value ? (int) $insert_value : '';
break;
case 'numeric':
$insert_value =
str_replace( ',', '.', $insert_value);
Modified: branches/Version-1_0-branch/property/js/tinybox2/style.css
===================================================================
--- branches/Version-1_0-branch/property/js/tinybox2/style.css 2012-05-23
07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/js/tinybox2/style.css 2012-05-23
09:45:30 UTC (rev 9426)
@@ -1,4 +1,4 @@
-body {font:12px/1.4 Verdana,Arial; background:#eee; height:100%; margin:25px
0; padding:0}
+/*body {font:12px/1.4 Verdana,Arial; background:#eee; height:100%; margin:25px
0; padding:0}
h1 {font:30px 'Trebuchet MS',Verdana; margin:0}
h2 {font-size:12px; font-weight:normal; font-style:italic; margin:0 0 20px}
p {margin:0 0 14px}
@@ -7,7 +7,7 @@
ul {list-style:none; margin-bottom:12px; padding:0}
li {font:14px Georgia,Verdana; margin-bottom:4px; padding:8px 10px 9px;
border:1px solid #ccc; background:#eee; cursor:pointer}
li:hover {border:1px solid #bbb; background:#e3e3e3}
-
+*/
.tbox {position:absolute; display:none; padding:14px 17px; z-index:900}
.tinner {padding:15px; -moz-border-radius:5px; border-radius:5px;
background:#fff url(images/preload.gif) no-repeat 50% 50%; border-right:1px
solid #333; border-bottom:1px solid #333}
.tmask {position:absolute; display:none; top:0px; left:0px; height:100%;
width:100%; background:#000; z-index:800}
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2012-05-23
07:07:10 UTC (rev 9425)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2012-05-23
09:45:30 UTC (rev 9426)
@@ -676,6 +676,12 @@
//console.log(sUrl); //
firebug
showlightbox(sUrl);
}
+ else
if(substr_count(sUrl,'target=_tinybox')>0)
+ {
+ //have to be defined as
a local function. Example in invoice.list_sub.js
+ //console.log(sUrl); //
firebug
+ showtinybox(sUrl);
+ }
else
{
window.open(sUrl,'_self');
@@ -1470,6 +1476,25 @@
}
return array_result;
}
+
+ this.showtinybox = function(sUrl)
+ {
+ TINY.box.show({
+ iframe:sUrl,
+ boxid:'frameless',
+ width:750,
+ height:450,
+ fixed:false,
+ maskid:'darkmask',
+ maskopacity:40,
+ mask:true,
+ animate:true,
+ close: true,
+ // closejs:function(){closeJS_local()}
+ });
+ }
+
+
//----------------------------------------------------------------------------------------
CreateLoading();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9426] Merge 9418:9425 from trunk,
Sigurd Nes <=