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

Master #2

Open
wants to merge 177 commits into
base: master
Choose a base branch
from
Open

Master #2

wants to merge 177 commits into from

Commits on Dec 31, 2014

  1. Adds non payment order of session functionality

    @aseemmittal
    aseemmittal committed Dec 31, 2014
    Configuration menu
    Copy the full SHA
    f0ddc9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #359 from aseemmittal/dirty 

    Adds non payment order of session functionality
    @jasvir99
    jasvir99 committed Dec 31, 2014
    Configuration menu
    Copy the full SHA
    9e36223 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2015

  1. Rectifies problem of suspense and main voucher

    @aseemmittal
    aseemmittal committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    28346a4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #361 from aseemmittal/dirty 

    Rectifies problem of suspense and main voucher
    @jasvir99
    jasvir99 committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    0b015fc View commit details
    Browse the repository at this point in the history

  3. Fix for issue #360.

    @jasvir99
    jasvir99 committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    edd6dbe View commit details
    Browse the repository at this point in the history

  4. Merge pull request #362 from jasvir99/dirty 

    Fix for issue #360.
    @jasvir99
    jasvir99 committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    5e23882 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2015

  1. Seniority credits added in staff table.

    @jasvir99
    jasvir99 committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    290f916 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #364 from jasvir99/dirty 

    Seniority credits added in staff table.
    @jasvir99
    jasvir99 committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    33e3a7f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2015

  1. enables user to include and exclude staffs listed.

    @jasvir99
    jasvir99 committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    cd2dde5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #365 from jasvir99/dirty 

    enables user to include and exclude staffs listed.
    @jasvir99
    jasvir99 committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    5988b95 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2015

  1. Adds special categories option for voucher and tax generation.

    @aseemmittal
    aseemmittal committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    8bd2310 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #366 from aseemmittal/dirty 

    Adds special categories option for voucher and tax generation.
    @jasvir99
    jasvir99 committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    65423a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. Enhances search

    @aseemmittal
    aseemmittal committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    a24df70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #367 from aseemmittal/dirty 

    Enhances search
    @jasvir99
    jasvir99 committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    76a43fc View commit details
    Browse the repository at this point in the history

  3. Removes comment

    @aseemmittal
    aseemmittal committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    463eade View commit details
    Browse the repository at this point in the history

  4. Merge pull request #368 from aseemmittal/dirty 

    Removes comment
    @jasvir99
    jasvir99 committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    e32a1ad View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. Update requirements.txt

    @jasvir99
    jasvir99 committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    345ecef View commit details
    Browse the repository at this point in the history

  2. Modifies register for special categories

    @aseemmittal
    aseemmittal committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    b305ca4 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Merge pull request #369 from aseemmittal/dirty 

    Modifies register for special categories
    @jasvir99
    jasvir99 committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    879d509 View commit details
    Browse the repository at this point in the history

  2. Transport and Tada Bill Updated

    @haramrit
    haramrit committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    553ff8a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/dirty'

    @haramrit
    haramrit committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    633ebad View commit details
    Browse the repository at this point in the history

  4. Merge pull request #370 from haramrit/dirty 

    Transport and Tada Bill Improved
    @jasvir99
    jasvir99 committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    8436870 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2015

  1. Fix for issue #372

    @jasvir99
    jasvir99 committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    b59b2c6 View commit details
    Browse the repository at this point in the history

  2. Fix for issue #371

    @jasvir99
    jasvir99 committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    bb3a40d View commit details
    Browse the repository at this point in the history

  3. Binds on click event to item.

    @jasvir99
    jasvir99 committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    17f9156 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #373 from jasvir99/dirty 

    Fixes for issue #371 and #372
    @jasvir99
    jasvir99 committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    9ebf9d1 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. Removes extra JQuery and improves UI for request change.

    @jasvir99
    jasvir99 committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    e32d514 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #374 from jasvir99/dirty 

    Removes extra JQuery and improves UI for request change.
    @jasvir99
    jasvir99 committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    ec364cc View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Adds doxygen style comments.

    @jasvir99
    jasvir99 committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    3f04ec8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #375 from jasvir99/dirty 

    Adds doxygen style comments.
    @jasvir99
    jasvir99 committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    dc26133 View commit details
    Browse the repository at this point in the history

  3. Adds comments

    @aseemmittal
    aseemmittal committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    e5f041c View commit details
    Browse the repository at this point in the history

  4. Doxygen style comments for catalog

    @JaskaranSingh
    JaskaranSingh committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    2e1a758 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #376 from aseemmittal/dirty 

    Adds comments
    @jasvir99
    jasvir99 committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    3534633 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #377 from JaskaranSingh/dirty 

    Doxygen style comments for catalog module
    @jasvir99
    jasvir99 committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    608dcff View commit details
    Browse the repository at this point in the history

  7. Adds fonts on local machine

    @aseemmittal
    aseemmittal committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    5491c45 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #378 from aseemmittal/dirty 

    Adds fonts on local machine
    @jasvir99
    jasvir99 committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    8b62146 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. Removes error in search

    @aseemmittal
    aseemmittal committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    8318f30 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #379 from aseemmittal/dirty 

    Removes error in search
    @jasvir99
    jasvir99 committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    818c534 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2015

  1. Update admin.py

    @jasvir99
    jasvir99 committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    2bb3609 View commit details
    Browse the repository at this point in the history

  2. Updates Registers

    @aseemmittal
    aseemmittal committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    c3df1b6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dirty' of https://github.com/GreatDevelopers/LibreHatti … 

    …into dirty
    @aseemmittal
    aseemmittal committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    67f9eae View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2015

  1. Merge pull request #380 from aseemmittal/dirty 

    Updates Registers
    @jasvir99
    jasvir99 committed Jan 16, 2015
    Configuration menu
    Copy the full SHA
    c41e2c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2015

  1. Updates suspense voucher functionality

    @aseemmittal
    aseemmittal committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    5d591db View commit details
    Browse the repository at this point in the history

  2. Minor updates in display suspense bill

    @aseemmittal
    aseemmittal committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    6a5f1c3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #381 from aseemmittal/dirty 

    Updates suspense voucher functionality
    @jasvir99
    jasvir99 committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    e53f855 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2015

  1. Replace City with district

    @haramrit
    haramrit committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    59ee274 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2015

  1. Changes clearance bill and main register

    @aseemmittal
    aseemmittal committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    3d7def2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #383 from aseemmittal/dirty 

    Changes clearance bill and main register
    @jasvir99
    jasvir99 committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    8ceebda View commit details
    Browse the repository at this point in the history

  3. Minor updates

    @aseemmittal
    aseemmittal committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    59db39a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #384 from aseemmittal/dirty 

    Minor updates
    @jasvir99
    jasvir99 committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    5c4bc95 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #382 from haramrit/dirty 

    Replace City with district
    @jasvir99
    jasvir99 committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    3c0cb0d View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2015

  1. Removes work charge on lab works and updates client search in order

    @aseemmittal
    aseemmittal committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    6982e08 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #385 from aseemmittal/dirty 

    Removes work charge on lab works and updates client search in order
    @jasvir99
    jasvir99 committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    8b2a25b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2015

  1. Removed unnecessary field from bill_quotedorder

    @JaskaranSingh
    JaskaranSingh committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    0e29c0d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #386 from JaskaranSingh/dirty 

    Removes unnecessary fields from bill_quotedorder
    @jasvir99
    jasvir99 committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    c95ffb3 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2015

  1. Address added in transport bill

    @haramrit
    haramrit committed Feb 2, 2015
    Configuration menu
    Copy the full SHA
    81bbbee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #387 from haramrit/dirty 

    Address added in transport bill
    @jasvir99
    jasvir99 committed Feb 2, 2015
    Configuration menu
    Copy the full SHA
    7a2b2a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2015

  1. Removes duplication of data

    @aseemmittal
    aseemmittal committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    6ae1149 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #388 from aseemmittal/dirty 

    Removes duplication of data
    @jasvir99
    jasvir99 committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    7d84dbc View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Adds TADA bill to clearance options

    @aseemmittal
    aseemmittal committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    eeb7fdb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #389 from aseemmittal/dirty 

    Adds TADA bill to clearance options
    @jasvir99
    jasvir99 committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    c8dcbb8 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2015

  1. Formats clearance bills

    @aseemmittal
    aseemmittal committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    cc82d25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #390 from aseemmittal/dirty 

    Formats clearance bills
    @jasvir99
    jasvir99 committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    97538d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2015

  1. Adds options for car taxi advance

    @aseemmittal
    aseemmittal committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    53de369 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #401 from aseemmittal/dirty 

    Adds options for car taxi advance
    @jasvir99
    jasvir99 committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    0e43958 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2015

  1. Update register.py

    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    a909e02 View commit details
    Browse the repository at this point in the history

  2. Update othercharge.html

    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    07a4e5c View commit details
    Browse the repository at this point in the history

  3. Update with_transport.html

    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    b091bd4 View commit details
    Browse the repository at this point in the history

  4. Update admin.py

    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    33240bc View commit details
    Browse the repository at this point in the history

  5. allows multiple TA/DA bills.

    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    8471f37 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #402 from jasvir99/dirty 

    allows multiple TA/DA bills.
    @jasvir99
    jasvir99 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    e7a5671 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. adds TA/DA in bill.

    @jasvir99
    jasvir99 committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    de7d767 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #403 from jasvir99/dirty 

    adds TA/DA in bill.
    @jasvir99
    jasvir99 committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    a8c738d View commit details
    Browse the repository at this point in the history

  3. adds TA/DA in other charge report.

    @jasvir99
    jasvir99 committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    4719026 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #404 from jasvir99/dirty 

    adds TA/DA in other charge report.
    @jasvir99
    jasvir99 committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    faaf24a View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2015

  1. Modifies Lab report and adds material report

    @aseemmittal
    aseemmittal committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    21cdb35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #410 from aseemmittal/dirty 

    Modifies Lab report and adds material report
    @jasvir99
    jasvir99 committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    9abcfe8 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

  1. Adds option to generate receipt at later stage

    @aseemmittal
    aseemmittal committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    f2b2f25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #412 from aseemmittal/dirty 

    Adds option to generate receipt at later stage
    @jasvir99
    jasvir99 committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    fb619ad View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2015

  1. Changes in surcharge functionality

    @aseemmittal
    aseemmittal committed Apr 1, 2015
    Configuration menu
    Copy the full SHA
    7a20967 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #413 from aseemmittal/dirty 

    Changes in surcharge functionality
    @jasvir99
    jasvir99 committed Apr 1, 2015
    Configuration menu
    Copy the full SHA
    5fdd7cc View commit details
    Browse the repository at this point in the history

  3. adds order number in receipt.

    @jasvir99
    jasvir99 committed Apr 1, 2015
    Configuration menu
    Copy the full SHA
    c5b6a2f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dirty' of https://github.com/jasvir99/LibreHatti into d… 

    …irty
    @jasvir99
    jasvir99 committed Apr 1, 2015
    Configuration menu
    Copy the full SHA
    89c75a6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #414 from jasvir99/dirty 

    Dirty
    @jasvir99
    jasvir99 committed Apr 1, 2015
    Configuration menu
    Copy the full SHA
    7a8d50c View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2015

  1. adds filter for 'amount greater than' in register generator.

    @jasvir99
    jasvir99 committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    923b843 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dirty' of https://github.com/jasvir99/LibreHatti into d… 

    …irty
    @jasvir99
    jasvir99 committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    edeae52 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #415 from jasvir99/dirty 

    adds filter for 'amount greater than' in register generator
    @jasvir99
    jasvir99 committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    0a580f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2015

  1. Removes duplication of information in TADA bill

    @aseemmittal
    aseemmittal committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    b6da2d2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #416 from aseemmittal/dirty 

    Removes duplication of information in TADA bill
    @jasvir99
    jasvir99 committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    fc240d5 View commit details
    Browse the repository at this point in the history

  3. Removes re-initialise problem in receipt number

    @aseemmittal
    aseemmittal committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    12491b4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #417 from aseemmittal/dirty 

    Removes re-initialise problem in receipt number
    @jasvir99
    jasvir99 committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    f8f797a View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2015

  1. Changes register

    @aseemmittal
    aseemmittal committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    c4a86d2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #418 from aseemmittal/dirty 

    Changes register
    @jasvir99
    jasvir99 committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    bbddf67 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2015

  1. adds distinct in service tax register.

    @jasvir99
    jasvir99 committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    09f11d6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #422 from jasvir99/dirty 

    adds distinct in service tax register.
    @jasvir99
    jasvir99 committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    935ed95 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. solves tada_bill problem which occurs due to multiple voucher of same 

    id.
    @jasvir99
    jasvir99 committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    c69894f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #423 from jasvir99/dirty 

    solves tada_bill problem which occurs due to multiple voucher of same
    @jasvir99
    jasvir99 committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    69ee3dd View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. update tada register code according to databse

    @sofathitesh
    sofathitesh committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    b54f7c5 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Merge pull request #426 from sofathitesh/dirty 

    update tada register code according to databse
    @jasvir99
    jasvir99 committed May 28, 2015
    Configuration menu
    Copy the full SHA
    342f9db View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2015

  1. Merge branch 'dirty' of https://github.com/GreatDevelopers/LibreHatti … 

    …into dirty
    @aseemmittal
    aseemmittal committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    0fa31c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2015

  1. Revert "update tada register code according to databse"

    @jasvir99
    jasvir99 committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    46b2087 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #430 from GreatDevelopers/revert-426-dirty 

    Revert "update tada register code according to databse"
    @jasvir99
    jasvir99 committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    345b9a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2015

  1. Merge branch 'dirty' of https://github.com/GreatDevelopers/LibreHatti … 

    …into dirty
    @aseemmittal
    aseemmittal committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    e01166c View commit details
    Browse the repository at this point in the history

  2. Modifies service tax register according to new taxes apllied

    @aseemmittal
    aseemmittal committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    b9ebcdd View commit details
    Browse the repository at this point in the history

  3. Adds product rate list option

    @aseemmittal
    aseemmittal committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    de195b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2015

  1. fix for issue #427

    @jasvir99
    jasvir99 committed Jun 13, 2015
    Configuration menu
    Copy the full SHA
    7b32680 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #432 from jasvir99/dirty 

    fix for issue #427
    @jasvir99
    jasvir99 committed Jun 13, 2015
    Configuration menu
    Copy the full SHA
    17fc38c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. Merge pull request #431 from aseemmittal/dirty 

    Modifies service tax register
    @jasvir99
    jasvir99 committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    6149446 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. Changes in tada bill

    @aseemmittal
    aseemmittal committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    d051e54 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #433 from aseemmittal/dirty 

    Changes in tada bill
    @jasvir99
    jasvir99 committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    49860b0 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Allowance bill updation

    @aseemmittal
    aseemmittal committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    fc3241d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #434 from aseemmittal/dirty 

    Allowance bill updation
    @jasvir99
    jasvir99 committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    d528694 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. Adds clear date option in allowance

    @aseemmittal
    aseemmittal committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    7f11ba3 View commit details
    Browse the repository at this point in the history

  2. Corrects receipt date in other charges

    @aseemmittal
    aseemmittal committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    cb80f0e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #435 from aseemmittal/dirty 

    Adds clear date option in allowance
    @jasvir99
    jasvir99 committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    0987753 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Adds receipt session in car taxi advance bill

    @aseemmittal
    aseemmittal committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    1ebae48 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #436 from aseemmittal/dirty 

    Adds receipt session in car taxi advance bill
    @jasvir99
    jasvir99 committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    9de9d11 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. Merges dirty with master

    @aseemmittal
    aseemmittal committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    5fe9e20 View commit details
    Browse the repository at this point in the history

  2. Removes merge error

    @aseemmittal
    aseemmittal committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    4baf69b View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2015

  1. Merge pull request #466 from aseemmittal/master 

    Merges dirty with master
    @aseemmittal
    aseemmittal committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    66d27e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. Removes bug in suspense clearance register

    @aseemmittal
    aseemmittal committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    bc680ca View commit details
    Browse the repository at this point in the history

  2. Merge pull request #473 from aseemmittal/master 

    Removes bug in suspense clearance register
    @aseemmittal
    aseemmittal committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    21a3f10 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2015

  1. Adds pending clearance register

    @aseemmittal
    aseemmittal committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    87c92bc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #478 from aseemmittal/master 

    Adds pending clearance register
    @aseemmittal
    aseemmittal committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    3d0abe2 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. Update models.py

    @manpreet9112
    manpreet9112 committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    d819731 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #480 from manpreet9112/dirty 

    #477 issue corrected
    @jasvir99
    jasvir99 committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    a763d8e View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. Adds TADA registers

    @aseemmittal
    aseemmittal committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    d6a0dc9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #481 from aseemmittal/master 

    Adds TADA registers
    @aseemmittal
    aseemmittal committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    39e617e View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. Update README.md

    @s-monisha
    s-monisha committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    46b9684 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #483 from s-monisha/dirty 

    Update README.md
    @mandeeps708
    mandeeps708 committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    bed294b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #484 from GreatDevelopers/dirty 

    #472 issue corrected
    @jasvir99
    jasvir99 committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    2d8994a View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2015

  1. Merge pull request #3 from GreatDevelopers/master 

    update
    @amarjeetkapoor1
    amarjeetkapoor1 committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    7685385 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Adds new register

    @aseemmittal
    aseemmittal committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    013fbd0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/GreatDevelopers/LibreHatti

    @aseemmittal
    aseemmittal committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    753bde8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #487 from aseemmittal/master 

    New Register
    @aseemmittal
    aseemmittal committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    4f4ec87 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. Merge branch 'dirty' of https://github.com/GreatDevelopers/LibreHatti

    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    217b93c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/GreatDevelopers/LibreHatti

    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    9b1d6e6 View commit details
    Browse the repository at this point in the history

  3. Adds material in lab report and enable multiple choice field in mater… 

    …ial report and makes service tax register more dynamic
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    d4b9c2b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #488 from aseemmittal/master 

    Updates registers
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    8b0076d View commit details
    Browse the repository at this point in the history

  5. Updates code to work with apache settings

    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    a752da4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #489 from aseemmittal/master 

    Updates code to work with apache settings
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    fb217e1 View commit details
    Browse the repository at this point in the history

  7. Corrects home link in base templates

    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    09575b5 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #490 from aseemmittal/master 

    Corrects home link in base templates
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    b8ef78c View commit details
    Browse the repository at this point in the history

  9. Makes dynamic url for search result and resolves problem with suspens… 

    …e order save
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    0089258 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #491 from aseemmittal/master 

    Makes dynamic url for search result and resolves problem with suspense order save
    @aseemmittal
    aseemmittal committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    ae422c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2016

  1. Updates static folder to run static files with apache

    @aseemmittal
    aseemmittal committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    8cd654d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #492 from aseemmittal/master 

    Updates static folder to run static files with apache
    @aseemmittal
    aseemmittal committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    2730aab View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Updates tada and other charges register

    @aseemmittal
    aseemmittal committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    2b80f36 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #494 from aseemmittal/master 

    Updates tada and other charges register
    @aseemmittal
    aseemmittal committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    db9c003 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. Adds options for signature column in tada register

    @aseemmittal
    aseemmittal committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    38f002a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #495 from aseemmittal/master 

    Adds options for signature column in tada register
    @aseemmittal
    aseemmittal committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    375bd8b View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

  1. Add site field in payment register

    @aseemmittal
    aseemmittal committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    090316a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #497 from aseemmittal/master 

    Add site field in payment register
    @aseemmittal
    aseemmittal committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    8f0dd72 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2016

  1. Add taxes field in lab and material report

    @aseemmittal
    aseemmittal committed Mar 26, 2016
    Configuration menu
    Copy the full SHA
    2dc5be4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #498 from aseemmittal/master 

    Add taxes field in lab and material report
    @aseemmittal
    aseemmittal committed Mar 26, 2016
    Configuration menu
    Copy the full SHA
    6aa47bb View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2016

  1. Rectify error arises when syncdb command is run

    @aseemmittal
    aseemmittal committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    9f4484d View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Merge pull request #499 from aseemmittal/master 

    Rectify error arises when syncdb command is run
    @aseemmittal
    aseemmittal committed May 9, 2016
    Configuration menu
    Copy the full SHA
    50dfc43 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Improve service tax register to show all taxes applied on order

    @aseemmittal
    aseemmittal committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    43d766f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #506 from aseemmittal/master 

    Improve service tax register to show all taxes applied on order
    @aseemmittal
    aseemmittal authored Jun 30, 2016
    Configuration menu
    Copy the full SHA
    38ef4d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. Resolves bug in transport bill

    @aseemmittal
    aseemmittal committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    48341a9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #507 from aseemmittal/master 

    Resolves bug in transport bill
    @aseemmittal
    aseemmittal authored Jul 18, 2016
    Configuration menu
    Copy the full SHA
    0556c8b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

  1. Adds Script to install LibreHatti

    amarjeet committed Sep 15, 2016
    Configuration menu
    Copy the full SHA
    8029d28 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2016

  1. Merge pull request #4 from GreatDevelopers/master 

    update
    @amarjeetkapoor1
    amarjeetkapoor1 authored Sep 16, 2016
    Configuration menu
    Copy the full SHA
    1495105 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. Adds script to install LibreHatti

    amarjeet committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    0be4174 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2016

  1. Merge pull request #509 from amarjeetkapoor1/master 

    Adds Installation script
    @amarjeetkapoor1
    amarjeetkapoor1 authored Sep 22, 2016
    Configuration menu
    Copy the full SHA
    e6e34ca View commit details
    Browse the repository at this point in the history

Commits on May 23, 2017

  1. corrected error related to key

    @amarjeetkapoor1
    amarjeetkapoor1 authored May 23, 2017
    Configuration menu
    Copy the full SHA
    e13ae6a View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. fix django mptt version

    @jasvir99
    jasvir99 authored Jul 13, 2017
    Configuration menu
    Copy the full SHA
    1c4b350 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2017

  1. Merge pull request #513 from amarjeetkapoor1/master 

    corrected error related to key
    @hsrai
    hsrai authored Jul 19, 2017
    Configuration menu
    Copy the full SHA
    575bf5c View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. Added GST

    @amrit3701
    amrit3701 committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    5cfa0ee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #515 from amrit3701/clean_tada_tax 

    Added GST
    @mandeeps708
    mandeeps708 authored Oct 17, 2017
    Configuration menu
    Copy the full SHA
    dff8fd3 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. Implemented tax on TADA

    @amrit3701
    amrit3701 committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    1a12b36 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2017

  1. Refactored TADA tax code

    @amrit3701
    amrit3701 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    7fb9008 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. Merge pull request #516 from amrit3701/clean_tada_tax 

     Implemented tax on TADA
    @amrit3701
    amrit3701 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    d352ca6 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. changed Director to Principal

    @amisha2016
    amisha2016 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    6c32de7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #517 from amisha2016/dir_to_prin 

    changed Director to Principal
    @mandeeps708
    mandeeps708 authored Nov 29, 2017
    Configuration menu
    Copy the full SHA
    0ad93fb View commit details
    Browse the repository at this point in the history

  3. Change Director to Principal

    @amisha2016
    amisha2016 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    1dc1b67 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2017

  1. Merge pull request #518 from amisha2016/dir_to_prin 

    Change Director to Principal
    @mandeeps708
    mandeeps708 authored Dec 7, 2017
    Configuration menu
    Copy the full SHA
    1208168 View commit details
    Browse the repository at this point in the history