Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: stetienne/ft/M…
Commits on May 19, 2011
  1. joubu

    MT6800: Addings claims count in serials

    joubu authored
    - claims_count field in serial table
    - Update query in Serial.pm
    - Column claims count in serials/claims.pl
  2. Julian Maurice joubu

    Some lines in updatedatabase.pl were duplicated by a merge

    jajm authored joubu committed
  3. joubu

    MT6802: claims for claimissues

    joubu authored
    And display a message after SendAlerts
Commits on May 17, 2011
  1. Julian Maurice

    Merge remote-tracking branch 'origin/stetienne/ft/MT6542' into dev/st…

    jajm authored
    …etienne
    
    Solved conflicts:
    	C4/Acquisition.pm
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
    	kohaversion.pl
  2. Julian Maurice
  3. Julian Maurice

    Merge remote-tracking branch 'origin/stetienne/ft/MT6531' into dev/st…

    jajm authored
    …etienne
    
    Solved conflicts:
    	C4/Acquisition.pm
    	acqui/basket.pl
    	acqui/booksellers.pl
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
    	kohaversion.pl
  4. Julian Maurice

    Merge remote-tracking branch 'origin/stetienne/ft/MT6522' into dev/st…

    jajm authored
    …etienne
    
    Solved conflicts:
    	C4/Acquisition.pm
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
  5. Julian Maurice

    Merge remote-tracking branch 'origin/stetienne/ft/MT6528' into dev/st…

    jajm authored
    …etienne
    
    Solved conflicts:
    	installer/data/mysql/updatedatabase.pl
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
    	kohaversion.pl
  6. Julian Maurice

    MT6542: Do not look at budget permissions in lateorders.pl

    jajm authored
    Orders showed in lateorders.pl are:
     - orders with the same branch that the working branch,
     - orders which belongs to a basket owned by the user, or the user is in
    basket users list.
    
    If order has no branch, it's the basket branch which is taken into
    account, and if basket has no branch, then the order is not shown.
    If user has 'order_claim_for_all' permission, all orders are shown.
  7. Julian Maurice
  8. Julian Maurice

    MT6542: Update kohaversion.pl

    jajm authored
  9. Julian Maurice

    MT6542: Add order_claim_for_all permission

    jajm authored
    If the user do not have this permission, he can claim only for orders
    which belong to a basket that is owned by him, or related to the working
    branch.
  10. Julian Maurice

    MT6532: case difference between template and perl script

    jajm authored
    There was some case problems when retrieving parameters from template.
    All is now lowercase for simplicity.
  11. Julian Maurice
  12. Julian Maurice

    MT6531: Add branch field in aqbasket table

    jajm authored
    This new field is used to filter baskets in booksellers.pl
    With permission order_manager_all, the librarian can see all baskets.
    Without this permission, the librarian can see:
     * Baskets he created
     * Baskets which has him in their users list
     * Baskets related to his working branch
  13. Julian Maurice
  14. Julian Maurice

    MT6531: Add new permission 'order_manage_all'

    jajm authored
    This new permission allow the user to see all baskets, even if he's not
    its creator, or superlibrarian.
    Added the possibility for a librarian who is in a basket users list to
    see this basket too.
  15. Julian Maurice

    MT6531: Add users list to baskets

    jajm authored
    New table aqbasketusers.
    When viewing a basket, a librarian can now manage a user list which will
    be used for permissions.
  16. Julian Maurice

    MT6531: Add confirmation message in parcel.pl

    jajm authored
    Asks confirmation when receiving an order which is in an open basket.
  17. Julian Maurice
  18. Julian Maurice
  19. Julian Maurice
  20. Julian Maurice

    MT6528: Check against order branch

    jajm authored
    If order has a branch, check against that branch rather than basket
    branch. But if it has no branch, check against basket branch.
  21. Julian Maurice

    MT6528: Change behaviour of parcel.pl 'Cancel' and 'Transfer' links

    jajm authored
    Theses links are now disabled depending on basket access rights, instead
    of budget access rights.
  22. Julian Maurice

    MT6528: Restrict order reception by branch

    jajm authored
    Users can receive only orders that are 'owned' by their library (it is
    working library, not home library).
    A permission has been added to bypass this restriction
    (order_receive_all).
    Actually the only thing this patch do is hiding the 'Receive' link in
    parcel.pl.
  23. joubu

    Merge remote branch 'origin/stetienne/ft/MT6546' into dev/stetienne

    joubu authored
    Conflicts Solved:
    	acqui/lateorders.pl
  24. joubu

    Merge remote branch 'origin/stetienne/ft/MT6543' into dev/stetienne

    joubu authored
    Conflicts Solved:
    	acqui/lateorders.pl
  25. joubu
  26. joubu
  27. joubu

    Merge remote branch 'origin/stetienne/ft/MT6539' into dev/stetienne

    joubu authored
    Conflicts solved:
    	acqui/addorderiso2709.pl
    	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
    	kohaversion.pl
Commits on May 12, 2011
  1. joubu
Commits on May 11, 2011
  1. joubu

    MT6546: FIX iso format date

    joubu authored
  2. joubu
  3. joubu

    MT6547: Stupid patch for don't sent orders at many booksellers

    joubu authored
    I can't rewrite all C4/Letters.pm now
  4. joubu
Something went wrong with that request. Please try again.