[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.33.2.9,1.33.2.10 additem.tmpl,1.20.2.5,1.20.2.6

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24682/koha-tmpl/intranet-tmpl/default/en/acqui.simple

Modified Files:
      Tag: rel_2_2
        addbiblio.tmpl additem.tmpl 
Log Message:
Commiting all that allows Branch Independancy management :
* in acquisition module, an order can be modified/recieved/closed only by a 
librarian from the same branch than the librarian that created the basket.
* in catalogue module, an item can be modified/deleted/created only by a 
librarian from the same branch as item owner branch
* in members module, a member can be created/modified only by a librarian from 
the branch of the member.
Modifying Context.pm :
Adding userenv context variable.
Is set during checkauth or get_template_and_user
Modifying Auth.pm function checkauth : setting userenv context variable
Modifying Acquisition.pm:
    * histsearch
    * branches
    * bookfunds
    * getsupplierlistwithlateorders
    * getlateorders
    * getallorders
    * getorders
Add a branch criterium if IndependantBranches is set.
Modifiying Suggestion.pm:
    * searchsuggestions Will look first for th Librarian Branch and restrict 
search to suggestion made by users from this branch
    * countsuggestions Will look first for th Librarian Branch and restrict 
search to suggestion made by users from this branch
File Modifiying :
    * admin/aqbudget.pl adding a branch selection for budget.
    * parameters/aqbudget.tmpl
    * admin/aqbookfund.pl adding a branch selection for bookfund
    * parameters/aqookfund.tmpl
And adding branch selection to members and items changes.
WARNING: bibid are still used in additem, unlike in HEAD... Shall be soon fixed.

Index: addbiblio.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.33.2.9
retrieving revision 1.33.2.10
diff -C2 -r1.33.2.9 -r1.33.2.10
*** addbiblio.tmpl      25 Aug 2005 16:36:00 -0000      1.33.2.9
--- addbiblio.tmpl      26 Aug 2005 12:21:50 -0000      1.33.2.10
***************
*** 57,61 ****
                                <ul>
                                        <p><input type="checkbox" value=1 
name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add 
biblio again)</p>
!                                       <p>Go to <a href="additem.pl?bibid=<!-- 
TMPL_VAR name="duplicatebibid" -->" class="button catalogue">edit items</a> 
from this duplicate biblio</p>
                                </ul>
                        </div>
--- 57,61 ----
                                <ul>
                                        <p><input type="checkbox" value=1 
name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add 
biblio again)</p>
!                                       <p>Go to <a 
href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->" 
class="button catalogue">edit items</a> from this duplicate biblio</p>
                                </ul>
                        </div>

Index: additem.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -C2 -r1.20.2.5 -r1.20.2.6
*** additem.tmpl        25 Aug 2005 16:36:00 -0000      1.20.2.5
--- additem.tmpl        26 Aug 2005 12:21:50 -0000      1.20.2.6
***************
*** 35,40 ****
                                        <tr>
                                                <!-- TMPL_VAR NAME="item_value" 
-->
!                                               <td><a 
href="additem.pl?op=edititem&amp;bibid=<!-- TMPL_VAR NAME="bibid" 
-->&amp;itemnum=<!-- TMPL_VAR NAME="itemnum" -->"><img src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" 
border="0"></a></td>
!                                               <td><a 
href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="bibid" -->,<!-- TMPL_VAR 
NAME="itemnum" -->)"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR 
NAME="theme" -->/images/edittrash.png" border="0"></a></td>
                                        </tr>
                                        <!-- /TMPL_LOOP -->
--- 35,45 ----
                                        <tr>
                                                <!-- TMPL_VAR NAME="item_value" 
-->
!                                               <!-- TMPL_IF Name="nomod" -->
!                                                       <td>&nbsp;</td>
!                                                       <td>&nbsp;</td>
!                                               <!-- TMPL_ELSE -->
!                                                       <td><a 
href="additem.pl?op=edititem&amp;bibid=<!-- TMPL_VAR NAME="bibid" 
-->&amp;itemnum=<!-- TMPL_VAR NAME="itemnum" -->"><img src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" 
border="0"></a></td>
!                                                       <td><a 
href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="bibid" -->,<!-- TMPL_VAR 
NAME="itemnum" -->)"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR 
NAME="theme" -->/images/edittrash.png" border="0"></a></td>
!                                               <!-- /TMPL_IF -->
                                        </tr>
                                        <!-- /TMPL_LOOP -->
***************
*** 70,74 ****
        <input type="button" value="Modify item" onClick="Check(this.form)" 
accesskey="w" class="button catalogue">
        <!-- /TMPL_IF -->
-       </center>
        </form>
  </div>
--- 75,78 ----