tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup, debug flag

develop
Andreas Brückl 2015-04-07 15:40:14 +02:00
parent 3d72f4093e
commit f0205c9219
18 changed files with 81 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/odoo-server-dev-br.conf
View File

@ -12,3 +12,4 @@ addons_path = ext/odoo/addons,ext/custom-addons,dmi/run1
timezone = Europe/Brussels
#dbfilter_test = ['.*',]
show_debug = 1

1
dev/odoo-server-dev-ka.conf
View File

@ -12,3 +12,4 @@ addons_path = ext/odoo/addons,ext/custom-addons,dmi/run1
timezone = Europe/Brussels
#dbfilter_test = ['.*',]
show_debug = 1

1
dev/odoo-server-dev-sk.conf
View File

@ -12,3 +12,4 @@ addons_path = ext/odoo/addons,ext/custom-addons,dmi/run1
timezone = Europe/Brussels
#dbfilter_test = ['.*',]
show_debug = 1

66
ext/config/odoo-443.nginx
View File

@ -1,66 +0,0 @@
server {
listen 80 default_server;
server_name "xxxxx";
# Strict Transport Security
# add_header Strict-Transport-Security max-age=2592000;
rewrite ^ https://$server_name$request_uri? permanent;
}
upstream odoo-server {
server 127.0.0.1:8069 fail_timeout=3000s;
}
server {
listen 443 ssl default_server;
server_name _;
# Specifies the maximum accepted body size of a client request,
# as indicated by the request header Content-Length.
client_max_body_size 200m;
# log files
access_log /var/log/nginx/odoo-access.log;
error_log /var/log/nginx/odoo-error.log;
# increase proxy buffer to handle some OpenERP web requests
proxy_buffers 16 64k;
proxy_buffer_size 128k;
# SSL config
ssl_certificate /etc/nginx/ssl/server.crt;
ssl_certificate_key /etc/nginx/ssl/server.key;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!aNULL:!MD5;
location / {
proxy_pass http://odoo-server;
# force timeouts if the backend dies
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
proxy_read_timeout 300s;
# set headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forward-For $proxy_add_x_forwarded_for;
# Let the OpenERP web service know that we're using HTTPS, otherwise
# it will generate URL using http:// and not https://
# proxy_set_header X-Forwarded-Proto https;
# by default, do not forward anything
proxy_redirect off;
}
# cache some static data in memory for 60mins.
# under heavy load this should relieve stress on the OpenERP web interface a bit.
location ~* /web/static/ {
proxy_cache_valid 200 60m;
proxy_buffering on;
expires 864000;
proxy_pass http://odoo-server;
}
}

50
ext/config/odoo-80.nginx
View File

@ -1,50 +0,0 @@
upstream odoo-server {
server 127.0.0.1:8069 fail_timeout=3000s;
}
server {
listen 80 default_server;
server_name _;
# Specifies the maximum accepted body size of a client request,
# as indicated by the request header Content-Length.
client_max_body_size 200m;
# log files
access_log /var/log/nginx/odoo-access.log;
error_log /var/log/nginx/odoo-error.log;
# increase proxy buffer to handle some OpenERP web requests
proxy_buffers 16 64k;
proxy_buffer_size 128k;
location / {
proxy_pass http://odoo-server;
# force timeouts if the backend dies
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
proxy_read_timeout 300s;
# set headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forward-For $proxy_add_x_forwarded_for;
# Let the OpenERP web service know that we're using HTTPS, otherwise
# it will generate URL using http:// and not https://
# proxy_set_header X-Forwarded-Proto https;
# by default, do not forward anything
proxy_redirect off;
}
# cache some static data in memory for 60mins.
# under heavy load this should relieve stress on the OpenERP web interface a bit.
location ~* /web/static/ {
proxy_cache_valid 200 60m;
proxy_buffering on;
expires 864000;
proxy_pass http://odoo-server;
}
}

2
ext/config/odoo-server.conf
View File

@ -10,7 +10,7 @@ db_user = False
debug_mode = False
list_db = True
log_level = error
log_level = warn
#max_cron_threads = 1
#workers = 1

3
ext/custom-addons/cam_custom/__openerp__.py
View File

@ -27,11 +27,12 @@
'description': """Individuelle Anpassungen""",
'author': 'camadeus GmbH',
'website': 'http://www.camadeus.at',
'depends': ['crm','sale','mail','product','account'],
'depends': ['knowledge','crm','sale','mail','product','account'],
'data': [
'cam_custom_view.xml',
'cam_custom_data.xml',
'views/custom_theme.xml',
'security/ir.model.access.csv',
],
'installable': True,
'auto_install': False,

32
ext/custom-addons/cam_custom/cam_custom_view.xml
View File

@ -75,5 +75,37 @@
</field>
</record>
<!-- documents menu -->
<menuitem
name="Documents"
id="menu_document_main"
parent="knowledge.menu_document"
groups="base.group_document_user"
sequence="0"
/>
<record model="ir.actions.act_window" id="action_document_files">
<field name="name">Dokumente</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click to create a new document.
</p><p>
The Documents repository gives you access to all attachments, such
as mails, project documents, invoices etc.
</p>
</field>
</record>
<menuitem
name="Documents"
action="action_document_files"
id="menu_document_files"
parent="menu_document_main"
sequence="0"
/>
</data>
</openerp>

2
ext/custom-addons/cam_custom/security/ir.model.access.csv Normal file
View File

@ -0,0 +1,2 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"crm_opportunity_report_show","crm_opportunity_report_show","crm.model_crm_opportunity_report","base.group_sale_salesman",1,,,
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 crm_opportunity_report_show crm_opportunity_report_show crm.model_crm_opportunity_report base.group_sale_salesman 1

41
ext/custom-addons/cam_testenv/controllers/testenv_controller.py
View File

@ -1,41 +1,24 @@
# -*- coding: utf-8 -*-
import ast
import base64
import csv
import glob
import itertools
import logging
import operator
import datetime
import hashlib
import os
import re
import simplejson
import time
import urllib
import urllib2
import urlparse
import xmlrpclib
import zlib
from xml.etree import ElementTree
from cStringIO import StringIO
import babel.messages.pofile
import werkzeug.utils
import werkzeug.wrappers
try:
import xlwt
except ImportError:
xlwt = None
import openerp
import openerp.modules.registry
from openerp.tools.translate import _
from openerp.tools import config
from openerp.addons.web import http
from openerp.addons.web.controllers.main import Home
from openerp.http import request
class Home_Debug(Home):
@http.route('/', type='http', auth="none")
def index(self, s_action=None, db=None, **kw):
# Check arguments
if openerp.tools.config.get('show_debug', False):
return http.local_redirect('/web?debug=1', query=request.params, keep_hash=True)
else:
return http.local_redirect('/web', query=request.params, keep_hash=True)
class WebClient(http.Controller):
_cp_path = "/web/testenv"

0
setup/install-odoo-7.sh → setup/archive/install-odoo-7.sh
View File

0
setup/install_nginx.sh → setup/archive/install_nginx.sh
View File

0
setup/install_odoo.sh → setup/archive/install_odoo.sh
View File

0
setup/install_tools.sh → setup/archive/install_tools.sh
View File

1
setup/lib/cli.py
View File

@ -53,6 +53,7 @@ def main():
'base_config',
'sale_config',
'stock_config',
'stock_set_cost_method',
'set_incoterms',
'purchase_config',
'set_date_format',

15
setup/lib/config_at.py
View File

@ -57,7 +57,6 @@ class Config():
#'Lieferant EU (ohne Ust-ID)',
#'Lieferant EU Unternehmen (mit USt-ID)',
#'Lieferant Ausland',
#'Kunde EU (ohne USt-ID)',
'Kunde Ausland',
'Kunde EU (ohne USt-ID)',
'Kunde EU Unternehmen (mit USt-ID)',
@ -76,7 +75,6 @@ class Config():
# Einstellungen Verkauf
self.sale_config = {
'group_uom': True, # Verwende Mengeneinheiten
'group_sale_delivery_address': True, # Verschiedene Adressen für Rechnung und Lieferung
'group_sale_pricelist': True, # Preislisten verwenden
'group_discount_per_so_line': True, # Rabatte verwenden
@ -87,15 +85,21 @@ class Config():
# Einstellungen Einkauf
self.purchase_config = {
'group_purchase_pricelist': True, # Preislisten verwenden
'default_invoice_method': 'manual', # [picking] - Rechnung von Lieferscheinen
# [manual] - von Bestellpositionen
# [order] - Vorabrechnungsentwurf durch Bestellung
'group_costing_method': True, # Benutzen Sie 'Einkaufs-' oder 'Durchschnittspreis' zur Bestandsbewertung
}
#Einstellungen Lager
self.stock_config = {
'group_stock_multiple_locations': True, # Verwalten Sie mehrere Läger und Lagerorte
'group_stock_multiple_locations': True, # Verwalten Sie mehrere Lager und Lagerorte
'group_stock_tracking_lot': False, # Benutze Verpackungen: Paletten, Boxen, ...
'group_stock_packaging': False, # Ermöglicht die Auswahl einer Verpackung
}
self.stock_cost_method = 'average' # [standard], [average], [real]
# Wenn gesetzt, teilen sich Gutschriften und Rechnungen den selben Nummernkreis
self.refund_invoice_sequence = True
@ -156,6 +160,7 @@ class Config():
self.modules = [
'document',
'knowledge',
'auth_crypt',
'cam_testenv',
'cam_max_width',
@ -165,8 +170,8 @@ class Config():
'account_cancel',
'cam_invoice_skonto',
'web_printscreen_zb',
#'crm',
#'sale',
'crm',
'sale',
#'cam_hr_overtime',
#'cam_hr',
]

2
setup/lib/environments.py
View File

@ -24,6 +24,6 @@ Port: %s
ENVIRONMENTS = {
'br': Environment('http://localhost', '8080', 'INSTANCE_1', 'admin', 'x', 'admin'),
'sk': Environment('http://localhost', '8080', 'INSTANCE_1', 'admin', 'x', 'admin'),
'test': Environment('https://INSTANCE.camadeus.at', '443', 'INSTANCE_1', 'admin', 'x', 'asdfasdf'),
'test': Environment('https://INSTANCE.camadeus.at', '443', 'INSTANCE_1', 'admin', '141kcal', 'asdfasdf'),
}

10
setup/lib/functions.py
View File

@ -535,3 +535,13 @@ class CamadeusFunctions():
else:
return self._execute('ir.mail_server', 'create', vals)
return False
def stock_set_cost_method(self):
"""Kalkulationsverfahren für Lager setzen"""
if hasattr(self.config, 'stock_cost_method'):
method = self.config.stock_cost_method
self._execute('ir.values', 'set_default', 'product.template', 'cost_method', method)
return True
return True