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

Developer #261

Merged
merged 7 commits into from
Feb 20, 2015
Merged

Developer #261

merged 7 commits into from
Feb 20, 2015

Commits on Feb 19, 2015

  1. Fixed Public Holidays translations. Added missing database table.

    @MaciejStencel
    MaciejStencel committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    78be3f2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #260 from YetiForceCompany/master 

    Merge branch 'Developer'
    @mariuszkrzaczkowski
    mariuszkrzaczkowski committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    d018933 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/developer' into developer 

    Conflicts:
	config/version.php
	install/install_schema/data.sql
    @MaciejStencel
    MaciejStencel committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    0bc7128 View commit details
    Browse the repository at this point in the history

  4. Add ability to adding fields for the company + translations

    @konadrian
    konadrian committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    33fa59d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/developer' into developer

    @MaciejStencel
    MaciejStencel committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    64cce5b View commit details
    Browse the repository at this point in the history

  6. Fixed generation of recurrent invoice date. Now it includes Public Ho… 

    …lidays entered in Public Holiday configuration. Now it should generate invoices only on business days (excluding non working Public Holidays).
    @MaciejStencel
    MaciejStencel committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    5917d11 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2015

  1. Add possibility to redirect to time control list after clicked on use… 

    …r time widget
    @konadrian
    konadrian committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    478fb15 View commit details
    Browse the repository at this point in the history