Commit 35083ea4 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.1.6-g81838c85

parent f7ad827a

MANIFEST

+3 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ src/openmolar/qt4gui/customwidgets/estimate_widget.py 
src/openmolar/qt4gui/customwidgets/fiveminutetimeedit.py

src/openmolar/qt4gui/customwidgets/money_line_edit.py

src/openmolar/qt4gui/customwidgets/notification_widget.py

src/openmolar/qt4gui/customwidgets/om_webview.py

src/openmolar/qt4gui/customwidgets/schedule_control.py

src/openmolar/qt4gui/customwidgets/simple_chartwidget.py

src/openmolar/qt4gui/customwidgets/static_control_panel.py
@@ -441,6 +442,8 @@ src/openmolar/resources/resources.qrc 
src/openmolar/resources/schema.sql

src/openmolar/resources/style.css

src/openmolar/resources/triggers.sql

src/openmolar/resources/win_install_banner.bmp

src/openmolar/resources/win_install_dialog.bmp

src/openmolar/resources/feescales/example_feescale.xml

src/openmolar/resources/feescales/feescale_schema.xsd

src/openmolar/resources/gp17/back.jpg

MANIFEST.in

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ recursive-include bin openmolar.svg openmolar.desktop openmolar.1 
recursive-include src/openmolar/resources *.qrc *.xsd *.xml *.css *.sql *.svg *.png 

recursive-include src/openmolar/locale *.po *.pot

recursive-include src/openmolar/qt-designer *.ui

recursive-include src/openmolar/resources *.xml *.png *.svg *.sql *.css *.qrc

recursive-include src/openmolar/resources *.xml *.png *.svg *.sql *.css *.qrc *.bmp

recursive-include src/openmolar/resources/icons *.png *.svg *.ico

recursive-include src/openmolar/resources/teeth *.png

recursive-include src/openmolar/resources/gp17 *.jpg

PKG-INFO

+1 −1
Original line number Diff line number Diff line 
Metadata-Version: 1.0

Name: openmolar

Version: 1.0.15-gd81f9e5

Version: 1.1.6-g81838c85

Summary: Open Source Dental Practice Management Software

Home-page: https://www.openmolar.com

Author: Neil Wallace

setup.py

+63 −3
Original line number Diff line number Diff line
@@ -117,8 +117,34 @@ class MakeUis(Command): 
    user_options = []

    REMOVALS = ("        _translate = QtCore.QCoreApplication.translate\n",)



    REPLACEMENTS = [("import resources_rc",

                     "from openmolar.qt4gui import resources_rc")]

    REPLACEMENTS = [

        ("import resources_rc", "from openmolar.qt4gui import resources_rc"),

        ("QtWebKitWidgets.QWebView", "OMWebView"),

        ("from PyQt5 import QtWebKitWidgets",

         "from openmolar.qt4gui.customwidgets.om_webview import OMWebView"),

        ("class Ui_MainWindow(object):",

         "from openmolar.qt4gui.customwidgets.upper_case_line_edit \\\n"

         "    import UpperCaseLineEdit\n\n"

         "class Ui_MainWindow(object):"),

        ("self.titleEdit = QtWidgets.QLineEdit",

         "self.titleEdit = UpperCaseLineEdit"),

        ("self.fnameEdit = QtWidgets.QLineEdit",

         "self.fnameEdit = UpperCaseLineEdit"),

        ("self.snameEdit = QtWidgets.QLineEdit",

         "self.snameEdit = UpperCaseLineEdit"),

        ("self.addr1Edit = QtWidgets.QLineEdit",

         "self.addr1Edit = UpperCaseLineEdit"),

        ("self.addr2Edit = QtWidgets.QLineEdit",

         "self.addr2Edit = UpperCaseLineEdit"),

        ("self.addr3Edit = QtWidgets.QLineEdit",

         "self.addr3Edit = UpperCaseLineEdit"),

        ("self.townEdit = QtWidgets.QLineEdit",

         "self.townEdit = UpperCaseLineEdit"),

        ("self.countyEdit = QtWidgets.QLineEdit",

         "self.countyEdit = UpperCaseLineEdit"),

        ("self.pcdeEdit = QtWidgets.QLineEdit",

         "self.pcdeEdit = UpperCaseLineEdit"),

    ]



    SRC_FOLDER = os.path.join(os.path.dirname(os.path.abspath(__file__)),

                              "src", "openmolar", "qt-designer")
@@ -399,8 +425,12 @@ class Install(_install): 
    '''

    re-implement distutils standard source code builder

    '''

    def __init__(self, *args, **kwargs):

        self.make_uis = MakeUis(*args, **kwargs)

        _install.__init__(self, *args, **kwargs)



    def run(self, *args, **kwargs):

        self.make_uis.run(*args, **kwargs)

        alter_version = AlterVersion()

        alter_version.change()

        win_script = WindowsScript()
@@ -450,6 +480,35 @@ class Test(Command): 
        print(result)





class Mock(Command):



    description = "do nothing except printing out build environment variables"

    user_options = []



    def initialize_options(self):

        pass



    def finalize_options(self):

        pass



    def run(self, *args, **kwargs):

        print("---- VERSION ----")

        print(VERSION)

        print("\n---- RESOURCE_FILE ----")

        print(RESOURCE_FILE)

        print("\n---- DATA_FILES ----")

        for folder, files in DATA_FILES:

            print(folder)

            for file_ in files:

                print("\t%s" % file_)

        print("\n---- RESCOURCES_DIR ----")

        print(RESOURCES_DIR)

        print("\n---- il8n_DIR ----")

        print(il8n_DIR)

        print("\n---- SCRIPTS ----")

        print(SCRIPTS)





if __name__ == "__main__":



    # I need to import this module so the windows installer can access the
@@ -491,6 +550,7 @@ if __name__ == "__main__": 
                  'install': Install,

                  'install_data': InstallData,

                  'makeuis': MakeUis,

                  'test': Test},

                  'test': Test,

                  'mock': Mock},

        scripts=SCRIPTS,

    )

src/openmolar/dbtools/cashbook.py

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ def details(dent, startdate, enddate, 
        if len(headers) == 11:

            if full_edit or row[6] == localsettings.currentDay():

                retarg += '''<td align="center">

                <a href="edit_%s">edit</a></td>''' % row[7]

                <a href="om://edit_%s">edit</a></td>''' % row[7]

            else:

                retarg += '<td align="center">n/a</a>'

        retarg += '</tr>\n'