[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8180] Merge 8171:8179 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8180] Merge 8171:8179 from trunk |
|
Date: |
Wed, 23 Nov 2011 21:24:12 +0000 |
Revision: 8180
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8180
Author: sigurdne
Date: 2011-11-23 21:24:12 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Merge 8171:8179 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/property/inc/class.boXport.inc.php
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.soXport.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/invoice.xsl
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,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170
+
/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,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -153,7 +153,7 @@
}
else
{
- $organizations = $so_org->get(null, null, null, null,
null, null, null);
+ $organizations = $so_org->get(null, null, 'org.name',
true, null, null, null);
}
$groups = activitycalendar_sogroup::get_instance()->get(null,
null, null, null, null, null, null);
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -251,6 +251,7 @@
$contact_1 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
$contact_2 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
$desc =
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
+ $org_name =
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
}
else if(isset($this->organization_id) &&
$this->get_organization_id() > 0)
{
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-11-23 21:24:12 UTC (rev 8180)
@@ -424,4 +424,7 @@
office_helptext activitycalendar no Oppgi kontor som
saksbehandler aktiviteten
contact_info activitycalendar no Kontaktinformasjon for
kulturkontoret
contact_info_helptext activitycalendar no Hentes fra
booking/organisasjonsregister ved lagring.
-update_org activitycalendar no Oppdater organisasjonsregister
\ No newline at end of file
+update_org activitycalendar no Oppdater organisasjonsregister
+edit_contact_info activitycalendar no For å redigere
kontaktopplysninger:
+edit_contact_info_org activitycalendar no Gå til
organisasjonsopplysninger
+edit_contact_info_group activitycalendar no Gå til
gruppeopplysninger
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -118,7 +118,7 @@
<dt>
<?php if($activity->get_title() ||
$editable) { ?>
<label for="title"><?php echo
lang('title') ?></label>
- <br/><?php echo lang('title_helptext')?>
+ <?php if($editable){?><br/><?php echo
lang('title_helptext')?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -143,19 +143,11 @@
<?php
if($activity->get_group_id())
{
- $group =
$act_so->get_group_info($activity->get_group_id());
- if($group)
- {
- echo
$group['description'];
- }
+ echo
activitycalendar_sogroup::get_instance()->get_description($activity->get_group_id());
}
else
if($activity->get_organization_id())
{
- $org =
$act_so->get_org_info($activity->get_organization_id());
- if($org)
- {
- echo
$org['description'];
- }
+ echo
activitycalendar_soorganization::get_instance()->get_description($activity->get_organization_id());
}
?>
</dd>
@@ -196,7 +188,7 @@
<dt>
<?php if($activity->get_category() ||
$editable) { ?>
<label for="category"><?php echo
lang('category') ?></label>
- <br/><?php echo
lang('category_helptext') ?>
+ <?php if($editable){?><br/><?php echo
lang('category_helptext') ?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -227,7 +219,7 @@
<dt>
<?php if($activity->get_target() ||
$editable) { ?>
<label for="target"><?php echo
lang('target') ?></label>
- <br/><?php echo lang('target_helptext')
?>
+ <?php if($editable){?><br/><?php echo
lang('target_helptext') ?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -260,7 +252,7 @@
<dt>
<?php if($activity->get_district() ||
$editable) { ?>
<label for="district"><?php echo
lang('district') ?></label>
- <br/><?php echo
lang('district_helptext') ?>
+ <?php if($editable){?><br/><?php echo
lang('district_helptext') ?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -300,7 +292,7 @@
</dd>
<h2><?php echo lang('where_when')?></h2>
<dt>
- <?php if($activity->get_arena() ||
$editable) { ?>
+ <?php if($activity->get_arena() ||
$activity->get_internal_arena() || $editable) { ?>
<label for="arena"><?php echo
lang('arena') ?></label>
<br/><?php echo lang('arena_helptext')?>
<?php } ?>
@@ -416,7 +408,7 @@
<dt>
<?php
if($activity->get_organization_id() || $editable) { ?>
<label for="organization_id"><?php echo
lang('organization') ?></label>
- <br/><?php echo
lang('organization_helptext') ?>
+ <?php if($editable){?><br/><?php echo
lang('organization_helptext') ?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -440,6 +432,9 @@
}
?>
</select>
+ <?php
if($current_organization_id){?>
+ <br/><?php echo
lang('edit_contact_info')?> <a
href="index.php?menuaction=booking.uiorganization.show&id=<?php echo
$current_organization_id ?>"><?php echo lang('edit_contact_info_org')?></a>
+ <?php }?>
<?php
}
?>
@@ -456,7 +451,7 @@
<dt>
<?php if($activity->get_group_id() ||
$editable) { ?>
<label for="group_id"><?php echo
lang('group') ?></label>
- <br/><?php echo lang('group_helptext')
?>
+ <?php if($editable){?><br/><?php echo
lang('group_helptext') ?><?php }?>
<?php } ?>
</dt>
<dd>
@@ -470,6 +465,9 @@
<option
value="0">Ingen gruppe valgt</option>
</select>
</div>
+ <?php if($current_group_id){?>
+ <br/><?php echo
lang('edit_contact_info')?> <a
href="index.php?menuaction=booking.uigroup.show&id=<?php echo $current_group_id
?>"><?php echo lang('edit_contact_info_group')?></a>
+ <?php }?>
<?php
?>
<?php
Modified: branches/Version-1_0-branch/property/inc/class.boXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boXport.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.boXport.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -291,11 +291,11 @@
return $buffer;
}
- function rollback($conv_type,$role_back_date,$rollback_file)
+ function
rollback($conv_type,$role_back_date,$rollback_file,$rollback_voucher)
{
include (PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$conv_type}");
$invoice = new export_conv;
- $buffer =
$invoice->RullTilbake($role_back_date,$rollback_file);
+ $buffer =
$invoice->RullTilbake($role_back_date,$rollback_file,$rollback_voucher);
return $buffer;
}
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -257,11 +257,19 @@
return $this->so->update_period($voucher_id,$period);
}
+ function update_periodization($voucher_id='',$periodization='')
+ {
+ return
$this->so->update_periodization($voucher_id,$periodization);
+ }
+
+ function update_periodization_start($voucher_id='',$period='')
+ {
+ return
$this->so->update_periodization_start($voucher_id,$period);
+ }
+
function increment_bilagsnr()
{
-
return $this->so->increment_bilagsnr();
-
}
function next_bilagsnr()
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-11-23
21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-11-23
21:24:12 UTC (rev 8180)
@@ -190,6 +190,11 @@
'text' =>
lang('Accounting dim d'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'dimd') )
),
+ 'periodization' => array
+ (
+ 'text' =>
lang('periodization'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'periodization') )
+ ),
'accounting_tax' => array
(
'text' =>
lang('Accounting tax'),
Modified: branches/Version-1_0-branch/property/inc/class.soXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -294,6 +294,8 @@
$data['pmwrkord_code'],
$data['fakturadato'],
$data['periode'],
+ $data['periodization'],
+ $data['periodization_start'],
$data['forfallsdato'],
$data['fakturanr'],
$data['spbudact_code'],
@@ -328,7 +330,7 @@
$values = $this->db->validate_insert($values);
$sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,project_id,kostra_id,pmwrkord_code,fakturadato,"
- . "
periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
+ . "
periode,periodization,periodization_start,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,"
. "
currency,process_log,process_code,belop,godkjentbelop,ordrebelop)"
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -464,6 +464,28 @@
'menu_selection' =>
'admin::property::accounting::accounting_dimd'
);
break;
+ case 'periodization':
+ $info = array
+ (
+ 'table' =>
'fm_eco_periodization',
+ 'id'
=> array('name' => 'id', 'type' => 'int'),
+ 'fields'
=> array
+ (
+ array
+ (
+ 'name' =>
'descr',
+ 'descr' =>
lang('descr'),
+ 'type' =>
'varchar'
+ )
+ ),
+ 'edit_msg' => lang('edit'),
+ 'add_msg' => lang('add'),
+ 'name' =>
lang('periodization'),
+ 'acl_app'
=> 'property',
+ 'acl_location' => '.admin',
+ 'menu_selection' =>
'admin::property::accounting::periodization'
+ );
+ break;
case 'tax':
$info = array
(
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -229,11 +229,11 @@
$sql = "SELECT
pmwrkord_code,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
- . "
forfallsdato,periode,artid,kidnr,kreditnota,currency "
+ . "
forfallsdato,periode,periodization,periodization_start,artid,kidnr,kreditnota,currency
"
. " FROM {$table} {$this->join}
fm_vendor ON fm_vendor.id = {$table}.spvend_code WHERE bilagsnr = {$voucher_id}
"
. " GROUP BY
bilagsnr,pmwrkord_code,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
- . "
forfallsdato,periode,artid,kidnr,kreditnota,currency";
+ . "
forfallsdato,periode,periodization,periodization_start,artid,kidnr,kreditnota,currency";
$this->db->query($sql,__LINE__,__FILE__);
@@ -294,6 +294,9 @@
$invoice[$i]['voucher_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_voucher_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['payment_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_payment_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['period']
= $this->db->f('periode');
+ $invoice[$i]['periodization']
= $this->db->f('periodization');
+ $invoice[$i]['periodization_start']
= $this->db->f('periodization_start');
+
$invoice[$i]['type']
= $art_list[$this->db->f('artid')];
$invoice[$i]['kidnr']
= $this->db->f('kidnr');
$invoice[$i]['kreditnota']
= $this->db->f('kreditnota');
@@ -412,6 +415,7 @@
'remark'
=> !!$this->db->f('merknad'),
'tax_code'
=> $this->db->f('mvakode'),
'amount'
=> $this->db->f('belop'),
+ 'approved_amount'
=> $this->db->f('godkjentbelop'),
'charge_tenant'
=> $this->db->f('charge_tenant'),
'vendor'
=> $this->db->f('org_name'),
'paid_percent'
=> $this->db->f('paid_percent'),
@@ -658,6 +662,7 @@
$id =
$values['id'][$n];
$tax_code =
$values['tax_code'][$n];
$dimb =
isset($values['dimb'][$n]) && $values['dimb'][$n] ? (int)$values['dimb'][$n] :
'NULL';
+ $approved_amount =
isset($values['approved_amount'][$n]) && $values['approved_amount'][$n] ?
str_replace(',', '.', $values['approved_amount'][$n]) : 0;
$workorder_id=$values['workorder_id'][$n];
if(isset($values['close_order'][$n]) &&
$values['close_order'][$n] && !$values['close_order_orig'][$n])
{
@@ -674,7 +679,7 @@
$update_paid_percent[$workorder_id] = $values['paid_percent'][$n];
}
- $GLOBALS['phpgw']->db->query("UPDATE
fm_ecobilag set $dima_field ,$kostra_field,$dimd_field, mvakode =
'$tax_code',spbudact_code = '$budget_account',dimb = $dimb where id='$id'");
+ $GLOBALS['phpgw']->db->query("UPDATE
fm_ecobilag SET $dima_field ,$kostra_field,$dimd_field, mvakode =
'$tax_code',spbudact_code = '$budget_account',dimb = $dimb,godkjentbelop =
$approved_amount WHERE id='$id'");
$receipt['message'][] =
array('msg'=>lang('Voucher is updated '));
}
@@ -900,7 +905,33 @@
return $receipt;
}
+ function update_periodization($voucher_id='',$periodization='')
+ {
+ $receipt = array();
+ $this->db->transaction_begin();
+ $this->db->query("UPDATE fm_ecobilag set
periodization='$periodization' where bilagsnr='$voucher_id'");
+
+ $this->db->transaction_commit();
+
+ $receipt['message'][] = array('msg'=>lang('voucher
periodization is updated'));
+ return $receipt;
+ }
+
+ function
update_periodization_start($voucher_id='',$periodization_start='')
+ {
+ $receipt = array();
+ $this->db->transaction_begin();
+
+ $this->db->query("UPDATE fm_ecobilag set
periodization_start='$periodization_start' where bilagsnr='$voucher_id'");
+
+ $this->db->transaction_commit();
+
+ $receipt['message'][] = array('msg'=>lang('voucher
periodization start is updated'));
+ return $receipt;
+ }
+
+
function increment_bilagsnr()
{
$this->db->query("UPDATE fm_idgenerator set value =
value + 1 where name = 'Bilagsnummer'");
@@ -1083,6 +1114,7 @@
'merknad'
=> $this->db->f('merknad'),
'b_account_id'
=> $this->db->f('spbudact_code'),
'amount'
=> $this->db->f('belop'),
+ 'approved_amount'
=> $this->db->f('godkjentbelop'),
'order'
=> $this->db->f('pmwrkord_code'),
'order_id'
=> $this->db->f('pmwrkord_code'),
'kostra_id'
=> $this->db->f('kostra_id'),
@@ -1439,6 +1471,63 @@
*/
public function get_deposition()
{
+
+
+ $sql = "SELECT "
+// ." fm_project.location_code as location,"
+ . "fm_project.loc1 as eiendom,"
+// . "fm_workorder.address as adresse,"
+// . "fm_workorder.*,"
+ . "bilagsnr,"
+// . "kidnr,"
+ . "belop,"
+ . "godkjentbelop,"
+ . "fakturadato,"
+ . "periode,"
+ . "forfallsdato,"
+ . "fakturanr,"
+ . "spvend_code as vendor,"
+// . "dima,"
+// . "fm_ecobilag.loc1 as eiendom,"
+ . "dimb as kostnadssted,"
+// . "mvakode,"
+// . "dimd,"
+ . "saksbehandlerid,"
+ . "budsjettansvarligid,"
+ . "utbetalingid,"
+ . "oppsynsigndato,"
+ . "saksigndato,"
+ . "budsjettsigndato,"
+ . "utbetalingsigndato,"
+ . "merknad,"
+ . "kreditnota"
+// . "kostra_id,"
+// . "item_type,"
+// . "item_id"
+// . "external_ref,"
+// . "currency,"
+// . "process_log'"
+ . ' FROM fm_workorder'
+ . " {$this->join} fm_project ON
(fm_workorder.project_id = fm_project.id)"
+ . " {$this->join} fm_ecobilag ON (fm_workorder.id =
fm_ecobilag.pmwrkord_code)"
+ . " ORDER BY periode ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $values = array();
+ while ($this->db->next_record())
+ {
+ $orders[] = $this->db->f('id');
+ $values[] = $this->db->Record;
+ }
+
+ return $values;
+
+
+
+
+
+
+
$this->db->query("SELECT id FROM fm_workorder_status
WHERE delivered IS NOT NULL");
$delivered = array();
while ($this->db->next_record())
Modified: branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -605,9 +605,9 @@
$receipt['error'][] = array('msg'=>
lang('No conversion type could be located.') .' - ' . lang('Please choose a
conversion type from the list'));
}
- if(!$values['file'])
+ if(!$values['file'] && !$values['voucher_id'])
{
- $receipt['error'][] =
array('msg'=>lang('Please choose a file'));
+ $receipt['error'][] =
array('msg'=>lang('Please choose a file or a voucher'));
}
if(!$receipt['error'])
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -246,6 +246,23 @@
$receipt =
$this->bo->update_period($voucher_id_for_period,$period);
}
+ // Edit Periodization
+ $periodization = phpgw::get_var('periodization');
+ $voucher_id_for_periodization =
phpgw::get_var('voucher_id_for_periodization');
+ if( phpgw::get_var('phpgw_return_as') == 'json' &&
isset($periodization) && $periodization != '')
+ {
+ $receipt =
$this->bo->update_periodization($voucher_id_for_periodization,$periodization);
+ }
+
+ // Edit Periodization
+ $periodization_start =
phpgw::get_var('periodization_start');
+ $voucher_id_for_periodization_start =
phpgw::get_var('voucher_id_for_periodization_start');
+ if( phpgw::get_var('phpgw_return_as') == 'json' &&
isset($periodization_start) && $periodization_start != '')
+ {
+ $receipt =
$this->bo->update_periodization_start($voucher_id_for_periodization_start,$periodization_start);
+ }
+
+
$datatable = array();
$values_combo_box = array();
@@ -654,18 +671,242 @@
$content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id);
$uicols = array (
- 'input_type' => array('hidden','hidden'
,'hidden' ,'hidden' ,'hidden','hidden','hidden','hidden','hidden'
,'link','link'
,'hidden','hidden','hidden',$paid?'varchar':'input','varchar','varchar','varchar'
,'hidden','varchar','varchar','varchar',$paid?'hidden':'input',$paid?'hidden':'input','special','special','special','special2'),
- 'type' =>
array('number','' ,'' ,''
,'number','number','' ,'number','' ,'url' ,'msg_box' ,'' ,''
,'' ,$paid?'':'text' ,'' ,'text','text','' ,'' ,''
,'' ,$paid?'':'checkbox' ,$paid?'':'radio' ,'' ,'' ,'' ,''
),
+ 'input_type' => array
+ (
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'hidden',
+
'link',
+
'link',
+
'hidden',
+
'hidden',
+
'hidden',
+
$paid?'varchar':'input',
+
'varchar',
+
'varchar',
+
'varchar',
+
'hidden',
+
'varchar',
+
'varchar',
+
'varchar',
+
'varchar',
+
'varchar',
+
$paid?'hidden':'input',
+
$paid?'hidden':'input',
+
'special',
+
'special',
+
'special',
+
'special2'
+
),
+ 'type' => array
+ (
+
'number',
+
'',
+
'',
+
'',
+
'number',
+
'number',
+
'',
+
'number',
+
'',
+
'url',
+
'msg_box',
+
'',
+
'',
+
'',
+
$paid?'':'text',
+
'',
+
'text',
+
'text',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
$paid?'':'checkbox',
+
$paid?'':'radio',
+
'',
+
'',
+
'',
+
''
+ ),
+ 'col_name' => array
+ (
+
'payment_date',
+
'transfer',
+
'kreditnota',
+
'sign',
+
'vendor_name',
+
'counter_num',
+
'counter',
+
'voucher_id_num',
+
'voucher_id',
+
'voucher_id_lnk',
+
'voucher_date_lnk',
+
'sign_orig',
+
'num_days_orig',
+
'timestamp_voucher_date',
+
'num_days',
+
'amount_lnk',
+
'currency',
+
'vendor',
+
'invoice_count',
+
'invoice_count_lnk',
+
'type_lnk',
+
'period',
+
'periodization',
+
'periodization_start',
+
'kreditnota_tmp',
+
'sign_tmp',
+
'janitor_lnk',
+
'supervisor_lnk',
+
'budget_responsible_lnk',
+
'transfer_lnk'
+ ),
+ 'name' => array
+ (
+
'payment_date',
+
'dummy',
+
'dummy',
+
'dummy',
+
'vendor',
+
'counter',
+
'counter',
+
'voucher_id',
+
'voucher_id',
+
'voucher_id',
+
'voucher_date',
+
'sign_orig',
+
'num_days',
+
'timestamp_voucher_date',
+
'num_days',
+
'amount',
+
'currency',
+
'vendor',
+
'invoice_count',
+
'invoice_count',
+
'type',
+
'period',
+
'periodization',
+
'periodization_start',
+
'kreditnota',
+
'empty_fild',
+
'janitor',
+
'supervisor',
+
'budget_responsible',
+
'transfer_id'
+ ),
- 'col_name' =>
array('payment_date','transfer','kreditnota','sign','vendor_name','counter_num','counter','voucher_id_num','voucher_id','voucher_id_lnk','voucher_date_lnk','sign_orig'
,'num_days_orig','timestamp_voucher_date','num_days','amount_lnk','currency','vendor','invoice_count','invoice_count_lnk','type_lnk','period','kreditnota_tmp','sign_tmp'
,'janitor_lnk','supervisor_lnk','budget_responsible_lnk','transfer_lnk'),
- 'name' =>
array('payment_date','dummy','dummy','dummy','vendor','counter','counter','voucher_id'
,'voucher_id','voucher_id' ,'voucher_date' ,'sign_orig','num_days'
,'timestamp_voucher_date','num_days','amount' ,'currency','vendor'
,'invoice_count','invoice_count' ,'type'
,'period','kreditnota','empty_fild','janitor' ,'supervisor'
,'budget_responsible' ,'transfer_id'),
+ 'formatter' => array
+ (
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'myFormatDate',
+
'',
+
'',
+
'',
+
'',
+
'',
+
$paid?'':'myPeriodDropDown',
+
$paid?'':'myPeriodizationDropDown',
+
$paid?'':'myPeriodization_startDropDown',
+
'',
+
'',
+
'',
+
'',
+
'',
+
''
+ ),
- 'formatter' =>
array('','','','','','','','','','','','','','','','myFormatDate','','','','','',$paid?'':'myPeriodDropDown','','','','','',''),
-
- 'descr' =>
array('dummy','dummy','dummy','dummy','dummy','dummy','dummy','dummy','dummy',lang('voucher'),lang('Voucher
Date'),'dummy','dummy','dummy',lang('Days'),lang('Sum'),lang('currency'),lang('Vendor'),'dummy',lang('Count'),lang('Type'),lang('Period'),lang('KreditNota'),lang('None'),lang('Janitor'),lang('Supervisor'),lang('Budget
Responsible'),lang('Transfer')),
- 'className' =>
array('','','','','','','','','','','centerClasss','','','',$paid?'rightClasss':'','rightClasss','','','','rightClasss','',$paid?'centerClasss':'comboClasss','centerClasss','centerClasss','','','centerClasss','centerClasss')
+ 'descr' => array
+ (
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
'dummy',
+
lang('voucher'),
+
lang('Voucher Date'),
+
'dummy',
+
'dummy',
+
'dummy',
+
lang('Days'),
+
lang('Sum'),
+
lang('currency'),
+
lang('Vendor'),
+
'dummy',
+
lang('Count'),
+
lang('Type'),
+
lang('Period'),
+
lang('periodization'),
+
lang('periodization start'),
+
lang('KreditNota'),
+
lang('None'),
+
lang('Janitor'),
+
lang('Supervisor'),
+
lang('Budget Responsible'),
+
lang('Transfer')
+ ),
+ 'className' => array
+ (
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'',
+
'centerClasss',
+
'',
+
'',
+
'',
+
$paid?'rightClasss':'',
+
'rightClasss',
+
'',
+
'',
+
'',
+
'rightClasss',
+
'',
+
$paid?'centerClasss':'comboClasss',
+
$paid?'centerClasss':'comboClasss',
+
$paid?'centerClasss':'comboClasss',
+
'centerClasss',
+
'centerClasss',
+
'',
+
'',
+
'centerClasss',
+
'centerClasss'
+ )
);
+//_debug_array($uicols);
//url to detail of voucher
$link_sub =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.list_sub','user_lid'=>$this->user_lid));
@@ -1029,8 +1270,10 @@
'dir' =>
$datatable['sorting']['sort'],
'currentPage' =>
$datatable['sorting']['currentPage'],
'records' =>
array(),
- 'sum_amount' =>
$this->bo->sum_amount
+ 'sum_amount' =>
$this->bo->sum_amount,
+ 'periodization' => $paid ?
array() : execMethod('property.bogeneric.get_list',
array('type'=>'periodization'))
);
+
// values for datatable
if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row']))
{
@@ -1339,6 +1582,8 @@
array(
'col_name'=>'sum',
'label'=>lang('Sum'), 'className'=>'rightClasss',
'sortable'=>true, 'sort_field'=>'belop', 'visible'=>true),
array(
+ 'col_name'=>'approved_amount',
'label'=>lang('approved amount'),'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'', 'visible'=>true),
+ array(
'col_name'=>'currency',
'label'=>lang('currency'), 'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'', 'visible'=>true),
array(
'col_name'=>'dim_A',
'label'=>lang('Dim A'), 'className'=>'centerClasss',
'sortable'=>true, 'sort_field'=>'dima', 'visible'=>true),
@@ -1473,11 +1718,26 @@
else if(($i == 8))
{
-
$json_row[$uicols[$i]['col_name']] .= $invoices['currency'];
+
+ if($invoices['paid'] ==
true)
+ {
+
$json_row[$uicols[$i]['col_name']] .= $invoices['approved_amount'];
+ }
+ else
+ {
+
$json_row[$uicols[$i]['col_name']] .= " <input
name='values[approved_amount][".$j."]' id='values[approved_amount][".$j."]'
class='myValuesForPHP' type='text' size='7'
value='".$invoices['approved_amount']."'/>";
+ }
+
+
}
else if(($i == 9))
{
+
$json_row[$uicols[$i]['col_name']] .= $invoices['currency'];
+ }
+
+ else if(($i == 10))
+ {
if($invoices['paid'] ==
true)
{
$json_row[$uicols[$i]['col_name']] .= $invoices['dima'];
@@ -1487,7 +1747,7 @@
$json_row[$uicols[$i]['col_name']] .= " <input name='values[dima][".$j."]'
id='values[dima][".$j."]' class='myValuesForPHP' type='text' size='7'
value='".$invoices['dima']."'/>";
}
}
- else if(($i == 10))
+ else if(($i == 11))
{
if($invoices['paid'] ==
true)
{
@@ -1514,7 +1774,7 @@
}
}
- else if(($i == 11))
+ else if(($i == 12))
{
if($invoices['paid'] ==
true)
{
@@ -1525,7 +1785,7 @@
$json_row[$uicols[$i]['col_name']] .= " <input name='values[dimd][".$j."]'
id='values[dimd][".$j."]' class='myValuesForPHP' type='text' size='4'
value='".$invoices['dimd']."'/>";
}
}
- else if(($i == 12))
+ else if(($i == 13))
{
if($invoices['paid'] ==
true)
{
@@ -1552,7 +1812,7 @@
}
}
- else if(($i == 13))
+ else if(($i == 14))
{
if($invoices['remark']
== true)
{
@@ -1568,7 +1828,7 @@
$json_row[$uicols[$i]['col_name']] .= "<b>-</b>";
}
}
- else if(($i == 14))
+ else if(($i == 15))
{
if(isset($invoices['external_ref']) && $invoices['external_ref'])
{
@@ -1580,11 +1840,11 @@
$json_row[$uicols[$i]['col_name']] .= "<b>-</b>";
}
}
- else if($i == 15)
+ else if($i == 16)
{
$json_row[$uicols[$i]['col_name']] = $invoices['counter'];
}
- else if($i == 16)
+ else if($i == 17)
{
$json_row[$uicols[$i]['col_name']] = $invoices['id'];
}
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-11-23 21:20:19 UTC (rev 8179)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -523,6 +523,11 @@
$budget_responsible_contact_id =
$this->responsible->get_responsible($criteria_budget_responsible);
$budget_responsible_user_id =
$this->responsible->get_contact_user_id($budget_responsible_contact_id);
$order_info['budget_responsible'] =
$GLOBALS['phpgw']->accounts->get($budget_responsible_user_id)->lid;
+ //FIXME - this should be configurable
+ if(!$order_info['budget_responsible'])
+ {
+ $order_info['budget_responsible'] = 'karhal';
+ }
return $order_info;
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-11-23 21:24:12 UTC (rev 8180)
@@ -58,11 +58,11 @@
{
if(isset($this->config->config_data['invoice_approval']) &&
$this->config->config_data['invoice_approval']== 1)
{
- $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT
NULL';
+ $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT
NULL ORDER BY bilagsnr asc';
}
else
{
- $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR
oppsynsigndato IS NOT NULL) AND utbetalingsigndato IS NOT NULL';
+ $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR
oppsynsigndato IS NOT NULL) AND utbetalingsigndato IS NOT NULL ORDER BY
bilagsnr asc';
}
$this->db->query($sql,__LINE__,__FILE__);
$vouchers = array();
@@ -153,7 +153,7 @@
}
- protected function select_invoice_rollback($date, $Filnavn)
+ protected function select_invoice_rollback($date,
$Filnavn,$rollback_voucher)
{
$date_array = phpgwapi_datetime::date_array($date);
$day = $date_array['day'];
@@ -184,7 +184,15 @@
break;
}
- $sql="SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' AND $datepart_year=$year AND $datepart_month=$month AND
$datepart_day= $day";
+ if($rollback_voucher)
+ {
+ $rollback_voucher = (int)$rollback_voucher;
+ $sql="SELECT * FROM fm_ecobilagoverf WHERE
bilagsnr = {$rollback_voucher}";
+ }
+ else
+ {
+ $sql="SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' AND $datepart_year=$year AND $datepart_month=$month AND
$datepart_day= $day";
+ }
$this->db->query($sql,__LINE__,__FILE__);
$invoice_rollback = array();
@@ -201,6 +209,8 @@
'belop'
=> $this->db->f('belop'),
'fakturadato' =>
$this->db->f('fakturadato'),
'periode'
=> $this->db->f('periode'),
+ 'periodization' =>
$this->db->f('periodization'),
+ 'periodization_start' =>
$this->db->f('periodization_start'),
'forfallsdato' =>
$this->db->f('forfallsdato'),
'fakturanr'
=> $this->db->f('fakturanr'),
'spbudact_code' =>
$this->db->f('spbudact_code'),
@@ -268,6 +278,8 @@
$BilagOverf['dimd'],
$BilagOverf['mvakode'],
$BilagOverf['periode'],
+ $BilagOverf['periodization'],
+ $BilagOverf['periodization_start'],
$this->db->db_addslashes($BilagOverf['merknad']),
$BilagOverf['utbetalingid'],
$BilagOverf['oppsynsigndato'],
@@ -289,7 +301,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,"
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
. "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
- . "
periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
+ . "
periode,periodization,periodization_start,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
. "
item_type,item_id,external_ref,belop,godkjentbelop,currency,process_log,process_code)"
. " VALUES ({$values})";
@@ -394,9 +406,9 @@
$this->log_error($batchid,$error_desr);
}
- public function RullTilbake($Filnavn, $date)
+ public function RullTilbake($Filnavn, $date,$rollback_voucher)
{
- $voucher = $this->select_invoice_rollback($date,
$Filnavn);
+ $voucher = $this->select_invoice_rollback($date,
$Filnavn,$rollback_voucher);
$this->db->transaction_begin();
foreach ($voucher as $line)
@@ -433,16 +445,21 @@
{
$fil_katalog =
$this->config->config_data['export_path'];
- if(unlink ($fil_katalog. '/' . $Filnavn))
+ if($rollback_voucher)
{
$this->db->transaction_commit();
$receipt['message'][]= array('msg' =>
$antall . ' ' . lang('bilag/underbilag rullet tilbake'));
+ }
+ else if(unlink ($fil_katalog. '/' . $Filnavn))
+ {
+ $this->db->transaction_commit();
+ $receipt['message'][]= array('msg' =>
$antall . ' ' . lang('bilag/underbilag rullet tilbake'));
$receipt['message'][]= array('msg' =>
lang('File %1 is deleted',$Filnavn));
}
else
{
$this->db->transaction_abort();
- $receipt['message'][]= array('msg' =>
'Noe gikk galt!');
+ $receipt['error'][]= array('msg' =>
'Noe gikk galt!');
}
}
else
@@ -507,7 +524,6 @@
}
}
-
$antall = count($oRsBilag);
$this->db->transaction_begin();
@@ -560,6 +576,10 @@
foreach ($oRsBilag as $line)
{
$comment[] = $line['process_log'];
+
+ $BelopFelt = 'godkjentbelop';
+
+/*
//Bestem belops felt
if ($line['splitt'] == 0)
{
@@ -579,7 +599,9 @@
}
}
+*/
//Bilaget er splittet
+/*
if ($line['godkjentbelop'] == $line['belop'])
{
$BelopFelt = 'godkjentbelop';
@@ -591,7 +613,7 @@
$this->errorhandler($batchid,$message);
return $message;
}
-
+*/
$amount = $line[$BelopFelt] * 100;
if($line['order_id'])
@@ -812,12 +834,14 @@
'belop'
=> $this->db->f('belop'),
'fakturadato' =>
$this->db->f('fakturadato'),
'periode'
=> $this->db->f('periode'),
+ 'periodization' =>
$this->db->f('periodization'),
+ 'periodization_start' =>
$this->db->f('periodization_start'),
'forfallsdato' =>
$this->db->f('forfallsdato'),
'fakturanr'
=> $this->db->f('fakturanr'),
'spbudact_code' =>
$this->db->f('spbudact_code'),
'regtid'
=> $this->db->f('regtid'),
'artid'
=> $this->db->f('artid'),
- 'godkjentbelop' =>
$this->db->f('belop'),
+ 'godkjentbelop' =>
$this->db->f('godkjentbelop'),
'spvend_code' =>
$this->db->f('spvend_code'),
'dima'
=> $this->db->f('dima'),
'dimb'
=> $this->db->f('dimb'),
Modified: branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
2011-11-23 21:24:12 UTC (rev 8180)
@@ -152,6 +152,7 @@
{ text: Year
+"02", value: Year +"02", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
{ text: Year
+"03", value: Year +"03", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
{ text: Year
+"04", value: Year +"04", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
+
{ text: Year
+"05", value: Year +"05", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
{ text: Year
+"06", value: Year +"06", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
{ text: Year
+"07", value: Year +"07", onclick: { fn: onPeriodDropDownItemClick, idvoucher:
voucher_id} },
@@ -166,7 +167,62 @@
}
/********************************************************************************
+ * Format column myPeriodizationDropDown
+ */
+ var myPeriodizationDropDown = function(elCell, oRecord, oColumn, oData)
+ {
+ var periodization = values_ds.periodization;
+
+ for(i=0; i<periodization.length; i++)
+ {
+// alert(periodization[i].name);
+ }
+
+ var _label = new String(oData);
+
+//alert(_label);
+ tmp_count = oRecord._oData.counter_num;
+ voucher_id = oRecord._oData.voucher_id_num
+ elCell.innerHTML = "<div
id=\"divPeriodizationDropDown"+tmp_count+"\"></div>";
+
+ var tmp_button = new YAHOO.widget.Button({
+ type:"menu",
+ id:"oPeriodizationDropDown"+tmp_count,
+// label: "<en>" +periodization[0].id+"</en>",
+ label: "<en>" +_label+"</en>",
+ value: oData,
+ container: "divPeriodizationDropDown"+tmp_count,
+ menu: [
+ { text: periodization[0].name, value:
periodization[0].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[0].id} },
+ { text: periodization[1].name,
value: periodization[1].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[1].id} },
+ { text: periodization[2].name,
value: periodization[2].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[2].id} }
+ ]});
+ //Define this variable in the window scope (GLOBAL)
+ eval("window.oPeriodizationDropDown"+tmp_count+" = tmp_button");
+
+ }
+
+
/********************************************************************************
+ * CLick option combobox Periodization
+
+ */
+ this.onPeriodizationDropDownItemClick = function(p_sType, p_aArgs, p_oItem)
+ {
+ // alert(p_oItem.cfg.getProperty("onclick").id);
+ // console.log(p_oItem.id);
+ //Use a diferente id for voucher. This variables wil be empty
in PARTICULAR_SETTING
+ path_values.voucher_id_for_periodization =
p_oItem.cfg.getProperty("onclick").idvoucher;
+ //'text' is the option selected
+// path_values.periodization = p_oItem.cfg.getProperty('value');
+ path_values.periodization =
p_oItem.cfg.getProperty("onclick").id;
+ maintain_pagination_order();
+ //call INDEX. Update Periodization Method is inside of INDEX
+ execute_ds();
+
+ }
+
/********************************************************************************
* CLick option combobox PERIOD
+
*/
this.onPeriodDropDownItemClick = function(p_sType, p_aArgs, p_oItem)
{
@@ -181,7 +237,62 @@
}
+
/********************************************************************************
+ * Format column myPeriodization_startDropDown
+ */
+ var myPeriodization_startDropDown = function(elCell, oRecord, oColumn,
oData)
+ {
+ var d = new Date();
+ Year = d.getFullYear();
+ var _label = new String(oData);
+
+ tmp_count = oRecord._oData.counter_num;
+ voucher_id = oRecord._oData.voucher_id_num
+ elCell.innerHTML = "<div
id=\"divPeriodization_startDropDown"+tmp_count+"\"></div>";
+
+ var tmp_button = new YAHOO.widget.Button({
+ type:"menu",
+ id:"oPeriodization_startDropDown"+tmp_count,
+ label: "<en>" +_label.substring(4)+"</en>",
+ value: oData,
+ container:
"divPeriodization_startDropDown"+tmp_count,
+ menu: [
+ { text: Year +"01", value: Year +"01",
onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
+ { text: Year +"02",
value: Year +"02", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"03",
value: Year +"03", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"04",
value: Year +"04", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"05",
value: Year +"05", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"06",
value: Year +"06", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"07",
value: Year +"07", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"08",
value: Year +"08", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"09",
value: Year +"09", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"10",
value: Year +"10", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"11",
value: Year +"11", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"12",
value: Year +"12", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year+1 +"01", value: Year+1
+"01", onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher:
voucher_id} } ]});
+ //Define this variable in the window scope (GLOBAL)
+ eval("window.oPeriodization_startDropDown"+tmp_count+" =
tmp_button");
+
+ }
+
+
/********************************************************************************
+ * CLick option combobox Periodization_start
+ */
+ this.onPeriodization_startDropDownItemClick = function(p_sType, p_aArgs,
p_oItem)
+ {
+ //Use a diferente id for voucher. This variables wil be empty
in PARTICULAR_SETTING
+ path_values.voucher_id_for_periodization_start =
p_oItem.cfg.getProperty("onclick").idvoucher;
+ //'text' is the option selected
+ path_values.periodization_start =
p_oItem.cfg.getProperty('text');
+
+ maintain_pagination_order();
+ //call INDEX. Update Periodization_start Method is inside of
INDEX
+ execute_ds();
+
+ }
+
+
/********************************************************************************
*
*/
this.onSave = function()
@@ -288,7 +399,7 @@
td_empty(14);
td_sum('Total');
td_sum(tmp_sum);
- td_empty(7);
+ td_empty(9);
//RowChecked
CreateRowChecked("signClass");
CreateRowChecked("janitorClass");
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-11-23
21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-11-23
21:24:12 UTC (rev 8180)
@@ -175,6 +175,7 @@
approval from is updated property no Godkjenning fra er
oppdatert
approve property no Godkjenn
approved property no Godkjent
+approved amount property no Godkjent beløp
archive property no Arkiv
art property no Art
ask for approval property no Be om godkjenning
@@ -355,11 +356,12 @@
consume date property no Dato historisk forbruk
consume value property no Beløp historisk forbruk
consume history property no Historisk forbruk
+periodization property no Periodisering
+periodization start property no Startperiode
planning property no Planlagt
planning date property no Dato planlagt disponering
planning value property no Beløp planlagt disponering
planning serie property no Planlagt disponering
-
check to delete property no Merk for å slette
contact property no Kontakt
contact email property no Epost
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2011-11-23
21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2011-11-23
21:24:12 UTC (rev 8180)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.625';
+ $setup_info['property']['version'] = '0.9.17.626';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -143,6 +143,7 @@
'fm_ecologg',
'fm_ecomva',
'fm_ecouser',
+ 'fm_eco_periodization',
'fm_event',
'fm_event_action',
'fm_event_exception',
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -1054,6 +1054,8 @@
'currency' => array('type' =>
'varchar','precision' => '3','nullable' => True),
'process_log' => array('type' =>
'text','nullable' => True),
'process_code' => array('type' =>
'varchar','precision' => '10','nullable' => True),
+ 'periodization' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'periodization_start' => array('type' =>
'int','precision' => '4','nullable' => True)
),
'pk' => array('id'),
'ix' => array(),
@@ -1105,6 +1107,8 @@
'currency' => array('type' =>
'varchar','precision' => '3','nullable' => True),
'process_log' => array('type' =>
'text','nullable' => True),
'process_code' => array('type' =>
'varchar','precision' => '10','nullable' => True),
+ 'periodization' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'periodization_start' => array('type' =>
'int','precision' => '4','nullable' => True)
),
'pk' => array('id'),
'ix' => array(),
@@ -1152,6 +1156,16 @@
'fk' => array(),
'uc' => array()
),
+ 'fm_eco_periodization' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
+ 'descr' => array('type' =>
'varchar','precision' => '64','nullable' => False)
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array(),
+ 'uc' => array()
+ ),
'fm_order_dim1' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-11-23 21:24:12 UTC (rev 8180)
@@ -5475,7 +5475,44 @@
}
}
+ /**
+ * Update property version from 0.9.17.625 to 0.9.17.626
+ * Add periodization to voucher handling
+ */
+ $test[] = '0.9.17.625';
+ function property_upgrade0_9_17_625()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
+
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_eco_periodization', array(
+ 'fd' => array(
+ 'id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'descr' => array('type' =>
'varchar','precision' => '64','nullable' => False)
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array(),
+ 'uc' => array()
+ )
+ );
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilag','periodization',array('type'
=> 'int','precision' => 4,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilag','periodization_start',array('type'
=> 'int','precision' => 4,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','periodization',array('type'
=> 'int','precision' => 4,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','periodization_start',array('type'
=> 'int','precision' => 4,'nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.626';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
/**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
Modified: branches/Version-1_0-branch/property/templates/base/invoice.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-11-23 21:20:19 UTC (rev 8179)
+++ branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-11-23 21:24:12 UTC (rev 8180)
@@ -1086,7 +1086,7 @@
<!-- rollback -->
- <xsl:template match="rollback">
+ <xsl:template match="rollback" xmlns:php="http://php.net/xsl";>
<xsl:apply-templates select="menu"/>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -1123,13 +1123,25 @@
<td valign="top">
<xsl:variable
name="lang_file_statustext"><xsl:value-of
select="lang_file_statustext"/></xsl:variable>
<xsl:variable
name="select_file"><xsl:value-of select="select_file"/></xsl:variable>
- <select
name="{$select_file}" class="forms"
onMouseover="window.status='{$lang_file_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="{$select_file}" class="forms" title="{$lang_file_statustext}">
<option
value=""><xsl:value-of select="lang_no_file"/></option>
<xsl:apply-templates select="rollback_file_list"/>
</select>
</td>
</tr>
<tr>
+ <td valign="top">
+ <xsl:value-of
select="php:function('lang', 'voucher')" />
+ </td>
+ <td valign="top">
+ <input type="text"
id="voucher_id" name="values[voucher_id]" value="">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'voucher')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
<td valign="top">
<xsl:value-of
select="lang_date"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8180] Merge 8171:8179 from trunk,
Sigurd Nes <=