[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7906] Merge 7902:7905 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7906] Merge 7902:7905 from trunk |
|
Date: |
Fri, 21 Oct 2011 07:16:49 +0000 |
Revision: 7906
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7906
Author: sigurdne
Date: 2011-10-21 07:16:49 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Merge 7902:7905 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/property/inc/export/default/Agresso
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
+
/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
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-20
12:08:18 UTC (rev 7905)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-21
07:16:49 UTC (rev 7906)
@@ -432,7 +432,7 @@
Labels booking no Ledetekster
account_code_dimension_helptext booking no Feltene under lar deg
redigere ledetekstene som dukker opp i oversikten over konteringsstrengen samt
overskrift i CSV-eksporten. Tomme felter under fører til at tilhørende felter i
CSV- og Agressoeksport ikke kommer ut i filene.
Access denied booking no Ingen tilgang
-Send to contact booking no Send medling til registrerte
kontaktpersoner av arrangementet
+Send to contact booking no Send melding til registrerte
kontaktpersoner av arrangementet
Send to contact for overlaping allocations/bookings booking no Send
melding til registrerte kontaktpersoner hvor det er konflikt
Message sent about the changes in the reservations booking no Melding
sendt om endringer på reserverasjoner
There are changes to your reservations booking no Det er blitt endring på
din reserverasjon
@@ -533,4 +533,4 @@
Cancelation of bookings and allocations from booking no Avbestilling av
bookinger og tildelinger fra
Cancelation of bookings from booking no Avbestilling av bookinger fra
Booking system settings booking no Bookingmodul systeminnstillinger
-Frontend users can delete bookings and allocations booking no Brukere
av frontend kan slettet bookinger og tildelinger direkte
+Frontend users can delete bookings and allocations booking no Brukere
av frontend kan slette bookinger og tildelinger direkte
Modified: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-10-20 12:08:18 UTC (rev 7905)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-10-21 07:16:49 UTC (rev 7906)
@@ -336,8 +336,8 @@
To cancel allocation use this link bookingfrontend no For å slette
tildelingen bruk lenken
manual common no Veiledning lag og organisasjoner
Cancel allocation bookingfrontend no Avbestill tildelinger
-Allocations deleted on bookingfrontend no Tildelinger slettet på
-Allocation deleted on bookingfrontend no Tildeling slettet på
+Allocations deleted on bookingfrontend no Tildelinger slette på
+Allocation deleted on bookingfrontend no Tildeling slette på
Booking and allocations deleted on bookingfrontend no Booking og
tildeling er slettet på
Booking deleted on bookingfrontend no Booking slettet på
Bookings and allocations deleted on bookingfrontend no Bookinger og
tildelinger er slettet på
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2011-10-20 12:08:18 UTC (rev 7905)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2011-10-21 07:16:49 UTC (rev 7906)
@@ -284,6 +284,7 @@
foreach($GLOBALS['phpgw_domain'] as
$domain_name => $domain_vars)
{
$this->tmpl->set_var('domain_name',
$domain_name);
+
$this->tmpl->set_var('domain_display_name', str_replace('_', ' ',
$domain_name));
if (isset($_COOKIE['last_domain']) &&
$_COOKIE['last_domain'] == $domain_name)
{
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2011-10-20 12:08:18 UTC (rev 7905)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2011-10-21 07:16:49 UTC (rev 7906)
@@ -115,7 +115,7 @@
<label
for="logindomain">{lang_domain}</label>
<select
name="logindomain" id="logindomain" class="inputbox">
<!--
BEGIN domain_option -->
- <option
value="{domain_name}" {domain_selected}>{domain_name}</option>
+ <option
value="{domain_name}" {domain_selected}>{domain_display_name}</option>
<!--
END domain_option -->
</select>
</p>
Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso
2011-10-20 12:08:18 UTC (rev 7905)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso
2011-10-21 07:16:49 UTC (rev 7906)
@@ -56,18 +56,20 @@
{
if($pre_transfer)
{
- $sql= "SELECT DISTINCT periode from fm_ecobilag
WHERE utbetalingsigndato IS NULL ";
+ $sql= "SELECT DISTINCT periode from fm_ecobilag
WHERE utbetalingsigndato IS NULL";
}
else
{
- $sql= "SELECT DISTINCT periode 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 periode from fm_ecobilag
WHERE budsjettsigndato is not null and (saksigndato is not null or
oppsynsigndato is not null) and utbetalingsigndato is not null";
}
+ $periode = array();
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
$periode[] = $this->db->f('periode');
}
+
return $periode;
}
@@ -335,32 +337,25 @@
}
//Velg ut alle perioder som har bilag som skal overføres
-
-
if ($pre_transfer)
{
- $periode =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
+ $periodes =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
- for ($i=0;$i<count($periode);$i++)
+ foreach ($periodes as $periode)
{
-
- $receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode[$i],$download,$pre_transfer));
+ $receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode,$download,$pre_transfer));
}
}
-
$pre_transfer=False;
- $periode =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
+ $periodes =
$this->select_periods_with_invoice_to_transfer($pre_transfer);
- for ($i=0;$i<count($periode);$i++)
+ foreach ($periodes as $periode)
{
-
- $receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode[$i],$download,$pre_transfer,$force_period_year));
+ $receipt['message'][]= array('msg' =>
$this->OverforPeriode($batchid,$periode,$download,$pre_transfer,$force_period_year));
}
-
-
//Lagre melding
if ($download=='on' || $pre_transfer)
{
@@ -607,29 +602,29 @@
$Valuteringsdato=
date(Ymd,strtotime($oRsBilag[$k]['fakturadato']));// verdi: Dato, type: date,
plass: 251 - 258
$Bilagsdato =
date(Ymd,strtotime($oRsBilag[$k]['fakturadato'])) ;// verdi: Dato, type: date,
plass: 259 - 266
$Bilagsnr =
sprintf("%-9s",substr($oRsBilag[$k]['bilagsnr'],-8));// verdi: Bilagsnummer,
type: i4, plass: 267 - 275
- // $Periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
+ // $_periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
$ESL = sprintf("%1s",'');// verdi:
Blank, type: i+C481, plass: 282 - 282
if($pre_transfer)
{
- if(abs(date(m,time()) - $periode) >1)
+ if(abs(date('m',time()) - $periode) >1)
{
- $temp_period = date(m,time())
-1;
+ $temp_period = date('m',time())
-1;
if($temp_period == 0)
{
$temp_period =1;
}
- $temp_year = date(Y,time());
+ $temp_year = date('Y',time());
}
else
{
$temp_period = $periode;
- $temp_year =
date(Y,strtotime($oRsBilag[$k]['fakturadato']));
+ $temp_year =
date('Y',strtotime($oRsBilag[$k]['fakturadato']));
}
- $Periode =
sprintf("%06s",$temp_year . sprintf("%02d",$temp_period));// verdi: Periode,
type: i4, plass: 276 - 281
+ $_periode =
sprintf("%06s",$temp_year . sprintf("%02d",$temp_period));// verdi: Periode,
type: i4, plass: 276 - 281
$Bilagsart =
sprintf("%2s",'FF');// verdi: , type: c2, plass: 15 - 16
$Forfall = '20991231';// verdi:
Forfallsdato , type: date, plass: 298 - 305
}
@@ -638,19 +633,19 @@
/*
if($force_period_year)
{
- $Periode =
sprintf("%06s",$force_period_year . sprintf("%02d",$periode));// verdi:
Periode, type: i4, plass: 276 - 281
+ $_periode =
sprintf("%06s",$force_period_year . sprintf("%02d",$periode));// verdi:
Periode, type: i4, plass: 276 - 281
}
else
{
- $Periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
+ $_periode =
sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) .
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
}
*/
- $Periode = $periode;
+ $_periode = $periode;
$Bilagsart =
sprintf("%2s",'FD');// verdi: , type: c2, plass: 15 - 16
$Forfall =
date(Ymd,strtotime($oRsBilag[$k]['forfallsdato']));// verdi: Forfallsdato ,
type: date, plass: 298 - 305
}
-
+
$Rab_forf = sprintf("%-8s",'');// verdi:
Blank, type: date, plass: 306 - 313
$Rabatt = sprintf("%020s",'');// verdi:
Blank, type: money, plass: 314 - 333
$Avt_Kon = sprintf("%-8s",'');// verdi:
Blank, type: c8, plass: 334 - 341
@@ -827,7 +822,7 @@
$buffer .= $Buntnr . $Forsystem .
$Bilagsart . $Transtype . $Firmakode . $Konto . $Dim_1 . $Dim_2 . $Dim_3 .
$Dim_4 .
$Dim_5 . $Dim_6 . $Dim_7 . $Avgiftskode
. $Avgiftssystem . $Valutakode . $Debet_Kredit . $Valutabelop .
$Belop_i_firmavaluta . $Antall .
$Belop2 . $Belop3 . $Belop4 . $Tekst . $Valuteringsdato . $Bilagsdato .
- $Bilagsnr . $Periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
+ $Bilagsnr . $_periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
$Kid . $Bet_overforing . $Status .
$Resk_type . $Resk_nr . $Forskudd . $Fakturaref . $Fakturaref .
$Inkassokode . $Bet_mottager .
$Att_ansvarlig . $Resk_navn . $Postadresse . $Stat_Provins . $Sted .
$Bank_Postgiro_kontonr . $Betalingsmate
. $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
@@ -865,7 +860,7 @@
$buffer .= $Buntnr . $Forsystem
. $Bilagsart . $Transtype . $Firmakode . $Konto . $Dim_1 . $Dim_2 . $Dim_3 .
$Dim_4 .
$Dim_5 . $Dim_6 . $Dim_7 .
$Avgiftskode . $Avgiftssystem . $Valutakode . $Debet_Kredit . $Valutabelop .
$Belop_i_firmavaluta . $Antall
. $Belop2 . $Belop3 . $Belop4 . $Tekst . $Valuteringsdato . $Bilagsdato .
- $Bilagsnr . $Periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
+ $Bilagsnr . $_periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
$Kid . $Bet_overforing .
$Status . $Resk_type . $Resk_nr . $Forskudd . $Fakturaref . $Fakturaref .
$Inkassokode . $Bet_mottager .
$Att_ansvarlig . $Resk_navn . $Postadresse . $Stat_Provins . $Sted .
$Bank_Postgiro_kontonr .
$Betalingsmate . $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
@@ -911,7 +906,7 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Godkjent: periode:
'.$Periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' . $Filnavn;
+ $message = 'Godkjent: periode:
'.$_periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' .
$Filnavn;
}
else
{
@@ -943,7 +938,7 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Ankomstregistrering:
periode: '.$Periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' .
$Filnavn;
+ $message = 'Ankomstregistrering:
periode: '.$periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' .
$Filnavn;
}
else
{
@@ -1022,4 +1017,3 @@
}
}
}
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7906] Merge 7902:7905 from trunk,
Sigurd Nes <=