Commit a1c23a5

committed

Merge branch 'develop'

2 parents f26dcbc + 589927b commit a1c23a5Copy full SHA for a1c23a5

24 files changed

+380

-286

lines changed

erpnext
- __init__.py
- accounts/doctype
  - gl_entry
    - gl_entry.json
  - pricing_rule
    - pricing_rule.py
- controllers
  - item_variant.py
- hr/doctype/employee_loan_application
  - employee_loan_application.py
- patches/v8_0
  - manufacturer_childtable_migrate.py
  - revert_manufacturers_table_from_item.py
- patches.txt
- public/js/controllers
  - transaction.js
- schools/doctype
  - program_enrollment
    - program_enrollment.js
  - school_settings
    - school_settings.json
    - school_settings.py
  - student_group
- setup/doctype/naming_series
  - naming_series.py
- startup
  - notifications.py
- stock
  - doctype
    - delivery_note_item
      - delivery_note_item.json
    - item
      - item.json
      - test_item.py
    - item_manufacturer
  - report/ordered_items_to_be_delivered
    - ordered_items_to_be_delivered.json

24 files changed

+380

-286

lines changed

`‎erpnext/init.py`

+1-1

-Original file line number
+Diff line change
 from __future__ import unicode_literals
 import frappe
 -__version__ = '8.0.19'
 +__version__ = '8.0.20'
 def get_default_company(user=None):
 	'''Get default company for user'''

Comments

(0)