diff --git a/ext/custom-addons/cam_reports/cam_reports.py b/ext/custom-addons/cam_reports/cam_reports.py
index 7112626b..0d71d999 100644
--- a/ext/custom-addons/cam_reports/cam_reports.py
+++ b/ext/custom-addons/cam_reports/cam_reports.py
@@ -64,6 +64,23 @@ class res_company(osv.osv):
if os.path.isdir(dir):
break
+ if os.path.isdir(dir):
+ filename = os.path.join(dir, 'briefkopf.rml')
+ f = open(filename , 'rb')
+ data = f.read()
+ result = dict.fromkeys(ids, data)
+ return result
+
+ def _get_rml_header2(self, cr, uid, ids, _field_name, _args, context=None):
+ result = dict.fromkeys(ids, False)
+ # Get filename
+ dirname = 'cam_reports/report'
+ adps = addons.module.ad_paths
+ for adp in adps:
+ dir = os.path.join(adp, dirname)
+ if os.path.isdir(dir):
+ break
+
if os.path.isdir(dir):
filename = os.path.join(dir, 'page.rml')
f = open(filename , 'rb')
@@ -72,5 +89,6 @@ class res_company(osv.osv):
return result
_columns = {
- 'rml_header': fields.function(_get_rml_header, type='text', string='RML Header'),
+ 'rml_header': fields.function(_get_rml_header, type='text', string='Briefkopf',readonly=True),
+ 'rml_header2': fields.function(_get_rml_header2, type='text', string='RML Header',readonly=True),
}
\ No newline at end of file
diff --git a/ext/custom-addons/cam_reports/report/briefkopf.rml b/ext/custom-addons/cam_reports/report/briefkopf.rml
new file mode 100644
index 00000000..09710608
--- /dev/null
+++ b/ext/custom-addons/cam_reports/report/briefkopf.rml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ company.partner_id.name ]]
+ [[ company.street ]]
+ [[ company.zip ]] [[ company.city ]]
+ [[ company.country_id.name ]]
+
+
+
+
+ Telefon:
+ Telefax:
+ E-Mail:
+ Web:
+
+
+ [[ company.phone ]]
+ [[ company.fax ]]
+ [[ company.partner_id.email ]]
+ [[ company.partner_id.website ]]
+
+
+
+ [[ company.logo]]
+
+
+
+
+
+
+
+
+
+ Bankverbindung: BANK, IBAN: AT000000000000000000, BIC: AAAAAAAA
+ UID: [[company.vat ]], FN: [[ company.company_registry ]]
+ Die Ware bleibt bis zur vollständigen Bezahlung unser Eigentum.
+
+
+
+
+ Seite
+
+
+
+
+
\ No newline at end of file
diff --git a/ext/custom-addons/cam_reports/report/page.rml b/ext/custom-addons/cam_reports/report/page.rml
index 09710608..f4d8ecd1 100644
--- a/ext/custom-addons/cam_reports/report/page.rml
+++ b/ext/custom-addons/cam_reports/report/page.rml
@@ -49,51 +49,5 @@
-
-
-
-
- [[ company.partner_id.name ]]
- [[ company.street ]]
- [[ company.zip ]] [[ company.city ]]
- [[ company.country_id.name ]]
-
-
-
-
- Telefon:
- Telefax:
- E-Mail:
- Web:
-
-
- [[ company.phone ]]
- [[ company.fax ]]
- [[ company.partner_id.email ]]
- [[ company.partner_id.website ]]
-
-
-
- [[ company.logo]]
-
-
-
-
-
-
-
-
-
- Bankverbindung: BANK, IBAN: AT000000000000000000, BIC: AAAAAAAA
- UID: [[company.vat ]], FN: [[ company.company_registry ]]
- Die Ware bleibt bis zur vollständigen Bezahlung unser Eigentum.
-
-
-
-
- Seite
-
-
-
\ No newline at end of file
diff --git a/patches/report_header.patch b/patches/report_header.patch
new file mode 100644
index 00000000..3b9c7d53
--- /dev/null
+++ b/patches/report_header.patch
@@ -0,0 +1,11 @@
+--- ext/odoo/openerp/report/report_sxw.py 2015-04-15 12:18:30.132784074 +0200
++++ ext/odoo/openerp/report/report_sxw.py 2015-04-15 11:48:21.743518606 +0200
+@@ -476,6 +476,8 @@
+ processed_rml = etree.XML(rml)
+ if report_xml.use_global_header:
+ rml_parser._add_header(processed_rml, self.header)
++ else:
++ rml_parser._add_header(processed_rml, 'internal')
+ processed_rml = self.preprocess_rml(processed_rml,report_xml.report_type)
+ if rml_parser.logo:
+ logo = base64.decodestring(rml_parser.logo)
\ No newline at end of file
diff --git a/setup/lib/cli.py b/setup/lib/cli.py
index f219ecf3..0841e78e 100755
--- a/setup/lib/cli.py
+++ b/setup/lib/cli.py
@@ -67,6 +67,7 @@ def main():
'set_translations',
'set_default_removal_strategy',
+ 'default_set_order_policy',
]
if cmd == 'rollout':
diff --git a/setup/lib/config_at.py b/setup/lib/config_at.py
index 11764be5..746b7544 100644
--- a/setup/lib/config_at.py
+++ b/setup/lib/config_at.py
@@ -81,6 +81,7 @@ class Config():
'group_uom': True, # Verwende Mengeneinheiten
'group_invoice_deli_orders': True, # Erstelle Rechnungen durch Auslieferungen
}
+ self.order_policy = 'picking' # Erzeuge Rechnung: [manual], [picking],[prepaid]
# Einstellungen Einkauf
self.purchase_config = {
diff --git a/setup/lib/functions.py b/setup/lib/functions.py
index 656d5d76..bbc030f1 100755
--- a/setup/lib/functions.py
+++ b/setup/lib/functions.py
@@ -582,6 +582,14 @@ class CamadeusFunctions():
self._execute('base.language.import', 'import_lang', [wizard_id])
return True
return False
+
+ def default_set_order_policy(self):
+ """Setze Rechnung von Lieferschein"""
+
+ if hasattr(self.config, 'order_policy'):
+ method = self.config.order_policy
+ self._execute('ir.values', 'set_default', 'sale.order', 'order_policy', method)
+ return True
def set_default_removal_strategy(self):
"""Default Entnahmestrategie für Lager setzen"""