[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9585] property: invoice
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9585] property: invoice |
|
Date: |
Wed, 13 Jun 2012 18:22:46 +0000 |
Revision: 9585
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9585
Author: sigurdne
Date: 2012-06-13 18:22:44 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
property: invoice
Modified Paths:
--------------
trunk/property/inc/class.soXport.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/export/default/Basware_X114
trunk/property/js/portico/ajax_invoice.js
Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php 2012-06-13 17:30:07 UTC (rev
9584)
+++ trunk/property/inc/class.soXport.inc.php 2012-06-13 18:22:44 UTC (rev
9585)
@@ -349,7 +349,9 @@
$data['item_id'],
$data['external_ref'],
$data['currency'],
- $data['manual_record']
+ $data['manual_record'],
+ $data['process_code'],
+ $this->db->db_addslashes($data['process_log']),
);
$values = $this->db->validate_insert($values);
@@ -358,7 +360,7 @@
. "
periode,periodization,periodization_start,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
. "
dimb,mvakode,dimd,dime,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,merknad,line_text,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,item_type,item_id,external_ref,"
- . "
currency,manual_record,belop,godkjentbelop,ordrebelop)"
+ . "
currency,manual_record,process_code,process_log,belop,godkjentbelop,ordrebelop)"
. "VALUES ($values, "
. $this->db->money_format($data['belop']) . ","
.
$this->db->money_format($data['godkjentbelop']) . ","
@@ -366,6 +368,7 @@
$this->db->query($sql,__LINE__,__FILE__);
+/*
if($data['manual_record'] && ($data['process_log'] ||
$data['process_code']))
{
$valueset_log = array
@@ -382,7 +385,7 @@
$sql = "INSERT INTO fm_ecobilag_process_log
(bilagsnr,process_code,process_log,user_id,entry_date) VALUES ({$values})";
$this->db->query($sql,__LINE__,__FILE__);
}
-
+*/
return true;
}
@@ -438,12 +441,13 @@
'external_ref' =>
$this->db->f('external_ref'),
'kostra_id'
=> $this->db->f('kostra_id'),
'currency'
=> $this->db->f('currency'),
- 'process_log' => '',
//Fetched below
- 'process_code' => ''
+ 'process_log' =>
$this->db->f('process_log',true),
+ 'process_code' =>
$this->db->f('process_code'),
);
}
+/*
if($voucher)
{
$sql= "SELECT * FROM fm_ecobilag_process_log
WHERE bilagsnr = {$bilagsnr}";
@@ -458,7 +462,7 @@
$line['process_code'] = $process_code;
}
}
-
+*/
return $voucher;
}
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-06-13 17:30:07 UTC (rev
9584)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-06-13 18:22:44 UTC (rev
9585)
@@ -1450,8 +1450,8 @@
'order_id'
=> $this->db->f('pmwrkord_code'),
'kostra_id'
=> $this->db->f('kostra_id'),
'currency'
=> $this->db->f('currency'),
- 'process_code'
=> '', //Fetched below
- 'process_log'
=> '',
+ 'process_code'
=> $this->db->f('process_code'),
+ 'process_log'
=> $this->db->f('process_log',true),
'oppsynsigndato'
=> $this->db->f('oppsynsigndato'),
'saksigndato'
=> $this->db->f('saksigndato'),
'budsjettsigndato'
=> $this->db->f('budsjettsigndato'),
@@ -1466,6 +1466,7 @@
);
}
+/*
if($values)
{
$bilagsnr = (int)$values[0]['voucher_id'];
@@ -1481,7 +1482,7 @@
$line['process_code'] = $process_code;
}
}
-
+*/
//_debug_array($values);
return $values;
}
@@ -2106,6 +2107,8 @@
$value_set_line['project_id'] =
$data['project_group'];
$value_set_line['spbudact_code'] =
$data['b_account_id'];
$value_set_line['line_text'] =
$this->db->db_addslashes($data['line_text']);
+ $value_set_line['process_log'] =
$this->db->db_addslashes($data['process_log']);
+ $value_set_line['process_code'] =
$data['process_code'];
$value_set_line =
$this->db->validate_update($value_set_line);
$this->db->query("UPDATE fm_ecobilag SET
{$value_set_line} WHERE id = " . (int)$data['line_id'],__LINE__,__FILE__);
@@ -2224,7 +2227,7 @@
}
}
-
+/*
if($data['process_log'] || $data['process_code'])
{
$valueset_log = array
@@ -2253,7 +2256,7 @@
}
}
-
+*/
if( isset($data['order_id']) && $data['order_id'])
{
if(isset($data['close_order']) &&
$data['close_order'])
Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114 2012-06-13 17:30:07 UTC
(rev 9584)
+++ trunk/property/inc/export/default/Basware_X114 2012-06-13 18:22:44 UTC
(rev 9585)
@@ -361,8 +361,8 @@
// 'utbetalingsigndato' =>
$this->db->f('utbetalingsigndato'),
'external_ref' =>
$this->db->f('external_ref'),
'currency'
=> $this->db->f('currency'),
- // 'process_log' =>
$this->db->f('process_log',true),
- // 'process_code' =>
$this->db->f('process_code'),
+ 'process_log' =>
$this->db->f('process_log',true),
+ 'process_code' =>
$this->db->f('process_code'),
);
}
@@ -415,7 +415,9 @@
$BilagOverf['external_ref'],
$BilagOverf['belop'],
$BilagOverf['godkjentbelop'],
- $BilagOverf['currency']
+ $BilagOverf['currency'],
+
$this->db->db_addslashes($BilagOverf['process_log']),
+ $BilagOverf['process_code'],
);
$values = $this->db->validate_insert($values);
@@ -424,7 +426,7 @@
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
. "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,dime,mvakode,"
. "
periode,periodization,periodization_start,merknad,line_text,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
- . "
item_type,item_id,external_ref,belop,godkjentbelop,currency)"
+ . "
item_type,item_id,external_ref,belop,godkjentbelop,currency,process_log,process_code)"
. " VALUES ({$values})";
$this->db->query($sql,__LINE__,__FILE__);
@@ -744,7 +746,7 @@
$comment = array();
foreach ($oRsBilag as $line)
{
- $comment[] = $line['process_log'];
+ $comment[] =
"{$line['belop']}::{$line['process_log']}";
$BelopFelt = 'godkjentbelop';
Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js 2012-06-13 17:30:07 UTC (rev
9584)
+++ trunk/property/js/portico/ajax_invoice.js 2012-06-13 18:22:44 UTC (rev
9585)
@@ -302,6 +302,10 @@
$("#dim_a").val( voucher[0].dim_a );
$("#currency").html( voucher[0].currency );
+ $("#process_log").html(
data['generic'].process_log );
+
+//alert(data['generic'].process_log);
+/*
if(data['generic'].process_log != null)
{
$("#process_log").html(
data['generic'].process_log );
@@ -310,6 +314,7 @@
{
$("#process_log").html( '' );
}
+*/
$("#my_initials").val(
data['generic'].my_initials );
$("#sign_orig").val( data['generic'].sign_orig
);
$("#line_text").val( voucher[0].line_text );
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9585] property: invoice,
Sigurd Nes <=