[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7926] Merge 7922:7925 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7926] Merge 7922:7925 from trunk |
|
Date: |
Mon, 24 Oct 2011 09:07:15 +0000 |
Revision: 7926
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7926
Author: sigurdne
Date: 2011-10-24 09:07:15 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Merge 7922:7925 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/controller/inc/model/class.procedure.inc.php
branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/setup/tables_update.inc.php
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
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
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-10-24 09:07:15 UTC (rev 7926)
@@ -36,7 +36,10 @@
'reference',
'attachment',
'start_date',
- 'end_date'
+ 'end_date',
+ 'procedure_id',
+ 'revision_no',
+ 'revision_date'
);
$values = array(
@@ -47,7 +50,10 @@
$this->marshal($procedure->get_reference(), 'string'),
$this->marshal($procedure->get_attachment(), 'string'),
$this->marshal($procedure->get_start_date(), 'int'),
- $this->marshal($procedure->get_end_date(), 'int')
+ $this->marshal($procedure->get_end_date(), 'int'),
+ $this->marshal($procedure->get_procedure_id(), 'int'),
+ $this->marshal($procedure->get_revision_no(), 'int'),
+ $this->marshal($procedure->get_revision_date(), 'int')
);
$result = $this->db->query('INSERT INTO controller_procedure ('
. join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
@@ -82,7 +88,10 @@
'reference = ' .
$this->marshal($procedure->get_reference(), 'string'),
'attachment = ' .
$this->marshal($procedure->get_attachment(), 'string'),
'start_date = ' .
$this->marshal($procedure->get_start_date(), 'int'),
- 'end_date = ' .
$this->marshal($procedure->get_end_date(), 'int')
+ 'end_date = ' .
$this->marshal($procedure->get_end_date(), 'int'),
+ 'procedure_id = ' .
$this->marshal($procedure->get_procedure_id(), 'int'),
+ 'revision_no = ' .
$this->marshal($procedure->get_revision_no(), 'int'),
+ 'revision_date = ' .
$this->marshal($procedure->get_revision_date(), 'int')
);
$result = $this->db->query('UPDATE controller_procedure SET ' .
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
@@ -113,6 +122,9 @@
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true),
'string'));
$procedure->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$procedure->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
+
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
return $procedure;
}
@@ -138,6 +150,9 @@
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true),
'string'));
$procedure->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$procedure->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
+
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
$results[] = $procedure;
}
@@ -166,6 +181,9 @@
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true),
'string'));
$procedure->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$procedure->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
+
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
$results[] = $procedure->toArray();;
}
@@ -324,7 +342,7 @@
}
else
{
- $cols .= "controller_procedure.id,
controller_procedure.title, controller_procedure.purpose,
controller_procedure.responsibility, controller_procedure.description,
controller_procedure.reference, controller_procedure.attachment,
controller_procedure.start_date, controller_procedure.end_date ";
+ $cols .= "controller_procedure.id,
controller_procedure.title, controller_procedure.purpose,
controller_procedure.responsibility, controller_procedure.description,
controller_procedure.reference, controller_procedure.attachment,
controller_procedure.start_date, controller_procedure.end_date,
controller_procedure.procedure_id, controller_procedure.revision_no,
controller_procedure.revision_date ";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
@@ -348,6 +366,9 @@
$procedure->set_attachment($this->unmarshal($this->db->f('attachment'),
'string'));
$procedure->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$procedure->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
+
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
}
return $procedure;
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-10-24 09:07:15 UTC (rev 7926)
@@ -141,6 +141,49 @@
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uiprocedure.view', 'id' => $proc_id));
}
}
+ else if(isset($_POST['revisit_procedure'])) // The user
has pressed the revisit button
+ {
+ $old_procedure =
$this->so->get_single($procedure_id);
+ if(isset($procedure)) // Edit procedure
+ {
+ $revision =
$procedure->get_revision_no();
+ if($revision && is_numeric($revision))
+ {
+ $revision = (int)$revision;
+ $new_revision = $revision++;
+
$procedure->set_revision_no($new_revision);
+ }
+
$procedure->set_title(phpgw::get_var('title'));
+
$procedure->set_purpose(phpgw::get_var('purpose','html'));
+
$procedure->set_responsibility(phpgw::get_var('responsibility'));
+
$procedure->set_description(phpgw::get_var('description','html'));
+
$procedure->set_reference(phpgw::get_var('reference'));
+
$procedure->set_attachment(phpgw::get_var('attachment'));
+
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
+
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
+
+ if(isset($procedure_id) &&
$procedure_id > 0)
+ {
+ $proc_id = $procedure_id;
+ $old_procedure->set_id(null);
+
$old_procedure->set_end_date(time());
+
$old_procedure->set_procedure_id($proc_id);
+
if($this->so->add($old_procedure)) //add old revision of procedure to history
+ {
+
if($this->so->store($procedure))
+ {
+ $message =
lang('messages_saved_form');
+ }
+ else
+ {
+ $error =
lang('messages_form_error');
+ }
+ }
+ }
+
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uiprocedure.view', 'id' => $proc_id));
+ }
+ }
else if(isset($_POST['cancel_procedure'])) // The user
has pressed the cancel button
{
if(isset($procedure_id) && $procedure_id > 0)
Modified:
branches/Version-1_0-branch/controller/inc/model/class.procedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.procedure.inc.php
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/inc/model/class.procedure.inc.php
2011-10-24 09:07:15 UTC (rev 7926)
@@ -14,6 +14,9 @@
protected $attachment;
protected $start_date;
protected $end_date;
+ protected $procedure_id;
+ protected $revision_no;
+ protected $revision_date;
/**
* Constructor. Takes an optional ID. If a procedure is
created from outside
@@ -89,6 +92,27 @@
public function get_end_date() { return $this->end_date; }
+ public function set_procedure_id($procedure_id)
+ {
+ $this->procedure_id = $procedure_id;
+ }
+
+ public function get_procedure_id() { return
$this->procedure_id; }
+
+ public function set_revision_no($revision_no)
+ {
+ $this->revision_no = $revision_no;
+ }
+
+ public function get_revision_no() { return $this->revision_no; }
+
+ public function set_revision_date($revision_date)
+ {
+ $this->revision_date = $revision_date;
+ }
+
+ public function get_revision_date() { return
$this->revision_date; }
+
/**
* Get a static reference to the storage object associated with
this model object
*
@@ -114,7 +138,10 @@
'reference' => $this->get_reference(),
'attachment' => $this->get_attachment(),
'start_date' => $this->get_start_date(),
- 'end_date' => $this->get_end_date()
+ 'end_date' => $this->get_end_date(),
+ 'procedure_id' =>
$this->get_procedure_id(),
+ 'revision_no' =>
$this->get_revision_no(),
+ 'revision_date' =>
$this->get_revision_date()
);
}
}
Modified:
branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
2011-10-24 09:07:15 UTC (rev 7926)
@@ -27,21 +27,21 @@
start_drag();
});
- // Delete a control item list
+ // Delete a control item list
$(".delete").click(function(){
- var thisElem = $(this);
- var thisRow = $(this).parent();
+ var clickElem = $(this);
+ var clickRow = $(this).parent();
- var url = $(thisElem).attr("href");
+ var url = $(clickElem).attr("href");
// Sending request for deleting a control item list
$.ajax({
type: 'POST',
url: url,
success: function() {
- $(thisRow).fadeOut("slow");
+ $(clickRow).fadeOut("slow");
- var next_row = $(thisRow).next();
+ var next_row = $(clickRow).next();
// Updating order numbers for rows below
deleted row
while( $(next_row).length > 0){
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-10-24
09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-10-24
09:07:15 UTC (rev 7926)
@@ -255,4 +255,5 @@
Equipment controller no Utstyr
Control_locations controller no Lokasjoner
Control_equipment controller no Utstyr
-New control controller no Ny kontroll
\ No newline at end of file
+New control controller no Ny kontroll
+revisit controller no Revidér
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-10-24
09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-10-24
09:07:15 UTC (rev 7926)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1';
+ $setup_info['controller']['version'] = '0.1.1';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-10-24 09:07:15 UTC (rev 7926)
@@ -88,7 +88,10 @@
'reference' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
'attachment' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
'start_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
- 'end_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True)
+ 'end_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'procedure_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'revision_no' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'revision_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2011-10-24 09:07:15 UTC (rev 7926)
@@ -6,28 +6,24 @@
$test[] = '0.1';
function controller_upgrade0_1()
{
- $GLOBALS['phpgw_setup']->oProc->CreateTable(
- 'activity_organization', array(
- 'fd' => array(
- 'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '255','nullable' => false),
- 'district' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'homepage' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'description' => array('type' =>
'text','nullable' => false),
- 'email' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'phone' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'address' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'orgno' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'change_type' => array('type' =>
'varchar','precision' => '255','default' => 'new','nullable' => false),
- 'transferred' => array('type' =>
'bool','nullable' => true,'default' => 'false')
- ),
- 'pk' => array('id'),
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- )
- );
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_procedure','procedure_id',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_procedure','revision_no',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_procedure','revision_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => True
+ ));
+
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.1';
return $GLOBALS['setup_info']['controller']['currentver'];
}
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-10-24 09:04:57 UTC (rev 7925)
+++ branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-10-24 09:07:15 UTC (rev 7926)
@@ -111,8 +111,10 @@
<xsl:choose>
<xsl:when test="editable">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <xsl:variable
name="lang_revisit"><xsl:value-of select="php:function('lang', 'revisit')"
/></xsl:variable>
<xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
<input type="submit"
name="save_procedure" value="{$lang_save}" title = "{$lang_save}" />
+ <input type="submit"
name="revisit_procedure" value="{$lang_revisit}" title = "{$lang_revisit}" />
<input type="submit"
name="cancel_procedure" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:when>
<xsl:otherwise>
Modified:
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
2011-10-24 09:04:57 UTC (rev 7925)
+++
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
2011-10-24 09:07:15 UTC (rev 7926)
@@ -55,9 +55,10 @@
'Belop [kr]' => 'belop',
'Referanse' => 'referanse',
'BOEI Gateadresse' => 'boei_gateadresse',
+ 'Saksbehandler' =>'saksbehandlerid'
);
- var $header =
array('Bilagsnr','Fakturanr','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Tjeneste','Belop
[kr]','Referanse');
+ var $header =
array('Bilagsnr','Fakturanr','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Tjeneste','Belop
[kr]','Referanse','Saksbehandler');
function import_conv()
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7926] Merge 7922:7925 from trunk,
Sigurd Nes <=