From 646afbd2f024dee9e4092208b6b7a651046b1c65 Mon Sep 17 00:00:00 2001 From: Erp-07 Date: Fri, 4 Sep 2020 10:04:52 -0400 Subject: [PATCH 1/2] Modify Index --- .../document-payable-labor-obligation/index.rst | 1 + src/lve/procedures/human-resources/index.rst | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lve/procedures/human-resources/document-payable-labor-obligation/index.rst b/src/lve/procedures/human-resources/document-payable-labor-obligation/index.rst index 7255ab223..5cb93c033 100644 --- a/src/lve/procedures/human-resources/document-payable-labor-obligation/index.rst +++ b/src/lve/procedures/human-resources/document-payable-labor-obligation/index.rst @@ -11,4 +11,5 @@ Esta documentación está destinada a definir cada uno de los procedimientos de document-payable-labor-obligation records-of-non-refundable-amounts-for-viatics-and-refunds + list-of-invoices-or-expenditure-justification \ No newline at end of file diff --git a/src/lve/procedures/human-resources/index.rst b/src/lve/procedures/human-resources/index.rst index d03ccf3d9..728fe2644 100644 --- a/src/lve/procedures/human-resources/index.rst +++ b/src/lve/procedures/human-resources/index.rst @@ -9,5 +9,6 @@ Esta documentación está destinada a definir cada uno de los procedimientos de .. toctree:: :maxdepth: 2 - purchase-order-labor-obligation - document-payable-labor-obligation/purchase-order-labor-obligation \ No newline at end of file + purchase-order-labor-obligation/purchase-order-labor-obligation + document-payable-labor-obligation/index + \ No newline at end of file From acc8df0e478be1a8e5ef018cab3ec9473eceffb8 Mon Sep 17 00:00:00 2001 From: Erp-07 Date: Fri, 4 Sep 2020 10:40:44 -0400 Subject: [PATCH 2/2] Merge branch 'master' into correcciones0409 --- src/conf.py | 75 +---------------------------------------------------- 1 file changed, 1 insertion(+), 74 deletions(-) diff --git a/src/conf.py b/src/conf.py index 83dc69401..e324d537e 100644 --- a/src/conf.py +++ b/src/conf.py @@ -12,7 +12,7 @@ # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. # -import os +# import os # import sys # sys.path.insert(0, os.path.abspath('.')) @@ -25,9 +25,6 @@ project = 'ERPYA' copyright = '2020, ADempiere ERP' author = 'E.R.P. Consultores y Asociados, C.A.' -scv_greatest_tag = True - -scv_whitelist_branches = ('master') # The short X.Y version version = '1.0' @@ -94,76 +91,6 @@ html_theme = 'sphinx_rtd_theme' #html_theme_path = ['/usr/local/lib/python2.7/site-packages'] -try: - html_context -except NameError: - html_context = dict() -html_context['display_lower_left'] = True - -if 'REPO_NAME' in os.environ: - REPO_NAME = os.environ['REPO_NAME'] -else: - REPO_NAME = '' - -# SET CURRENT_LANGUAGE -if 'current_language' in os.environ: - # get the current_language env var set by buildDocs.sh - current_language = os.environ['current_language'] -else: - # the user is probably doing `make html` - # set this build's current language to english - current_language = 'en' - -# tell the theme which language to we're currently building -html_context['current_language'] = current_language - -# SET CURRENT_VERSION -from git import Repo -repo = Repo( search_parent_directories=True ) - -if 'current_version' in os.environ: - # get the current_version env var set by buildDocs.sh - current_version = os.environ['current_version'] -else: - # the user is probably doing `make html` - # set this build's current version by looking at the branch - current_version = repo.active_branch.name - -# tell the theme which version we're currently on ('current_version' affects -# the lower-left rtd menu and 'version' affects the logo-area version) -html_context['current_version'] = current_version -html_context['version'] = current_version - -# POPULATE LINKS TO OTHER LANGUAGES -html_context['languages'] = [ ('en', '/' +REPO_NAME+ '/en/' +current_version+ '/') ] - - -# POPULATE LINKS TO OTHER VERSIONS -html_context['versions'] = list() - -versions = [branch.name for branch in repo.branches] -for version in versions: - html_context['versions'].append( (version, '/' +REPO_NAME+ '/' +current_language+ '/' +version+ '/') ) - -# POPULATE LINKS TO OTHER FORMATS/DOWNLOADS - -# settings for creating PDF with rinoh -rinoh_documents = [( - master_doc, - 'target', - project+ ' Documentation', - '© ' +copyright, -)] -today_fmt = "%B %d, %Y" - -# settings for EPUB -epub_basename = 'target' - -html_context['downloads'] = list() -html_context['downloads'].append( ('pdf', '/' +REPO_NAME+ '/' +current_language+ '/' +current_version+ '/' +project+ '-docs_' +current_language+ '_' +current_version+ '.pdf') ) - -html_context['downloads'].append( ('epub', '/' +REPO_NAME+ '/' +current_language+ '/' +current_version+ '/' +project+ '-docs_' +current_language+ '_' +current_version+ '.epub') ) - # Control display of sidebars html_sidebars = {'**': [