Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various #103

Merged
merged 19 commits into from Oct 20, 2018
Merged

Various #103

merged 19 commits into from Oct 20, 2018

Commits on Jun 30, 2018

  1. New utility to correct periods where gltrans committed with 0 period … 

    …in error - webSHOP bug
    @PhilDaintree
    PhilDaintree committed Jun 30, 2018
    Copy the full SHA
    c32df34 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2018

  1. Change log entry

    @PhilDaintree
    PhilDaintree committed Jul 1, 2018
    Copy the full SHA
    8ee75e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2018

  1. new script to fix bug in CounterLogicPOS

    @PhilDaintree
    PhilDaintree committed Jul 21, 2018
    Copy the full SHA
    430b053 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @PhilDaintree
    PhilDaintree committed Oct 13, 2018
    Copy the full SHA
    6bf6472 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Add manual links for MRP scripts

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    88031a5 View commit details
    Browse the repository at this point in the history

  2. New config to allow shortcut menus to be disabled

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    df45346 View commit details
    Browse the repository at this point in the history

  3. New script and table to add employees for the purposes of entering ti… 

    …me against work orders
    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    1264504 View commit details
    Browse the repository at this point in the history

  4. New script and table to add employees for the purposes of entering ti… 

    …me against work orders
    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    6529d47 View commit details
    Browse the repository at this point in the history

  5. Employees table and script

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    a3abfe2 View commit details
    Browse the repository at this point in the history

  6. New Labour manual - start of

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    6dc3455 View commit details
    Browse the repository at this point in the history

  7. fixes

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    f1c76ba View commit details
    Browse the repository at this point in the history

  8. fixes

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    7550022 View commit details
    Browse the repository at this point in the history

  9. fix prnMsg display of DB errors

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    87b003e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into master

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    04c9f4b View commit details
    Browse the repository at this point in the history

  11. includes/header.php code for new ShortcutMenu config variable allow s… 

    …hort cut menus
    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    196626e View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/PhilDaintree/webERP 

    # Conflicts:
#	includes/header.php
    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    8dc067c View commit details
    Browse the repository at this point in the history

  13. a

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    167ee32 View commit details
    Browse the repository at this point in the history

  14. a

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    6b09e08 View commit details
    Browse the repository at this point in the history

  15. fixes to header.php and glpostings.inc and Dashboard.php

    @PhilDaintree
    PhilDaintree committed Oct 20, 2018
    Copy the full SHA
    a9c87d5 View commit details
    Browse the repository at this point in the history