Browse Source

Merge branch 'develop'

version-14
Pratik Vyas 10 years ago
parent
commit
38a026f155
4 changed files with 6 additions and 4 deletions
  1. +1
    -1
      frappe/__version__.py
  2. +3
    -1
      frappe/core/doctype/event/event.py
  3. +1
    -1
      frappe/hooks.py
  4. +1
    -1
      setup.py

+ 1
- 1
frappe/__version__.py View File

@@ -1 +1 @@
__version__ = "4.5.5"
__version__ = "4.5.6"

+ 3
- 1
frappe/core/doctype/event/event.py View File

@@ -108,7 +108,9 @@ def get_events(start, end, user=None, for_reminder=False):


def add_event(e, date): def add_event(e, date):
new_event = e.copy() new_event = e.copy()
enddate = add_days(date,int(date_diff(e.ends_on.split(" ")[0], e.starts_on.split(" ")[0])))

enddate = add_days(date,int(date_diff(e.ends_on.split(" ")[0], e.starts_on.split(" ")[0]))) \
if (e.starts_on and e.ends_on) else date
new_event.starts_on = date + " " + e.starts_on.split(" ")[1] new_event.starts_on = date + " " + e.starts_on.split(" ")[1]
if e.ends_on: if e.ends_on:
new_event.ends_on = enddate + " " + e.ends_on.split(" ")[1] new_event.ends_on = enddate + " " + e.ends_on.split(" ")[1]


+ 1
- 1
frappe/hooks.py View File

@@ -3,7 +3,7 @@ app_title = "Frappe Framework"
app_publisher = "Web Notes Technologies Pvt. Ltd." app_publisher = "Web Notes Technologies Pvt. Ltd."
app_description = "Full Stack Web Application Framework in Python" app_description = "Full Stack Web Application Framework in Python"
app_icon = "assets/frappe/images/frappe.svg" app_icon = "assets/frappe/images/frappe.svg"
app_version = "4.5.5"
app_version = "4.5.6"
app_color = "#3498db" app_color = "#3498db"
app_email = "support@frappe.io" app_email = "support@frappe.io"




+ 1
- 1
setup.py View File

@@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os


version = "4.5.5"
version = "4.5.6"


with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()


Loading…
Cancel
Save