Permalink
Switch branches/tags
Commits on Aug 21, 2017
  1. Merge pull request #2084 from ekylibre/debug/2024_fixed_assets_that_c…

    …losed_financial_period
    
    
    Fixes #2024.
    Aquaj committed on GitHub Aug 21, 2017
Commits on Aug 18, 2017
  1. Merge pull request #1992 from ekylibre/feature/progress_bar_first_run

    Add management of error during the import of the first run and add progress bar
    burisu committed on GitHub Aug 18, 2017
  2. Merge branch 'master' into feature/progress_bar_first_run

    burisu committed Aug 18, 2017
  3. Fixes magic FixedAsset bug

    burisu committed Aug 18, 2017
  4. Cleans code

    burisu committed Aug 18, 2017
  5. Merge branch 'master' into feature/progress_bar_first_run

    burisu committed Aug 18, 2017
  6. Gathers tests in one build

    burisu committed Aug 18, 2017
  7. Merge pull request #2114 from ekylibre/debug/gh#2111-Fix-variant-name…

    …-displayed-after-updating-sale-item
    
    Fixed purchase and sale label field to match potential item variant update
    burisu committed on GitHub Aug 18, 2017
  8. Merge pull request #2023 from ekylibre/debug/gh#1978-transations_miss…

    …ing_on_fixed_asset
    
    Added return statement to depreciate class method for FixedAsset
    burisu committed on GitHub Aug 18, 2017
  9. Merge pull request #2022 from ekylibre/debug/gh#2021-add_reference_nu…

    …mber_in_affair_lists
    
    Added reference_number column for affairs list
    burisu committed on GitHub Aug 18, 2017
  10. Merge pull request #2062 from ekylibre/debug/2061-Fix-currency-state-…

    …method-when-financial-year-returns-nil
    
    Fixed JournalEntries#currency_state method when financial_year returns nil
    burisu committed on GitHub Aug 18, 2017
  11. Merge pull request #2025 from ekylibre/debug/gh#1977-fix_linear_depre…

    …ciation_on_annual_period
    
    Fixed linear depreciation on annual period for fixed assets
    burisu committed on GitHub Aug 18, 2017
  12. Fixed purchase and sale label field to match potential item variant u…

    …pdate
    Zank94 committed Aug 18, 2017
  13. Fixes defaults

    burisu committed Aug 18, 2017
  14. Removes unwanted right

    burisu committed Aug 18, 2017
  15. Removes changes not concerned fy PR

    burisu committed Aug 18, 2017
  16. Removes unwanted private/test files

    burisu committed Aug 18, 2017
  17. Merge branch 'master' into feature/progress_bar_first_run

    burisu committed Aug 18, 2017
  18. Removes files not linked to PR

    burisu committed Aug 18, 2017
Commits on Aug 17, 2017
  1. Bumps to 2.50.0

    burisu committed Aug 17, 2017
  2. Cleans code

    burisu committed Aug 17, 2017
  3. Merge pull request #2094 from ekylibre/intervention_times

    Add intervention times for doers, tractors and tools.
    burisu committed on GitHub Aug 17, 2017
  4. Merge pull request #2112 from ekylibre/debug/gh2106-Choose-the-type-o…

    …f-sale-when-billing-parcels
    
    Added a way to change SaleNature by_default and selected by_default instance as type of sale/purchase when you bill a parcel
    burisu committed on GitHub Aug 17, 2017
  5. Make tractor filter more suitable to avoid to many equipment proposition

    ionosphere committed Aug 17, 2017
  6. Hidden tools and tractors dates

    igkyab committed Aug 17, 2017
  7. Restored structure.sql file

    Zank94 committed Aug 17, 2017
  8. Restored Gemfile.lock

    Zank94 committed Aug 17, 2017
  9. Merge branch 'master' into debug/2061-Fix-currency-state-method-when-…

    …financial-year-returns-nil
    
    Merged master
    Zank94 committed Aug 17, 2017
  10. Copied gitignore file from master

    Zank94 committed Aug 17, 2017
  11. Merge branch 'master' into debug/gh#2021-add_reference_number_in_affa…

    …ir_lists
    
    Merged to get last changes from master
    Zank94 committed Aug 17, 2017
  12. Copied gitignore file from master

    Zank94 committed Aug 17, 2017
  13. Merge branch 'master' into debug/gh#1978-transations_missing_on_fixed…

    …_asset
    
    Merge last changes to gitignore
    Zank94 committed Aug 17, 2017