[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9538] Merge 9529:9537 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9538] Merge 9529:9537 from trunk |
|
Date: |
Sat, 09 Jun 2012 12:09:33 +0000 |
Revision: 9538
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9538
Author: sigurdne
Date: 2012-06-09 12:09:33 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Merge 9529:9537 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/invoice2.xsl
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,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528
+
/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,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537
Modified:
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
2012-06-08 12:37:15 UTC (rev 9537)
+++
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
2012-06-09 12:09:33 UTC (rev 9538)
@@ -123,6 +123,11 @@
});
});
+ $("#location_type_category").change(function () {
+ var level = $("#location_type").val();
+ update_loc(level);
+ });
+
//update part of town category based on district
$("#district_id").change(function () {
var district_id = $(this).val();
@@ -325,6 +330,59 @@
});
});
+
+function update_loc(level)
+{
+ var oArgs = {
+ menuaction:'property.bolocation.read',
+ cat_id:$("#location_type_category").val(),
+ district_id:$("#district_id").val(),
+ part_of_town_id:$("#part_of_town_id").val(),
+ location_code:$("#loc1").val(),
+ type_id:level
+ };
+
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "<option value=''>Velg</option>";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data) {
+ if( data != null)
+ {
+ var obj = data;
+
+ $.each(obj, function(i)
+ {
+ htmlString += "<option
value='" + obj[i].location_code + "'>" + obj[i].location_code + " " +
obj[i]["loc"+level+"_name"] + "</option>";
+ });
+
+ $("#loc" + level).html( htmlString );
+ if(level == 1)
+ {
+ $("#loc2").html( "<option value=''>Velg
Eiendom først</option>" );
+ }
+ if(level == 2)
+ {
+ $("#loc1").html( "" );
+ }
+ }
+ else
+ {
+ htmlString = "<option>Ingen</option>";
+ $("#loc1").html( htmlString );
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+
+
+
+}
+
function get_table_def()
{
var oArgs = {
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -231,7 +231,7 @@
'ix' => array(),
'uc' => array()
),
- 'controller_control_item_option', array(
+ 'controller_control_item_option' => array(
'fd' => array(
'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => false),
'option_value' => array('type' =>
'varchar','precision' => '255','nullable' => False),
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -62,6 +62,7 @@
changeMonth: true,
changeYear: true,
showOn: "button",
+ showButtonPanel:true,
buttonImage: "{$this->img_cal}",
buttonText: "{$this->lang_select_date}",
buttonImageOnly: true
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -676,10 +676,13 @@
function read($data = array())
{
//_debug_array($data);
+ $type_id = isset($data['type_id']) && $data['type_id']
? $data['type_id'] : $this->type_id;
+ $allrows = isset($data['allrows']) && $data['allrows']
? $data['allrows'] : $this->allrows;
+
$locations = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'type_id' => $data['type_id'],
+ 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'type_id' => $type_id,
'lookup_tenant'=>$data['lookup_tenant'],'lookup'=>$data['lookup'],
-
'district_id'=>$this->district_id,'allrows'=>$data['allrows'],
+
'district_id'=>$this->district_id,'allrows'=>$allrows,
'status'=>$this->status,'part_of_town_id'=>$this->part_of_town_id,'dry_run'=>$data['dry_run'],
'location_code' => $this->location_code,
'filter_role_on_contact' => $data['filter_role_on_contact'], 'role_id' =>
$data['role_id'],
'results' => $data['results']));
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2012-06-08
12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2012-06-09
12:09:33 UTC (rev 9538)
@@ -720,12 +720,15 @@
);
}
-
$menus['navigation']['helpdesk']['children']['response_template'] = array
+ if(isset($GLOBALS['phpgw_info']['user']['apps']['sms']))
+ {
+
$menus['navigation']['helpdesk']['children']['response_template'] = array
(
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'response_template') ),
'text' => lang('response template'),
'image' => array('property',
'helpdesk')
);
+ }
if ( $acl->check('.project', PHPGW_ACL_READ,
'property') )
{
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -1530,9 +1530,19 @@
function read_single_eav($data, $values = array())
{
- $id = (int)$data['id'];
- $this->db->query("SELECT * FROM fm_bim_item WHERE id =
{$id}");
+ if(isset($data['guid']) && $data['guid'])
+ {
+ $sql = "SELECT * FROM fm_bim_item WHERE guid =
'{$data['guid']}'";
+ }
+ else
+ {
+ $id = (int)$data['id'];
+ $location_id =
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
".{$this->type}.{$data['entity_id']}.{$data['cat_id']}");
+ $sql = "SELECT fm_bim_item.* FROM fm_bim_item
{$this->join} fm_bim_type ON fm_bim_type.id = fm_bim_item.type WHERE
fm_bim_item.id = {$id} AND location_id = $location_id";
+ }
+ $this->db->query($sql,__LINE__,__FILE__);
+
if($this->db->next_record())
{
$values['id'] = $id;
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -2304,8 +2304,36 @@
if($data['query'])
{
- $query = (int) $data['query'];
- $querymethod = " $where (bilagsnr = {$query} OR
bilagsnr_ut = {$query})";
+ switch ($data['criteria'])
+ {
+ case 'voucher_id':
+ $query = (int) $data['query'];
+ $querymethod = " $where
(bilagsnr = {$query} OR bilagsnr_ut = {$query})";
+ break;
+
+ case 'invoice_id':
+ $query = $data['query'];
+ $querymethod = " $where
fakturanr = '{$query}'";
+ break;
+
+ case 'order_id':
+ $query = $data['query'];
+ $querymethod = " $where
pmwrkord_code = '{$query}'";
+ break;
+
+ case 'vendor_id':
+ $query = (int) $data['query'];
+ $querymethod = " $where
(spvend_code = {$query} OR org_name {$this->like} '%{$data['query']}%')";
+ break;
+
+ case 'b_account':
+ $query = $data['query'];
+ $querymethod = " $where
spbudact_code = '{$query}'";
+ break;
+
+ default:
+ }
+
$where = 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
2012-06-09 12:09:33 UTC (rev 9538)
@@ -352,6 +352,35 @@
'values' => json_encode($datatable)
);
+ $criteria_list = array
+ (
+ array
+ (
+ 'id' => 'voucher_id',
+ 'name' => lang('voucher id'),
+ ),
+ array
+ (
+ 'id' => 'invoice_id',
+ 'name' => lang('invoice number'),
+ ),
+ array
+ (
+ 'id' => 'vendor_id',
+ 'name' => lang('vendor'),
+ ),
+ array
+ (
+ 'id' => 'order_id',
+ 'name' => lang('order id'),
+ ),
+ array
+ (
+ 'id' => 'b_account',
+ 'name' => lang('budget account'),
+ ),
+ );
+
$data = array
(
'td_count'
=> '""',
@@ -379,6 +408,7 @@
'janitor_list' =>
array('options' => $janitor_list),
'supervisor_list' =>
array('options' => $supervisor_list),
'budget_responsible_list' =>
array('options' => $budget_responsible_list),
+
'criteria_list' =>
array('options' => $criteria_list)
),
'filter_invoice'
=> array
(
@@ -456,9 +486,10 @@
$janitor_lid =
phpgw::get_var('janitor_lid', 'string');
$supervisor_lid =
phpgw::get_var('supervisor_lid', 'string');
$budget_responsible_lid =
phpgw::get_var('budget_responsible_lid', 'string');
+ $criteria =
phpgw::get_var('criteria', 'string');
$query =
phpgw::get_var('query', 'string');
- $vouchers = $this->bo->get_vouchers(array('janitor_lid'
=> $janitor_lid, 'supervisor_lid' => $supervisor_lid, 'budget_responsible_lid'
=>$budget_responsible_lid, 'query' => $query ));
+ $vouchers = $this->bo->get_vouchers(array('janitor_lid'
=> $janitor_lid, 'supervisor_lid' => $supervisor_lid, 'budget_responsible_lid'
=>$budget_responsible_lid, 'criteria' => $criteria, 'query' => $query ));
return $vouchers;
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-06-09 12:09:33 UTC (rev 9538)
@@ -846,11 +846,11 @@
$descr = '';
if($line['line_text'])
{
- $descr = $line['line_text'];
+ $descr =
substr($line['line_text'],0,60);
}
else if ($line['order_id'])
{
- $descr = $order_info['title'];
+ $descr =
substr($order_info['title'],0,60);
}
$accountline[] = array
Modified: branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
===================================================================
--- branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-06-09 12:09:33 UTC (rev 9538)
@@ -179,12 +179,16 @@
function update_voucher_filter(){
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
+ var oArgs = {
+ menuaction:'property.uiinvoice2.get_vouchers',
+ janitor_lid: $("#janitor_lid").val(),
+ supervisor_lid: $("#supervisor_lid").val(),
+ budget_responsible_lid: $("#budget_responsible_lid").val(),
+ criteria: $("#criteria").val(),
+ query: $("#query").val()
+ };
+
var requestUrl = phpGWLink('index.php', oArgs, true);
var htmlString = "";
@@ -192,7 +196,7 @@
$.ajax({
type: 'POST',
dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
+ url: requestUrl,
success: function(data) {
if( data != null)
{
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-06-08
12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-06-09
12:09:33 UTC (rev 9538)
@@ -1353,6 +1353,7 @@
reset property no Tilbakestill
residential environment property no Bo-miljø
residual demand property no Rest behov
+reponse template property no SMS::mal for standardtekster
responsible property no Ansvarlig
responsibility property no Ansvar
responsible matrix property no Ansvarsmatrise
@@ -1416,6 +1417,7 @@
search by location_code. to show all entries, empty all fields and press the
submit button again property no Søk etter lokaliseringskode
search by property property no søk ved eiendom
search by seksjon. to show all entries, empty all fields and press the submit
button again property no Søk etter Seksjon
+search criteria property no Søkekriterie
search for history at this location property no søk etter
historikk for denne lokaliseringen
search for investment entries property no søk etter
investeringsposter
search for paid invoices property no søk etter betalte bilag
Modified: branches/Version-1_0-branch/property/templates/base/invoice2.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-06-08 12:37:15 UTC (rev 9537)
+++ branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-06-09 12:09:33 UTC (rev 9538)
@@ -169,8 +169,11 @@
<xsl:value-of select="php:function('lang', 'budget
responsible')" />
</td>
<td>
- <xsl:value-of select="php:function('lang', 'voucher
id')" />
+ <xsl:value-of select="php:function('lang', 'search
criteria')" />
</td>
+ <td>
+ <xsl:value-of select="php:function('lang', 'search')" />
+ </td>
</tr>
<tr id="filters">
<td>
@@ -189,6 +192,11 @@
</select>
</td>
<td>
+ <select id="criteria" name="criteria">
+ <xsl:apply-templates select="criteria_list/options"/>
+ </select>
+ </td>
+ <td>
<input type="text" name="query" id="query"/>
</td>
<td>
@@ -277,28 +285,6 @@
</div>
</td>
</tr>
-<!--
- <tr>
- <td>
- <xsl:value-of select="php:function('lang',
'amount')" />
- </td>
- <td>
- <div id="amount">
- <xsl:value-of
select="voucher_info/generic/amount"/>
- </div>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="php:function('lang',
'approved amount')" />
- </td>
- <td>
- <div id="approved_amount">
- <xsl:value-of
select="voucher_info/generic/approved_amount"/>
- </div>
- </td>
- </tr>
--->
<tr class ='row_on'>
<td>
<xsl:value-of select="php:function('lang',
'currency')" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9538] Merge 9529:9537 from trunk,
Sigurd Nes <=