|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [8969] property: invoice handling |
| Date: | Wed, 07 Mar 2012 13:31:39 +0000 |
Revision: 8969
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8969
Author: sigurdne
Date: 2012-03-07 13:31:38 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
property: invoice handling
Modified Paths:
--------------
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/js/yahoo/invoice.index.js
trunk/property/js/yahoo/invoice.list_sub.js
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2012-03-06 14:48:21 UTC (rev
8968)
+++ trunk/property/inc/class.boinvoice.inc.php 2012-03-07 13:31:38 UTC (rev
8969)
@@ -75,9 +75,9 @@
if(!phpgw::get_var('paid', 'bool'))
{
- $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
+ // $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
}
- else
+ // else
{
$user_lid = isset($_REQUEST['user_lid']) ?
$user_lid : 'all';
}
@@ -127,11 +127,11 @@
$this->district_id =
isset($data['district_id'])?$data['district_id']:'';
}
- function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id=0,
$invoice_id = '')
+ function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='',
$invoice_id = '')
{
if(!phpgw::get_var('paid', 'bool'))
{
- $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
+// $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
}
$start_date =
$this->bocommon->date_to_timestamp($start_date);
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-03-06 14:48:21 UTC (rev
8968)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-03-07 13:31:38 UTC (rev
8969)
@@ -174,7 +174,7 @@
$no_q = false;
if ($voucher_id)
{
- $filtermethod = " WHERE bilagsnr = " .
(int)$voucher_id . " OR bilagsnr_ut = '{$voucher_id}' OR spvend_code = ".
(int)$query;
+ $filtermethod = " WHERE bilagsnr = " .
(int)$voucher_id . " OR bilagsnr_ut = '{$voucher_id}'";// OR spvend_code = ".
(int)$query;
$no_q = true;
}
@@ -190,17 +190,28 @@
$querymethod = " $where ( spvend_code =
{$query} OR bilagsnr = {$query})";
}
+
$sql = "SELECT bilagsnr, bilagsnr_ut, count(bilagsnr)
as invoice_count, sum(belop) as belop, sum(godkjentbelop) as
godkjentbelop,spvend_code,fakturadato FROM $table $join_tables $filtermethod
$querymethod GROUP BY periode,
bilagsnr,bilagsnr_ut,spvend_code,fakturadato,oppsynsigndato,saksigndato,budsjettsigndato";
$sql2 = "SELECT DISTINCT bilagsnr FROM $table
$join_tables $filtermethod $querymethod";
-//_debug_array($sql);
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->total_records = $this->db->num_rows();
- $sql3 = "SELECT sum(godkjentbelop) as sum_amount FROM
$table $join_tables $filtermethod $querymethod";
- $this->db->query($sql3,__LINE__,__FILE__);
- $this->db->next_record();
- $this->sum_amount =
$this->db->f('sum_amount');
+
if($GLOBALS['phpgw_info']['server']['db_type']=='postgres')
+ {
+ $sql_count = 'SELECT count(bilagsnr) as cnt,
sum(godkjentbelop) AS sum_amount FROM (SELECT DISTINCT bilagsnr,
sum(godkjentbelop) as godkjentbelop '. substr($sql2,strripos($sql2,'FROM')) .'
GROUP BY bilagsnr) AS t';
+ $this->db->query($sql_count,__LINE__,__FILE__);
+ $this->db->next_record();
+ $this->total_records =
$this->db->f('cnt');
+ $this->sum_amount =
$this->db->f('sum_amount');
+ }
+ else
+ {
+ $this->db->query($sql2,__LINE__,__FILE__);
+ $this->total_records = $this->db->num_rows();
+ $sql3 = "SELECT sum(godkjentbelop) as
sum_amount FROM $table $join_tables $filtermethod $querymethod";
+ $this->db->query($sql3,__LINE__,__FILE__);
+ $this->db->next_record();
+ $this->sum_amount =
$this->db->f('sum_amount');
+ }
if(!$allrows)
{
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2012-03-06 14:48:21 UTC (rev
8968)
+++ trunk/property/inc/class.uiinvoice.inc.php 2012-03-07 13:31:38 UTC (rev
8969)
@@ -208,7 +208,7 @@
$vendor_id = phpgw::get_var('vendor_id',
'int');
$workorder_id = phpgw::get_var('workorder_id', 'int');
$loc1 = phpgw::get_var('loc1');
- $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : phpgw::get_var('voucher_id', 'int');
+ $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : phpgw::get_var('voucher_id');
$invoice_id = phpgw::get_var('invoice_id');
$b_account_class= phpgw::get_var('b_account_class',
'int');
@@ -297,7 +297,7 @@
."cat_id: '{$this->cat_id}',"
."user_lid:'{$this->user_lid}',"
."sub:'{$this->sub}',"
- // ."query:'{$this->query}',"
+ ."query:'{$this->query}',"
."paid:'{$paid}',"
."vendor_id:'{$vendor_id}',"
."workorder_id:'{$workorder_id}',"
@@ -374,6 +374,135 @@
'value' =>
lang('add')
),
array
+ ( // workorder link
+ 'type' =>
'link',
+ 'id' =>
'lnk_workorder',
+ 'url' => "",
+ 'value' =>
lang('Workorder ID'),
+ 'tab_index' =>
5,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // workorder box
+ 'name' =>
'workorder_id',
+ 'id' =>
'txt_workorder',
+ 'value' =>
$workorder_id,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 10,
+ 'tab_index' =>
6,
+ 'style' =>
'filter'
+ ),
+ array
+ ( //vendor link
+ 'type' =>
'link',
+ 'id' =>
'lnk_vendor',
+ 'url' =>
"Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'property.uilookup.vendor',
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+ 'value' =>
lang('Vendor'),
+ 'tab_index' =>
7,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Vendor box HIDDEN
+ 'name' =>
'vendor_name',
+ 'id' =>
'txt_vendor_name',
+ 'value' =>
"",
+ 'type' =>
'hidden',
+ 'size' => 10,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Vendor box
+ 'name' =>
'vendor_id',
+ 'id' =>
'txt_vendor',
+ 'value' =>
$vendor_id,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 10,
+ 'tab_index' =>
8,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Voucher link
+ 'type' =>
'link',
+ 'id' =>
'lnk_invoice',
+ 'url' => "",
+ 'value' =>
lang('invoice number'),
+ 'tab_index' =>
9,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Vendor box
+ 'name' =>
'invoice_id',
+ 'id' =>
'txt_invoice',
+ 'value' =>
$invoice_id,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 10,
+ 'tab_index' =>
10,
+ 'style' =>
'filter'
+ ),
+ array
+ (
+ 'type' =>
'link',
+ 'id' =>
'lnk_property',
+ 'url' =>
"Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'property.uilocation.index',
+
'lookup' => 1,
+
'type_id' => 1,
+
'lookup_name' => 0,
+
))."','Search','left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes')",
+ 'value' =>
lang('property'),
+ 'tab_index' =>
11,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // txt Facilities
Management
+ 'name' =>
'loc1_name',
+ 'id' =>
'txt_loc1_name',
+ 'value' =>
"",
+ 'type' =>
'hidden',
+ 'size' => 8,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // txt Facilities
Management
+ 'name' =>
'loc1',
+ 'id' =>
'txt_loc1',
+ 'value' =>
$loc1,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 8,
+ 'tab_index' =>
12,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Voucher link
+ 'type' =>
'link',
+ 'id' =>
'lnk_voucher',
+ 'url' => "",
+ 'value' =>
lang('Voucher ID'),
+ 'tab_index' =>
13,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // Voucher box
+ 'name' =>
'voucher_id',
+ 'id' =>
'txt_voucher',
+ 'value' =>
$voucher_id,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 8,
+ 'tab_index' =>
14,
+ 'style' =>
'filter'
+ ),
+ array
( //boton SEARCH
'id' =>
'btn_search',
'name' =>
'search',
@@ -381,6 +510,7 @@
'tab_index' =>
4,
'type' =>
'button'
),
+/*
array
( // TEXT IMPUT
'name' =>
'query',
@@ -391,6 +521,7 @@
'tab_index' =>
3,
'size' => 28
),
+*/
array
( // txtbox end_data
hidden
'name' =>
'end_date',
@@ -474,6 +605,7 @@
'id' =>
'txt_workorder',
'value' =>
$workorder_id,
'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
'size' => 10,
'tab_index' =>
6,
'style' =>
'filter'
@@ -506,6 +638,7 @@
'id' =>
'txt_vendor',
'value' =>
$vendor_id,
'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
'size' => 10,
'tab_index' =>
8,
'style' =>
'filter'
@@ -525,6 +658,7 @@
'id' =>
'txt_invoice',
'value' =>
$invoice_id,
'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
'size' => 10,
'tab_index' =>
10,
'style' =>
'filter'
@@ -560,6 +694,7 @@
'id' =>
'txt_loc1',
'value' =>
$loc1,
'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
'size' => 8,
'tab_index' =>
12,
'style' =>
'filter'
@@ -579,6 +714,7 @@
'id' =>
'txt_voucher',
'value' =>
$voucher_id,
'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
'size' => 8,
'tab_index' =>
14,
'style' =>
'filter'
@@ -650,7 +786,7 @@
'cat_id'
=> $this->cat_id,
'user_lid'
=> $this->user_lid,
'sub'
=> $this->sub,
- // 'query'
=> $this->query,
+ 'query'
=> $this->query,
// 'start'
=> $this->start,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
@@ -1521,7 +1657,7 @@
{
$paid = phpgw::get_var('paid', 'bool');
$values = phpgw::get_var('values');
- $voucher_id = phpgw::get_var('voucher_id', 'int');
+ $voucher_id = phpgw::get_var('voucher_id');
$datatable = array();
@@ -1576,7 +1712,7 @@
array
( // boton exportar
'type' => 'button',
- 'id' => 'btn_done',
+ 'id' => 'done',
'tab_index' => 2,
'value' => lang('done')
),
Modified: trunk/property/js/yahoo/invoice.index.js
===================================================================
--- trunk/property/js/yahoo/invoice.index.js 2012-03-06 14:48:21 UTC (rev
8968)
+++ trunk/property/js/yahoo/invoice.index.js 2012-03-07 13:31:38 UTC (rev
8969)
@@ -20,11 +20,20 @@
// define Text buttons
var textImput = [
- {order:0, name:'query', id:'txt_query'}
+ {order:0, name:'workorder_id', id:'txt_workorder'},
+ {order:1, name:'vendor_id', id:'txt_vendor'},
+ {order:2, name:'invoice_id', id:'txt_invoice'},
+ {order:3, name:'loc1', id:'txt_loc1'},
+ {order:4, name:'voucher_id', id:'txt_voucher'},
]
// define Link Buttons
var linktoolTips = [
+ {name:'lnk_workorder', title:'Workorder ID',
description:'enter the Workorder ID to search by workorder'},
+ {name:'lnk_vendor', title:'Vendor', description:'Select the
vendor by clicking this link'},
+ {name:'lnk_invoice', title:'Invoice', description:'Enter the
invoice id'},
+ {name:'lnk_property', title:'Facilities Managements',
description:'Select the property by clicking this link'},
+ {name:'lnk_voucher', title:'Voucher', description:'enter the
voucher ID to search by vouvher'}
]
var toolTips = [
Modified: trunk/property/js/yahoo/invoice.list_sub.js
===================================================================
--- trunk/property/js/yahoo/invoice.list_sub.js 2012-03-06 14:48:21 UTC (rev
8968)
+++ trunk/property/js/yahoo/invoice.list_sub.js 2012-03-07 13:31:38 UTC (rev
8969)
@@ -10,7 +10,7 @@
var oNormalButton_0,oNormalButton_1,oNormalButton_2;
var normalButtons = [
{order:0, name:'btn_save', funct:"onSave"},
- {order:1, name:'btn_done', funct:"onDoneClick"},
+ {order:1, name:'btn_done', funct:"_onDoneClick"},
{order:2, name:'btn_export',funct:"onDownloadClick"}
]
@@ -27,12 +27,36 @@
var config_values = {
PanelLoading : 1,
- particular_download : "property.uiinvoice.download_sub"
+ particular_download : "property.uiinvoice.download_sub",
+ particular_done : "property.uiinvoice.index"
}
var tableYUI;
+ this._onDoneClick = function()
+ {
+ //save initial value
+ path_values_menuaction_original = path_values.menuaction;
+ // if exist "particular_done" in particular.js
+ if(config_values.particular_done)
+ {
+ path_values.menuaction = config_values.particular_done;
+ }
+ else
+ {
+ tmp_array = path_values.menuaction.split(".")
+ tmp_array[2] = "index"; //set function INDEX
+ path_values.menuaction = tmp_array.join('.');
+ }
+
+ path_values.voucher_id = '';
+ window.open(phpGWLink('index.php',path_values),'_self');
+ //come back to initial values
+ path_values.menuaction = path_values_menuaction_original;
+ }
+
+
this.showlightbox = function(sUrl)
{
var onDialogShow = function(e, args, o)
| [Prev in Thread] | Current Thread | [Next in Thread] |