[Fmsystem-commits] [14817] Merge 14814:14816 from trunk

[Sigurd Nes]

Revision: 14817
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14817
Author:   sigurdne
Date:     2016-03-08 09:10:10 +0000 (Tue, 08 Mar 2016)
Log Message:
-----------
Merge 14814:14816 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/frontend/help/NO/contact.odt
    branches/Version-2_0-branch/frontend/setup/phpgw_no.lang
    branches/Version-2_0-branch/property/templates/base/workorder.xsl

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/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
   + /branches/dev-syncromind:13653
/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

Modified: branches/Version-2_0-branch/frontend/help/NO/contact.odt
===================================================================
(Binary files differ)

Modified: branches/Version-2_0-branch/frontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/frontend/setup/phpgw_no.lang    2016-03-08 
09:08:23 UTC (rev 14816)
+++ branches/Version-2_0-branch/frontend/setup/phpgw_no.lang    2016-03-08 
09:10:10 UTC (rev 14817)
@@ -45,7 +45,7 @@
 responsibility_id      frontend        no      Ansvarssted
 logout frontend        no      Logg ut
 help   frontend        no      Hjelp
-contact_BKB    frontend        no      Kontakt BKB
+contact_BKB    frontend        no      Kontakt EBE
 folder frontend        no      Informasjon internleie
 number_of_units        frontend        no      Antall bygg
 total_area     frontend        no      Totalt areal
@@ -92,7 +92,7 @@
 btn_search     frontend        no      Finn bruker
 btn_remove     frontend        no      Fjern myndighet
 btn_send       frontend        no      Send melding
-send_contract_message  frontend        no      Send melding til BKB angående 
kontrakten
+send_contract_message  frontend        no      Send melding til EBE angående 
kontrakten
 user_found_in_Fellesdata       frontend        no      Personen finnes i 
Fellesdata.
 user_found_in_PE       frontend        no      Personen er bruker av dette 
systemet.
 delegation_successful  frontend        no      Velykket delegering

Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl   
2016-03-08 09:08:23 UTC (rev 14816)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl   
2016-03-08 09:10:10 UTC (rev 14817)
@@ -947,6 +947,7 @@
                        <script type="text/javascript">
                                var lang = <xsl:value-of 
select="php:function('js_lang', 'please enter either a budget or contrakt 
sum')"/>;
                                var check_for_budget = <xsl:value-of 
select="check_for_budget"/>;
+                               var base_java_url = <xsl:value-of 
select="base_java_url"/>;
                        </script>
                </div>
                <div class="proplist-col">