[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7577] Property: basware integration
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7577] Property: basware integration |
|
Date: |
Mon, 12 Sep 2011 13:51:23 +0000 |
Revision: 7577
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7577
Author: sigurdne
Date: 2011-09-12 13:51:23 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Property: basware integration
Modified Paths:
--------------
trunk/property/inc/class.soXport.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/inc/cron/default/Import_fra_basware_X205.php
trunk/property/inc/export/default/Basware_X114
Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php 2011-09-12 13:21:22 UTC (rev
7576)
+++ trunk/property/inc/class.soXport.inc.php 2011-09-12 13:51:23 UTC (rev
7577)
@@ -316,7 +316,10 @@
date($this->db->datetime_format()),
$data['item_type'],
$data['item_id'],
- $data['external_ref']
+ $data['external_ref'],
+ $data['currency'],
+ $this->db->db_addslashes($data['process_log']),
+ $data['process_code']
);
$values = $this->db->validate_insert($values);
@@ -325,7 +328,7 @@
. "
periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
. "
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,item_type,item_id,external_ref,"
- . " belop,godkjentbelop,ordrebelop)"
+ . "
currency,process_log,process_code,belop,godkjentbelop,ordrebelop)"
. "values ($values, "
. $this->db->money_format($data['belop']) . ","
.
$this->db->money_format($data['godkjentbelop']) . ","
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2011-09-12 13:21:22 UTC (rev
7576)
+++ trunk/property/inc/class.uiinvoice.inc.php 2011-09-12 13:51:23 UTC (rev
7577)
@@ -1573,7 +1573,7 @@
if(isset($invoices['external_ref']) && $invoices['external_ref'])
{
//
$json_row[$uicols[$i]['col_name']] = " <a target='_blank'
href='".$baseurl_invoice. $invoices['external_ref']."'>{$lang_picture}</a>";
-
$json_row[$uicols[$i]['col_name']] = " <a
href=\"javascript:openwindow('".$baseurl_invoice. $invoices['external_ref'].
"','640','800')\" >{$lang_picture}</a>";
+
$json_row[$uicols[$i]['col_name']] = " <a
href=\"javascript:openwindow('{$baseurl_invoice}{$invoices['external_ref']}','640','800')\"
>{$lang_picture}</a>";
}
else
{
Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-09-12
13:21:22 UTC (rev 7576)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-09-12
13:51:23 UTC (rev 7577)
@@ -45,7 +45,7 @@
var $invoice;
var $bestiller = 85; //cat_id for rolle
var $attestant = 83; //cat_id for rolle
- var $budsjettansvarlig = 82; //cat_id for rolle
+ var $budsjettansvarlig = 146; //cat_id for rolle
var $default_kostra_id = 9999; //dummy
var $import = array(
@@ -327,6 +327,13 @@
$this->receipt['message'][] =
array('msg' => 'Ikke samsvar med leverandør på bestilling og mottatt faktura');
}
+ $sql = 'SELECT id FROM fm_vendor WHERE
id = ' . (int) $_data['SUPPLIER.CODE'];
+
$this->db->query($sql,__LINE__,__FILE__);
+ if(!$this->db->next_record())
+ {
+ $this->receipt['error'][] =
array('msg' => "Ikke gyldig leverandør id: {$_data['SUPPLIER.CODE']}");
+ }
+
$vendor_id = $_data['SUPPLIER.CODE'];
if($this->auto_tax)
Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114 2011-09-12 13:21:22 UTC
(rev 7576)
+++ trunk/property/inc/export/default/Basware_X114 2011-09-12 13:51:23 UTC
(rev 7577)
@@ -222,13 +222,16 @@
'oppsynsigndato' =>
$this->db->f('oppsynsigndato'),
'saksigndato' =>
$this->db->f('saksigndato'),
'budsjettsigndato' =>
$this->db->f('budsjettsigndato'),
- 'merknad'
=> $this->db->f('merknad'),
+ 'merknad'
=> $this->db->f('merknad',true),
'splitt'
=> $this->db->f('splitt'),
'ordrebelop' =>
$this->db->f('ordrebelop'),
'utbetalingid' =>
$this->db->f('utbetalingid'),
'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'),
+
);
}
@@ -275,7 +278,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);
@@ -284,7 +289,7 @@
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
. "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
. "
periode,merknad,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__);
@@ -455,7 +460,7 @@
//Velg ut alle hoved bilag som skal overføres
$oRsBilag = $this->get_voucher($voucher_id);
-
+//_debug_array($oRsBilag);die();
if(!isset($oRsBilag[0]['external_ref']) ||
!$oRsBilag[0]['external_ref'])
{
$oRsBilag[0]['external_ref'] = mt_rand();
@@ -807,13 +812,16 @@
'oppsynsigndato' =>
$this->db->f('oppsynsigndato'),
'saksigndato' =>
$this->db->f('saksigndato'),
'budsjettsigndato' =>
$this->db->f('budsjettsigndato'),
- 'merknad'
=> $this->db->f('merknad'),
+ 'merknad'
=> $this->db->f('merknad',true),
'splitt'
=> $this->db->f('splitt'),
'utbetalingid' =>
$this->db->f('utbetalingid'),
'utbetalingsigndato' =>
$this->db->f('utbetalingsigndato'),
'saksbehandler' =>
$this->db->f('saksbehandler'),
'external_ref' =>
$this->db->f('external_ref'),
- 'kostra_id'
=> $this->db->f('kostra_id')
+ 'kostra_id'
=> $this->db->f('kostra_id'),
+ 'currency'
=> $this->db->f('currency'),
+ 'process_log' =>
$this->db->f('process_log',true),
+ 'process_code' =>
$this->db->f('process_code'),
);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7577] Property: basware integration,
Sigurd Nes <=