[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9214] property: invoice handling
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9214] property: invoice handling |
|
Date: |
Tue, 24 Apr 2012 07:15:53 +0000 |
Revision: 9214
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9214
Author: sigurdne
Date: 2012-04-24 07:15:51 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
property: invoice handling
Modified Paths:
--------------
trunk/property/inc/class.soXport.inc.php
trunk/property/inc/cron/default/Import_fra_basware_X205.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-04-24 06:44:51 UTC (rev
9213)
+++ trunk/property/inc/class.soXport.inc.php 2012-04-24 07:15:51 UTC (rev
9214)
@@ -256,6 +256,7 @@
$fields['loc1'],
$fields['dima'],
$fields['dimd'],
+ $fields['dime'],
$fields['mvakode'],
$fields['periode'],
$this->db->db_addslashes($fields['merknad']),
@@ -276,7 +277,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,bilagsnr_ut,splitt,kildeid,kidnr,typeid,fakturadato,"
. "
forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
- . "
fakturanr,spbudact_code,loc1,dima,dimd,mvakode,periode,merknad,line_text,oppsynsigndato,saksigndato,"
+ . "
fakturanr,spbudact_code,loc1,dima,dimd,dime,mvakode,periode,merknad,line_text,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,utbetalingsigndato,item_type,item_id,external_ref,currency,belop,godkjentbelop)"
. " VALUES ({$values}," .
$this->db->money_format($fields['belop']) . ',' .
$this->db->money_format($fields['godkjentbelop']) .')';
@@ -330,6 +331,7 @@
$data['dimb'],
$data['mvakode'],
$data['dimd'],
+ $data['dime'],
$data['oppsynsmannid'],
$data['saksbehandlerid'],
$data['budsjettansvarligid'],
@@ -354,7 +356,7 @@
$sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,bilagsnr_ut,kidnr,typeid,kildeid,project_id,kostra_id,pmwrkord_code,fakturadato,"
. "
periode,periodization,periodization_start,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
- . "
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
+ . "
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)"
. "VALUES ($values, "
@@ -421,6 +423,7 @@
'dimb'
=> $this->db->f('dimb'),
'mvakode'
=> $this->db->f('mvakode'),
'dimd'
=> $this->db->f('dimd'),
+ 'dime'
=> $this->db->f('dime'),
'oppsynsmannid' =>
$this->db->f('oppsynsmannid'),
'saksbehandlerid' =>
$this->db->f('saksbehandlerid'),
'budsjettansvarligid' =>
$this->db->f('budsjettansvarligid'),
@@ -521,6 +524,7 @@
$hoved_bilag[$i]['dimb']
= $this->db->f('dimb');
$hoved_bilag[$i]['mvakode']
= $this->db->f('mvakode');
$hoved_bilag[$i]['dimd']
= $this->db->f('dimd');
+ $hoved_bilag[$i]['dime']
= $this->db->f('dime');
if($this->db->f('oppsynsmannid'))
{
$hoved_bilag[$i]['oppsynsmannid'] = $this->db->f('oppsynsmannid');
@@ -587,6 +591,7 @@
$underbilag[$i]['dimb'] = $this->db->f('dimb');
$underbilag[$i]['mvakode'] =
$this->db->f('mvakode');
$underbilag[$i]['dimd'] = $this->db->f('dimd');
+ $underbilag[$i]['dime'] = $this->db->f('dime');
$underbilag[$i]['project_id'] =
$this->db->f('project_id');
$underbilag[$i]['kostra_id'] =
$this->db->f('kostra_id');
if($this->db->f('oppsynsmannid'))
Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-04-24
06:44:51 UTC (rev 9213)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-04-24
07:15:51 UTC (rev 9214)
@@ -566,8 +566,9 @@
$buffer[$i]['bilagsnr_ut'] =
$bilagsnr_ut;
$buffer[$i]['referanse'] =
"ordre: {$order_id}";
+ $buffer[$i]['dima'] =
$order_info['dima'];
$buffer[$i]['dimb'] =
$order_info['dimb'];
- $buffer[$i]['dima'] =
$order_info['dima'];
+ $buffer[$i]['dime'] =
$order_info['dime'];
$buffer[$i]['loc1'] =
$order_info['loc1'];
$buffer[$i]['line_text'] =
$order_info['title'];
@@ -780,7 +781,7 @@
$order_info = array();
$toarray = array();
$order_id = (int) $order_id;
- $sql = "SELECT
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,
fm_workorder.user_id,fm_workorder.title"
+ $sql = "SELECT
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,fm_workorder.category,
fm_workorder.user_id,fm_workorder.title"
. " FROM fm_workorder {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id WHERE fm_workorder.id = {$order_id}";
$this->db->query($sql,__LINE__,__FILE__);
if( $this->db->next_record())
@@ -797,6 +798,7 @@
$order_info['vendor_id'] =
$this->db->f('vendor_id');
$order_info['spbudact_code'] =
$this->db->f('account_id');
$order_info['dimb']
= $this->db->f('ecodimb');
+ $order_info['dime']
= $this->db->f('category');
$order_info['title'] =
$this->db->f('title',true);
$janitor_user_id
= $this->db->f('user_id');
Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114 2012-04-24 06:44:51 UTC
(rev 9213)
+++ trunk/property/inc/export/default/Basware_X114 2012-04-24 07:15:51 UTC
(rev 9214)
@@ -275,6 +275,7 @@
'dimb'
=> $this->db->f('dimb'),
'mvakode'
=> $this->db->f('mvakode'),
'dimd'
=> $this->db->f('dimd'),
+ 'dime'
=> $this->db->f('dime'),
'project_id' =>
$this->db->f('project_id'),
'kostra_id'
=> $this->db->f('kostra_id'),
'item_type'
=> $this->db->f('item_type'),
@@ -330,6 +331,7 @@
$BilagOverf['dima'],
$BilagOverf['loc1'],
$BilagOverf['dimd'],
+ $BilagOverf['dime'],
$BilagOverf['mvakode'],
$BilagOverf['periode'],
$BilagOverf['periodization'],
@@ -353,7 +355,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,bilagsnr_ut,splitt,kildeid,kidnr,typeid,"
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
- . "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
+ . "
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)"
. " VALUES ({$values})";
Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js 2012-04-24 06:44:51 UTC (rev
9213)
+++ trunk/property/js/portico/ajax_invoice.js 2012-04-24 07:15:51 UTC (rev
9214)
@@ -216,6 +216,7 @@
$("#close_order").html( '' );
$("#close_order_orig").val( '' );
$("#park_order").html( '' );
+ $("#receipt").html('');
var voucher_id = $(this).val();
var oArgs = {menuaction:'property.uiinvoice2.get_first_line'};
@@ -244,10 +245,10 @@
});
$("#approve_line").live("click", function(e){
+ $("#receipt").html('');
var line_id = $(this).val();
var voucher_id_orig = $("#voucher_id").val();
update_form_values(line_id, voucher_id_orig);
-
});
@@ -644,6 +645,7 @@
$("#approve_as").html( "<option>Velg</option>"
);
$("#order_text").html( 'Bestilling' );
$("#invoice_id_text").html('FakturaNr');
+ $("#receipt").html('');
document.getElementById('image_content').src =
'';
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9214] property: invoice handling,
Sigurd Nes <=