[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8212] Merge 8208:8211 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8212] Merge 8208:8211 from trunk |
|
Date: |
Tue, 29 Nov 2011 12:47:44 +0000 |
Revision: 8212
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8212
Author: sigurdne
Date: 2011-11-29 12:47:43 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Merge 8208:8211 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/admin/inc/class.boconfig.inc.php
branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
branches/Version-1_0-branch/admin/templates/base/config.xsl
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
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,8172-8179,8181,8183-8196,8198-8207
+
/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,8181,8183-8196,8198-8207,8209-8211
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-11-29 12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-11-29 12:47:43 UTC (rev 8212)
@@ -375,7 +375,7 @@
activity_helptext activitycalendar no Aktivitetsoversikten
henter kontaktinformasjon og beskrivelse fra bookingmodulen.<br/>Før ny
aktivitet kan registreres må du sjekke at organisasjon/gruppe finnes og er
oppdatert,<br/>og at arena finnes og er oppdatert. Feltet vis i portal skal
være satt til JA, i organisasjonsregisteret og evt. lag/gruppe. For nye
aktiviteter vil dette bli satt automatisk.
mail_subject_update activitycalendar no Melding fra AktivBy -
aktivitetsoversikt
mail_body_update activitycalendar no Dette er en melding fra
Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger i kommuneportalen
på internett, står du registrert som kontaktperson for %1.<br/>Ber om at du
kontrollerer at data er korrekt, og eventuelt endrer.<br/>%2<br/><br/><br/> Mvh
%3 kulturkontor
-mail_body_state_3 activitycalendar no Informasjon om din
aktivitet er publisert i kommuneportalen.<br/>De som er registrert som
kontaktpersoner får endre informasjonen, dette gjøres via nettsiden.
https://www.bergen.kommune.no/tjenestetilbud/aktivitetsoversikt/<br/><br/><br/>
Mvh %1 kulturkontor
+mail_body_state_3 activitycalendar no Informasjon om din
aktivitet er registrert og vil bli publisert i kommuneportalen i løpet av
dagen.<br/>De som er registrert som kontaktpersoner får endre informasjonen,
dette gjøres via nettsiden:
https://www.bergen.kommune.no/tjenestetilbud/aktivitetsoversikt/<br/><br/><br/>
Mvh %1 kulturkontor
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
send_mail activitycalendar no Send e-post
Modified: branches/Version-1_0-branch/admin/inc/class.boconfig.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.boconfig.inc.php
2011-11-29 12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/admin/inc/class.boconfig.inc.php
2011-11-29 12:47:43 UTC (rev 8212)
@@ -306,13 +306,29 @@
function select_input_type_list($selected='')
{
- $input_type[0]['id'] = 'text';
- $input_type[0]['name'] = 'text';
- $input_type[1]['id'] = 'listbox';
- $input_type[1]['name'] = 'listbox';
- $input_type[2]['id'] = 'password';
- $input_type[2]['name'] = 'Password';
-
+ $input_type = array
+ (
+ array
+ (
+ 'id' => 'text',
+ 'name' => 'text'
+ ),
+ array
+ (
+ 'id' => 'listbox',
+ 'name' => 'listbox'
+ ),
+ array
+ (
+ 'id' => 'password',
+ 'name' => lang('password')
+ ),
+ array
+ (
+ 'id' => 'date',
+ 'name' => lang('date')
+ ),
+ );
return $this->select_list($selected,$input_type);
}
Modified: branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
2011-11-29 12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
2011-11-29 12:47:43 UTC (rev 8212)
@@ -11,6 +11,7 @@
* @version $Id: class.soconfig.inc.php 3613 2009-09-18 16:19:49Z sigurd
$
*/
+ phpgw::import_class('phpgwapi.datetime');
/**
* Description
* @package admin
@@ -242,17 +243,29 @@
{
$this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
}
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$config_info = array();
while ($this->db->next_record())
{
$input_type = $this->db->f('input_type');
+ switch($input_type)
+ {
+ case 'password':
+ $value = '****';
+ break;
+ case 'date':
+ $value =
$GLOBALS['phpgw']->common->show_date($this->db->f('value'),$dateformat);
+ break;
+ default:
+ $value = $this->db->f('value',
true);
+ }
$config_info[] = array
(
- 'id' => $this->db->f('id'),
+ 'id' =>
$this->db->f('id'),
'section_id' =>
$this->db->f('section_id'),
- 'value_id' =>
$this->db->f('value_id'),
- 'name' => $this->db->f('name',
true),
- 'value' => $input_type ==
'password' && $this->db->f('value') ? '****' : $this->db->f('value', true)
+ 'value_id' =>
$this->db->f('value_id'),
+ 'name' =>
$this->db->f('name', true),
+ 'value' => $value
);
}
return $config_info;
@@ -472,6 +485,11 @@
function add_value($values)
{
+ if(isset($values['input_type']) &&
$values['input_type'] == 'date')
+ {
+ $values['value'] =
phpgwapi_datetime::date_to_timestamp($values['value']);
+ }
+
$this->db->transaction_begin();
$values['value'] =
$this->db->db_addslashes($values['value']);
@@ -499,6 +517,11 @@
function edit_value($values)
{
+ if(isset($values['input_type']) &&
$values['input_type'] == 'date')
+ {
+ $values['value'] =
phpgwapi_datetime::date_to_timestamp($values['value']);
+ }
+
if(!$values['value'])
{
$this->delete_value($values['section_id'],$values['attrib_id'],$values['id']);
Modified: branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
2011-11-29 12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
2011-11-29 12:47:43 UTC (rev 8212)
@@ -543,7 +543,6 @@
$multiple_choice= true;
}
-
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
$data = array
@@ -814,25 +813,34 @@
$values['value'] = '';
}
+ if($attrib['input_type'] == 'date')
+ {
+ $values['value'] =
$GLOBALS['phpgw']->common->show_date($values['value'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $jscal = CreateObject('phpgwapi.jscalendar');
+ $jscal->add_listener("date_value");
+ }
+
$data = array
(
- 'lang_section'
=> lang('section'),
- 'value_section_name' =>
$section['name'],
+ 'lang_section' =>
lang('section'),
+ 'value_section_name' =>
$section['name'],
'lang_attrib' =>
lang('attribute'),
'value_attrib_name' =>
$attrib['name'],
-
- 'value_value' =>
$values['value'],
+ 'value_input_type' =>
$attrib['input_type'],
+ 'value_attrib_value' =>
$values['value'],
'lang_value' =>
lang('value'),
'choice_list' =>
$choice_list,
'lang_no_value' =>
lang('no value'),
'lang_value_status_text' => lang('select
value'),
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle' =>
lang('Select date'),
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_id'
=> lang('ID'),
'lang_save'
=> lang('save'),
'lang_cancel' =>
lang('cancel'),
- 'lang_section'
=> lang('section'),
+ 'lang_section' =>
lang('section'),
'value_section' =>
$section['name'],
'lang_attrib' =>
lang('attribute'),
'value_attrib' =>
$attrib['name'],
Modified: branches/Version-1_0-branch/admin/templates/base/config.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/config.xsl 2011-11-29
12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/admin/templates/base/config.xsl 2011-11-29
12:47:43 UTC (rev 8212)
@@ -633,19 +633,29 @@
</td>
<td>
<xsl:choose>
- <xsl:when test="choice_list = ''">
- <input type="text" size="20"
name="values[value]" value="{value_value}">
+ <xsl:when test="value_input_type =
'listbox'">
+ <xsl:variable
name="lang_value_status_text"><xsl:value-of
select="lang_value_status_text"/></xsl:variable>
+ <select name="values[value]"
class="forms" title="{$lang_value_status_text}">
+ <option
value=""><xsl:value-of select="lang_no_value"/></option>
+ <xsl:apply-templates
select="choice_list"/>
+ </select>
+ </xsl:when>
+ <xsl:when test="value_input_type =
'date'">
+ <input type="text"
id="date_value" name="values[value]" size="10" value="{value_attrib_value}"
readonly="readonly">
<xsl:attribute
name="title">
- <xsl:value-of
select="lang_value_status_text"/>
+ <xsl:value-of
select="lang_date_statustext"/>
</xsl:attribute>
</input>
+ <img id="date_value-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
+ <input type="hidden"
name="values[input_type]" value="date"></input>
</xsl:when>
<xsl:otherwise>
- <xsl:variable
name="lang_value_status_text"><xsl:value-of
select="lang_value_status_text"/></xsl:variable>
- <select name="values[value]"
class="forms" title="{$lang_value_status_text}">
- <option
value=""><xsl:value-of select="lang_no_value"/></option>
- <xsl:apply-templates
select="choice_list"/>
- </select>
+ <input type="text" size="20"
name="values[value]" value="{value_attrib_value}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_value_status_text"/>
+ </xsl:attribute>
+ </input>
+
</xsl:otherwise>
</xsl:choose>
</td>
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-29
12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-11-29
12:47:43 UTC (rev 8212)
@@ -163,6 +163,7 @@
)
);
+
$admin_children_accounting = array
(
'accounting_cats' => array
@@ -195,6 +196,11 @@
'text' =>
lang('periodization'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'periodization') )
),
+ 'accounting_config' => array
+ (
+ 'text' =>
lang('accounting config'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig2.index', 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.invoice')) )
+ ),
'accounting_tax' => array
(
'text' =>
lang('Accounting tax'),
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-29 12:43:58 UTC (rev 8211)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-11-29 12:47:43 UTC (rev 8212)
@@ -52,6 +52,7 @@
$this->soXport =
CreateObject('property.soXport');
$this->config =
CreateObject('phpgwapi.config','property');
$this->config->read_repository();
+ $this->custom_config =
CreateObject('admin.soconfig',$GLOBALS['phpgw']->locations->get_id('property',
'.invoice'));
}
protected function select_vouchers_to_transfer()
@@ -599,11 +600,22 @@
{
$periode = $oRsBilag[0]['periode'];
}
- else
+ else if
(isset($this->custom_config->config_data['export']['dato_aarsavslutning']) &&
time() < $this->custom_config->config_data['export']['dato_aarsavslutning'])
{
- $periode = date('Ym',time());
+ if(date('Y',time()) == date('Y',
$this->custom_config->config_data['export']['dato_aarsavslutning']))
+ {
+ $periode = date('Y',time()) - 1 . '11';
+ }
+ else
+ {
+ $periode = date('Ym',time());
+ }
}
-
+ else
+ {
+ $periode = date('Ym',time());
+ }
+
$comment = array();
foreach ($oRsBilag as $line)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8212] Merge 8208:8211 from trunk,
Sigurd Nes <=