Skip to content
This repository was archived by the owner on Mar 13, 2020. It is now read-only.

Commit 8b11e9f

Browse files
authored
Merge pull request KoalixSwitzerland#210 from scaphilo/Feature_Issue154
Feature issue154
2 parents 4ad2a5b + 4cc7070 commit 8b11e9f

File tree

118 files changed

+3167
-832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3167
-832
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Code Documentation
2+
==================
3+
4+
.. toctree::
5+
:maxdepth: 2
6+
7+
code_documentation/project
8+
code_documentation/task
9+
code_documentation/work
10+
code_documentation/estimation
11+
code_documentation/agreement
12+
code_documentation/resource
13+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Agreement
4+
---------
5+
6+
.. automodule:: koalixcrm.crm.reporting.agreement
7+
:members:
8+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Estimation
4+
----------
5+
6+
.. automodule:: koalixcrm.crm.reporting.estimation
7+
:members:
8+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Project
4+
-------
5+
6+
.. automodule:: koalixcrm.crm.reporting.project
7+
:members:
8+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Resource
4+
--------
5+
6+
.. automodule:: koalixcrm.crm.reporting.resource
7+
:members:
8+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Task
4+
----
5+
6+
.. automodule:: koalixcrm.crm.reporting.task
7+
:members:
8+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. highlight:: rst
2+
3+
Work
4+
----
5+
6+
.. automodule:: koalixcrm.crm.reporting.work
7+
:members:
8+

documentation/source/conf.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@
1414
# If extensions (or modules to document with autodoc) are in another directory,
1515
# add these directories to sys.path here. If the directory is relative to the
1616
# documentation root, use os.path.abspath to make it absolute, like shown here.
17-
# sys.path.append(os.path.abspath('.'))
17+
import os
18+
import sys
19+
import django
20+
21+
sys.path.insert(0, os.path.abspath('../..'))
22+
os.environ['DJANGO_SETTINGS_MODULE'] = 'projectsettings.settings.development_sqlite_settings'
23+
django.setup()
1824

1925
# -- General configuration -----------------------------------------------------
2026

2127
# Add any Sphinx extension module names here, as strings. They can be extensions
2228
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
23-
extensions = []
29+
extensions = [
30+
'sphinx.ext.autodoc',
31+
]
2432

2533
# Add any paths that contain templates here, relative to this directory.
2634
templates_path = ['.templates']

documentation/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Contents:
1515
customisation
1616
architecture
1717
faq
18+
code_documentation
1819

1920
Indices and tables
2021
==================

koalixcrm/accounting/accounting/product_categorie.py renamed to koalixcrm/accounting/accounting/product_category.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from koalixcrm.accounting.models import Account
66

77

8-
class ProductCategorie(models.Model):
9-
title = models.CharField(verbose_name=_("Product Categorie Title"),
8+
class ProductCategory(models.Model):
9+
title = models.CharField(verbose_name=_("Product Category Title"),
1010
max_length=50)
1111
profit_account = models.ForeignKey(Account,
1212
verbose_name=_("Profit Account"),
@@ -19,14 +19,14 @@ class ProductCategorie(models.Model):
1919

2020
class Meta:
2121
app_label = "accounting"
22-
verbose_name = _('Product Categorie')
22+
verbose_name = _('Product Category')
2323
verbose_name_plural = _('Product Categories')
2424

2525
def __str__(self):
2626
return self.title
2727

2828

29-
class OptionProductCategorie(admin.ModelAdmin):
29+
class OptionProductCategory(admin.ModelAdmin):
3030
list_display = ('title',
3131
'profit_account',
3232
'loss_account')

0 commit comments

Comments
 (0)