[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17431] Stable: Merge 17425:17430 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17431] Stable: Merge 17425:17430 from trunk |
|
Date: |
Tue, 12 Dec 2017 03:25:55 -0500 (EST) |
Revision: 17431
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17431
Author: sigurdne
Date: 2017-12-12 03:25:55 -0500 (Tue, 12 Dec 2017)
Log Message:
-----------
Stable: Merge 17425:17430 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uiagegroup.inc.php
branches/Version-2_0-branch/booking/inc/class.uiaudience.inc.php
branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
branches/Version-2_0-branch/booking/setup/default_records.inc.php
branches/Version-2_0-branch/booking/setup/phpgw_no.lang
branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.custom_fields.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch 2017-12-12 08:25:55 UTC (rev 17431)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking 2017-12-12 08:25:55 UTC (rev 17431)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424,17426-17430
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiagegroup.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/inc/class.uiagegroup.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -154,7 +154,7 @@
array_set_default($agegroup, 'sort', '0');
$tabs = array();
- $tabs['generic'] = array('label' => lang('Agegroup
New'), 'link' => '#agegroup_add');
+ $tabs['generic'] = array('label' => lang('add
agegroup'), 'link' => '#agegroup_add');
$active_tab = 'generic';
$agegroup['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
@@ -190,7 +190,7 @@
$this->flash_form_errors($errors);
$tabs = array();
- $tabs['generic'] = array('label' => lang('Age Group
Edit'), 'link' => '#agegroup_edit');
+ $tabs['generic'] = array('label' => lang('edit
agegroup'), 'link' => '#agegroup_edit');
$active_tab = 'generic';
$resource['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
Modified: branches/Version-2_0-branch/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiaudience.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/inc/class.uiaudience.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -167,7 +167,7 @@
$audience['cancel_link'] =
self::link(array('menuaction' => 'booking.uiaudience.index'));
$tabs = array();
- $tabs['generic'] = array('label' => lang('Audience
Add'), 'link' => '#audience_add');
+ $tabs['generic'] = array('label' => lang('new audience
group'), 'link' => '#audience_add');
$active_tab = 'generic';
// $data = array();
@@ -203,7 +203,7 @@
$this->flash_form_errors($errors);
$tabs = array();
- $tabs['generic'] = array('label' => lang('Audience
Edit'), 'link' => '#audience_edit');
+ $tabs['generic'] = array('label' => lang('edit audience
group'), 'link' => '#audience_edit');
$active_tab = 'generic';
$audience['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
Modified: branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -209,7 +209,7 @@
self::rich_text_editor('field_description');
$tabs = array();
- $tabs['generic'] = array('label' => lang('Building
New'), 'link' => '#building_form');
+ $tabs['generic'] = array('label' => lang('new
building'), 'link' => '#building_form');
$active_tab = 'generic';
$building['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
Modified: branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -639,7 +639,7 @@
$config->read();
$tabs = array();
- $tabs['generic'] = array('label' => lang('Event Edit'),
'link' => '#event_edit');
+ $tabs['generic'] = array('label' => lang('edit event'),
'link' => '#event_edit');
$active_tab = 'generic';
$external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
Modified: branches/Version-2_0-branch/booking/setup/default_records.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/setup/default_records.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/setup/default_records.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -48,3 +48,213 @@
);
$GLOBALS['phpgw']->custom_fields->add($attrib, 'bb_office_user');
+
+ $bb_activity = array(
+ array("1", null,"Idrett", 'Idrett',"1"),
+ array("2", null,"Kultur", 'Kultur',"1"),
+ array("3", null,"Friluftsliv", 'Friluftsliv',"1"),
+ array("4","1","Badminton", 'Badminton',"1"),
+ array("5","1","Amerikansk fotball", 'Amerikansk fotball',"1"),
+ array("6","1","Annen idrett", 'Annen idrett',"1"),
+ array("7","1","Bandy - inne", 'Bandy - inne',"1"),
+ array("8","1","Basketball", 'Basketball',"1"),
+ array("9","1","Bedriftsidrett", 'Bedriftsidrett',"1"),
+ array("10","1","Boksing", 'Boksing',"1"),
+ array("11","1","Bordtennis", 'Bordtennis',"1"),
+ array("12","1","Bryting", 'Bryting',"1"),
+ array("13","1","Cheerleading", 'Cheerleading',"1"),
+ array("14","1","Dansing", 'Dansing',"1"),
+ array("15","1","Fotball", 'Fotball',"1"),
+ array("16","1","Friidrett", 'Friidrett',"1"),
+ array("17","1","Håndball", 'Håndball',"1"),
+ array("18","1","Innebandy", 'Innebandy',"1"),
+ array("19","1","Kampsport", 'Kampsport',"1"),
+ array("20","1","Klatring", 'Klatring',"1"),
+ array("21","1","Orientering", 'Orientering',"1"),
+ array("22","1","Skisport", 'Skisport',"1"),
+ array("23","1","Skyting", 'Skyting',"1"),
+ array("24","1","Stuping", 'Stuping',"1"),
+ array("25","1","Styrkeløfting", 'Styrkeløfting',"1"),
+ array("26","1","Svømming", 'Svømming',"1"),
+ array("27","1","Turn", 'Turn',"1"),
+ array("28","1","Vannsport", 'Vannsport',"1"),
+ array("29","1","Volleyball", 'Volleyball',"1"),
+ array("30","1","Vektløfting", 'Vektløfting',"1"),
+ array("31","2","Dans", 'Dans',"1"),
+ array("32","2","Teater", 'Teater',"1"),
+ array("33","2","Speidar", 'Speidar',"1"),
+ array("34","2","Musikk / Korps", 'Musikk / Korps',"1"),
+ array("35","2","Sosiale møteplassar", 'Sosiale
møteplassar',"1"),
+ array("36","2","Musikk", 'Musikk',"1"),
+ array("37","2","Festivaler / Mønstringer", 'Festivaler /
Mønstringer',"1"),
+ array("38","2","Humanitære organiasjoner", 'Humanitære
organiasjoner',"1"),
+ array("39","2","Interesseorganiasjonar",
'Interesseorganiasjonar',"1"),
+ array("40","2","Kor", 'Kor',"1"),
+ array("41","2","Kulturlokaler", 'Kulturlokaler',"1"),
+ array("42","2","Kulturlokaler formidling og øving",
'Kulturlokaler formidling og øving',"1"),
+ array("43","2","Kulturlokaler øving og verksteder",
'Kulturlokaler øving og verksteder',"1"),
+ array("44","2","Kulturvern og sogelag", 'Kulturvern og
sogelag',"1"),
+ array("45","2","Kunst, håndverk og media", 'Kunst, håndverk og
media',"1"),
+ array("46","2","Meningheter og trossamfunn", 'Meningheter og
trossamfunn',"1"),
+ array("47", null,"Annet", 'Annet',"1"),
+// array("48","47","Idrett møterom", 'Idrett møterom',"0"),
+ array("49", 47,"Annet - Idrett møterom", 'Annet - Idrett
møterom',"1"),
+ array("50", 47,"Annet - Kultur møterom", 'Annet - Kultur
møterom',"1"),
+ array("51", 47,"Annet - Internt i kommunen", 'Annet - Internt i
kommunen',"1"),
+ array("52", 47,"Annet - Offentlig arrangement", 'Annet -
Offentlig arrangement',"1"),
+ array("53", 47,"Annet - Personlig markering", 'Annet -
Personlig markering',"1"),
+ array("54","1","PU/HU", 'PU/HU',"1"),
+ array("55", null,"Skule","Skular i kommunen som bruker
kommunale idrettsanlegg til idrett og arrangementer","1"),
+ array("56","1","Idrettshall","Kommunal idrettshall","1"),
+ array("57","1","Fleridrettslag","Idrettslag med flere
idrettsgrener tilknytte laget.","1"),
+ array("58","1","Fotballbane","Fotballbaner. Grus, kunstgras
eller naturgrasbane","1"),
+ array("59","1","Symjehall","Kommunal symjehall","1"),
+ array("60","1","Gymsal","Gymsal tilknytta til skule","1"),
+ array("61", null,"Undervisning/opplæring",
'Undervisning/opplæring',"1"),
+ array("62", null,"Kommersiell utleige","Utleie til kommersielle
arrangementer i kommunale bygg og idrettsanlegg","1"),
+ array("63","1","Sykling","Sykling","1"),
+ array("64","2","Grendalag", 'Grendalag',"1"),
+ array("65","47","Stengt pga ferie eller
arrangement","Idrettsanlegget er stengt for trening. Det kan være pga ferie
eller arrangement. Ta kontakt med Kulturavdelinga i kommunen for meir
informasjon.","0"),
+ array("66", null,"Stengt pga ferie eller
arrangement","Idrettsanlegget er stengt for trening. Det kan være pga ferie
eller arrangement. Ta kontakt med Kulturavdelinga i kommunen for meir
informasjon.","1")
+ );
+
+ foreach ($bb_activity as $value_set)
+ {
+ $values =
$GLOBALS['phpgw_setup']->oProc->validate_insert($value_set);
+ $sql = "INSERT INTO bb_activity (id, parent_id, name,
description, active) VALUES ({$values})";
+ $GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
+ }
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT setval('seq_bb_activity',
COALESCE((SELECT MAX(id)+1 FROM bb_activity), 1), false)", __LINE__, __FILE__);
+
+
+ $bb_agegroup = array(
+ array(1,"Småbarn 0-5 år",0,"''",0,1),
+ array(2,"Born 0-12 år",1,"Barn fra 0 til og med 12 år",1,1),
+ array(3,"Ungdom 13-19 år",2,"''",1,1),
+ array(4,"Vaksen 20- 59 år",4,"''",1,1),
+ array(5,"Pensjonister",0,"''",0,1),
+ array(6,"Unge voksne 20- 25 år",3,"''",0,1),
+ array(7,"Senior 60+år",5,"''",1,1),
+ array(8,"Publikum",6,"Her legger du inn estimert
publikum.",1,1),
+ array(9,"Møtedeltakare",8,"''",1,1),
+ array(10,"Småbarn 0-5 år",0,"",0,2),
+ array(11,"Born 0-12 år",1,"Barn fra 0 til og med 12 år",1,2),
+ array(12,"Ungdom 13-19 år",2,"",1,2),
+ array(13,"Vaksen 20- 59 år",4,"",1,2),
+ array(14,"Pensjonister",0,"",0,2),
+ array(15,"Unge voksne 20- 25 år",3,"",0,2),
+ array(16,"Senior 60+år",5,"",1,2),
+ array(17,"Publikum",6,"Her legger du inn estimert
publikum.",1,2),
+ array(18,"Møtedeltakare",8,"",1,2),
+ array(19,"Småbarn 0-5 år",0,"",0,3),
+ array(20,"Born 0-12 år",1,"Barn fra 0 til og med 12 år",1,3),
+ array(21,"Ungdom 13-19 år",2,"",1,3),
+ array(22,"Vaksen 20- 59 år",4,"",1,3),
+ array(23,"Pensjonister",0,"",0,3),
+ array(24,"Unge voksne 20- 25 år",3,"",0,3),
+ array(25,"Senior 60+år",5,"",1,3),
+ array(26,"Publikum",6,"Her legger du inn estimert
publikum.",1,3),
+ array(27,"Møtedeltakare",8,"",1,3),
+ );
+
+ foreach ($bb_agegroup as $value_set)
+ {
+ $values =
$GLOBALS['phpgw_setup']->oProc->validate_insert($value_set);
+ $sql = "INSERT INTO bb_agegroup (id, name, sort, description,
active, activity_id) VALUES ({$values})";
+ $GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
+ }
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT setval('seq_bb_agegroup',
COALESCE((SELECT MAX(id)+1 FROM bb_agegroup), 1), false)", __LINE__, __FILE__);
+
+ $bb_targetaudience = array(
+ array(1,"Fleirkulturelle",7,"''",0,1),
+ array(2,"Born",1,"Barn fra 0 til og med 18 år",1,1),
+ array(3,"Ungdom",2,"Ungdom 13 til og med 19 år",1,1),
+ array(4,"Vaksen",3,"Vaksne mellom 20 - 59 år",1,1),
+ array(5,"Utviklingshemma",5,"''",0,1),
+ array(6,"Senior",4,"Senior fra 60 år",1,1),
+ array(7,"Funksjonshemma",6,"Funksjonhemma",1,1),
+ array(8,"Amatørkultur",9,"''",0,1),
+ array(9,"Offentleg arrangement",10,"Arrangement i regi av det
offentlege",0,1),
+ array(10,"Profesjonell kultur",8,"''",0,1),
+ array(11,"Toppidrett",7,"Idrett på topp nivå i Norge",0,1),
+ array(12,"Publikum",12,"Publikum til stades",1,1),
+ array(13,"Private arrangement",11,"Private arrangement",1,1),
+ array(14,"Møte",9,"Møte i lokale",1,1),
+ array(15,"Fleirkulturelle",7,"",0,2),
+ array(16,"Born",1,"Barn fra 0 til og med 18 år",1,2),
+ array(17,"Ungdom",2,"Ungdom 13 til og med 19 år",1,2),
+ array(18,"Vaksen",3,"Vaksne mellom 20 - 59 år",1,2),
+ array(19,"Utviklingshemma",5,"",0,2),
+ array(20,"Senior",4,"Senior fra 60 år",1,2),
+ array(21,"Funksjonshemma",6,"Funksjonhemma",1,2),
+ array(22,"Amatørkultur",9,"",0,2),
+ array(23,"Offentleg arrangement",10,"Arrangement i regi av det
offentlege",0,2),
+ array(24,"Profesjonell kultur",8,"",0,2),
+ array(25,"Toppidrett",7,"Idrett på topp nivå i Norge",0,2),
+ array(26,"Publikum",12,"Publikum til stades",1,2),
+ array(27,"Private arrangement",11,"Private arrangement",1,2),
+ array(28,"Møte",9,"Møte i lokale",1,2),
+ array(29,"Fleirkulturelle",7,"",0,3),
+ array(30,"Born",1,"Barn fra 0 til og med 18 år",1,3),
+ array(31,"Ungdom",2,"Ungdom 13 til og med 19 år",1,3),
+ array(32,"Vaksen",3,"Vaksne mellom 20 - 59 år",1,3),
+ array(33,"Utviklingshemma",5,"",0,3),
+ array(34,"Senior",4,"Senior fra 60 år",1,3),
+ array(35,"Funksjonshemma",6,"Funksjonhemma",1,3),
+ array(36,"Amatørkultur",9,"",0,3),
+ array(37,"Offentleg arrangement",10,"Arrangement i regi av det
offentlege",0,3),
+ array(38,"Profesjonell kultur",8,"",0,3),
+ array(39,"Toppidrett",7,"Idrett på topp nivå i Norge",0,3),
+ array(40,"Publikum",12,"Publikum til stades",1,3),
+ array(41,"Private arrangement",11,"Private arrangement",1,3),
+ array(42,"Møte",9,"Møte i lokale",1,3),
+ );
+
+ foreach ($bb_targetaudience as $value_set)
+ {
+ $values =
$GLOBALS['phpgw_setup']->oProc->validate_insert($value_set);
+ $sql = "INSERT INTO bb_targetaudience (id, name, sort,
description, active, activity_id) VALUES ({$values})";
+ $GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
+ }
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT
setval('seq_bb_targetaudience', COALESCE((SELECT MAX(id)+1 FROM
bb_targetaudience), 1), false)", __LINE__, __FILE__);
+
+// Default groups and users
+ $GLOBALS['phpgw']->accounts = createObject('phpgwapi.accounts');
+ $GLOBALS['phpgw']->acl = CreateObject('phpgwapi.acl');
+ $GLOBALS['phpgw']->acl->enable_inheritance = true;
+
+
+ $modules = array(
+ 'booking',
+ 'manual',
+ 'preferences',
+ 'property'
+ );
+
+ $aclobj = & $GLOBALS['phpgw']->acl;
+
+ if (!$GLOBALS['phpgw']->accounts->exists('booking_group'))
+ {
+ $account = new phpgwapi_group();
+ $account->lid = 'booking_group';
+ $account->firstname = 'Booking';
+ $account->lastname = 'Group';
+ $rental_group = $GLOBALS['phpgw']->accounts->create($account,
array(), array(), $modules);
+ }
+ else
+ {
+ $rental_group =
$GLOBALS['phpgw']->accounts->name2id('booking_group');
+ }
+
+ $aclobj->set_account_id($rental_group, true);
+ $aclobj->add('booking', '.office', 7);
+ $aclobj->add('booking', 'run', 1);
+ $aclobj->add('property', '.', 1);
+ $aclobj->add('property', 'run', 1);
+ $aclobj->add('preferences', 'changepassword', 1);
+ $aclobj->add('preferences', '.', 1);
+ $aclobj->add('preferences', 'run', 1);
+ $aclobj->save_repository();
Modified: branches/Version-2_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2017-12-12
08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2017-12-12
08:25:55 UTC (rev 17431)
@@ -77,9 +77,10 @@
documents booking no Dokumenter
drawing booking no Tegning
edit booking no Rediger
-edit agegroup group booking no Rediger aldersgruppe
+add agegroup booking no Ny aldersgruppe
+edit agegroup booking no Rediger aldersgruppe
edit allocation booking no Rediger tildeling
-edit Audience group booking no Rediger målgruppe
+edit audience group booking no Rediger målgruppe
edit booking booking no Rediger interntildeling
edit event booking no Rediger arrangement
edit organization booking no Rediger organisasjon
Modified: branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -143,7 +143,7 @@
else if (isset($_POST['remove']))
{
$account_id = phpgw::get_var('account_id');
- $result =
frontend_bofrontend::remove_delegate($account_id, null, null);
+ $result =
frontend_bofrontend::remove_delegate($account_id, 0, 0);
if ($result)
{
$msglog['message'][] = array('msg' =>
lang('remove_delegate_successful'));
@@ -158,7 +158,7 @@
$account_id = phpgw::get_var('account_id');
//Parameter to delegate access to only a single
organisational unit
$org_unit_id =
$this->header_state['selected_org_unit'];
- $result =
frontend_bofrontend::remove_delegate($account_id, null, $org_unit_id);
+ $result =
frontend_bofrontend::remove_delegate($account_id, 0, $org_unit_id);
if ($result)
{
$msglog['message'][] = array('msg' =>
lang('remove_delegate_successful'));
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -378,7 +378,7 @@
. " WHERE location_id
='{$values['location_id']}'";
$this->_db->query($sql, __LINE__, __FILE__);
$this->_db->next_record();
- $values['id'] = $this->_db->f('current_id') +
1;
+ $values['id'] =
(int)$this->_db->f('current_id') + 1;
$sql = 'SELECT MAX(attrib_sort) AS max_sort'
. ' FROM phpgw_cust_attribute '
@@ -385,7 +385,7 @@
. " WHERE location_id
='{$values['location_id']}' AND group_id = {$values['group_id']}";
$this->_db->query($sql, __LINE__, __FILE__);
$this->_db->next_record();
- $values['attrib_sort'] =
$this->_db->f('max_sort') + 1;
+ $values['attrib_sort'] =
(int)$this->_db->f('max_sort') + 1;
$cols = implode(', ', array_keys($values));
$vals = $this->_db->validate_insert($values);
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-12-12
08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-12-12
08:25:55 UTC (rev 17431)
@@ -749,7 +749,7 @@
$this->query("SELECT max(id) as maximum FROM $table
$where",__LINE__,__FILE__);
$this->next_record();
- $next_id = $this->f('maximum')+1;
+ $next_id = (int)$this->f('maximum')+1;
return $next_id;
}
Modified: branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-12-12
08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-12-12
08:25:55 UTC (rev 17431)
@@ -269,7 +269,7 @@
about %1 about no Om %1
group common no Gruppe
smtp server is not set! (admin section) common no SMTP serveren
er ikke konfigurert (admin seksjonen)
-set permission common no sett rettighet
+set permission common no Definer rettigheter
right common no Rettighet
mask common no Maskering
result common no Resultat
@@ -276,4 +276,6 @@
manage common no Administrer
read common no Les
select a location! common no Velg en lokasjon
-no location common no Ingen lokasjon
\ No newline at end of file
+no location common no Ingen lokasjon
+enable inheritance common no Aktiver arving
+users common no Brukere
Modified:
branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
2017-12-12 08:21:24 UTC (rev 17430)
+++ branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
2017-12-12 08:25:55 UTC (rev 17431)
@@ -314,6 +314,29 @@
// XXX: Which charsets do Agresso accept/expect? Do we
need to something regarding padding and UTF-8?
$order = array();
+ $kem = 'bergen';
+ if($kem == 'bergen') //Bergen
+ {
+ $batch_id = "BKBPE{$this->date_str}";
+ $client = 'BY'; // For Bergen Kommune
+ $confirm_date = $this->date_str;
+ $pay_method = 'IP';
+ $responsible ='BKBPE';
+ $responsible2 ='BKBPE';
+ $terms_id = '';
+ $voucher_type = 'FU';
+ }
+ else if($kem == 'nlsh')
+ {
+ $batch_id = "PE{$this->date_str}";// må avklares
+ $client = '14';
+ $confirm_date = '';
+ $pay_method = 'BG';
+ $responsible ='BKBPE';// må avklares
+ $responsible2 ='BKBPE';// må avklares
+ $terms_id = '14';
+ $voucher_type = 'FU'; // må avklares
+ }
$order[] = // Header line
'1' // 1 accept_flag
@@ -332,10 +355,10 @@
. sprintf("%2s", '') // 17
att_6_id
. sprintf("%2s", '') // 18
att_7_id
. sprintf("%35s", '') // 19
bank_account
- . sprintf("%-12s", "BKBPE{$this->date_str}")
// 20 batch_id DATA
- . 'BY' // 21 client
DATA
+ . sprintf("%-12s", $batch_id) // 20
batch_id DATA
+ . $client // 21 client
DATA
. sprintf("%2s", '') // 22
client_ref
- . sprintf("%-17s", "{$this->date_str}") //
23 confirm_date DATA
+ . sprintf("%-17s", "{$confirm_date}") //
23 confirm_date DATA
. sprintf("%1s", '') // 24
control
. sprintf("%17s", '') // 25
just white space..
. 'NOK' // 26 currency
DATA
@@ -371,7 +394,7 @@
. sprintf("%-17s", '') // 64
order_date
. sprintf("%09.9s", $serial_number) // 65
order_id DATA
. 'FS' // 66 order_type
DATA
- . 'IP' // 67 pay_method
DATA
+ . $pay_method // 67
pay_method DATA
// (68)
. sprintf("%02s", '')
. sprintf("%04.4s", $bill_year)
@@ -379,8 +402,8 @@
. sprintf("%30s", '') // 70
place
. sprintf("%40s", '') // 71
province
. sprintf("%12s", '') // 72
just white space..
- . sprintf("%-8s", 'BKBPE') // 73
responsible DATA
- . sprintf("%-8s", 'BKBPE') // 74
responsible2 DATA
+ . sprintf("%-8s", $responsible) // 73
responsible DATA
+ . sprintf("%-8s", $responsible2) // 74
responsible2 DATA
. sprintf("%8s", '') // 75
just white space..
. sprintf("%-08s", '') // 76
sequence_ref
. sprintf("%80s", '') // 77-78 just
white space..
@@ -387,7 +410,7 @@
. 'N' // 79 status
DATA
. sprintf("%4s", '') // 80-82 just
white space..
. sprintf("%08s", '') // 83
template_id
- . sprintf("%2s", '') // 84
terms_id
+ . sprintf("%2s", $terms_id) // 84
terms_id
. sprintf("%12s", '') // 85
tekx1
. sprintf("%-12s", $party_id) // 86
tekst2 DATA
. sprintf("%12s", $customer_order_id ?
$customer_order_id : '') // 87 tekst3
@@ -395,7 +418,7 @@
. '42' // 89 trans_type
DATA
. sprintf("%70s", '') // 90-92 just
white space..
. sprintf("%09s", '') // 93
voucher_ref
- . 'FU' // 94 voucher_type
DATA
+ . $voucher_type // 94
voucher_type DATA
. sprintf("%4s", '') // 95
just white space..
. sprintf("%15s", '') // 96
zip_code
;
@@ -413,8 +436,8 @@
. sprintf("%-35.35s",
utf8_decode($item['article_description'])) // 10 art_descr
DATA
. sprintf("%-15.15s",
$item['article_code']) // 11 article
DATA
. sprintf("%49s", '') // 12-19
just white space..
- . sprintf("%-12s",
"BKBPE{$this->date_str}") // 20 batch_id
DATA
- . 'BY' // 21 client
DATA
+ . sprintf("%-12s", $batch_id) //
20 batch_id DATA
+ . $client // 21 client
DATA
. sprintf("%20s", '') // 22-24
just white space..
. sprintf("%017s", '') // 25
cur_amount
. sprintf("%464s", '') // 26-34
just white space..
@@ -466,7 +489,7 @@
$order[] = // Text line
'0' . // 1
sprintf("%345s", '') // 2-19
just white space.. DATA
- . sprintf("%-12s",
"BKBPE{$this->date_str}") // 20 batch_id
DATA
+ . sprintf("%-12s", $batch_id) //
20 batch_id DATA
. 'BY' // 21 client
DATA
. sprintf("%692s", '') // 22-53
just white space..
. sprintf("%04.4s", $item_counter) //
54 line_no DATA
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17431] Stable: Merge 17425:17430 from trunk,
sigurdne <=