Merge lp:~sandi-dirntis/openerpsl/openerpsl_20140304_1 into lp:openerpsl/7.0

Proposed by Aleksander Dirntiš
Status: Merged
Merged at revision: 356
Proposed branch: lp:~sandi-dirntis/openerpsl/openerpsl_20140304_1
Merge into: lp:openerpsl/7.0
Diff against target: 5517 lines (+0/-5264)
45 files modified
inovatim_addons/__init__.py (+0/-32)
inovatim_addons/__openerp__.py (+0/-45)
inovatim_addons/_common.py (+0/-37)
inovatim_addons/crm_lead_view.xml (+0/-30)
inovatim_addons/crm_opportunity_view.xml (+0/-31)
inovatim_addons/i18n/en_US.po (+0/-120)
inovatim_addons/i18n/inovatim_addons.pot (+0/-120)
inovatim_addons/i18n/sl.po (+0/-120)
inovatim_addons/product_product.py (+0/-55)
inovatim_addons/product_template.py (+0/-36)
inovatim_addons/product_view.xml (+0/-35)
inovatim_addons/purchase_order.py (+0/-35)
inovatim_addons/purchase_order_line.py (+0/-54)
inovatim_addons/purchase_order_view.xml (+0/-21)
inovatim_addons/res_partner.py (+0/-31)
inovatim_addons/res_partner_view.xml (+0/-43)
inovatim_addons/sale_order.py (+0/-44)
inovatim_addons/sale_order_line.py (+0/-171)
inovatim_addons/sale_order_view.xml (+0/-139)
inovatim_addons/security/stock_security.xml (+0/-11)
inovatim_addons/stock_move.py (+0/-44)
inovatim_addons/stock_production_lot.py (+0/-58)
inovatim_addons/stock_view.xml (+0/-48)
inovatim_addons/wizard/__init__.py (+0/-23)
inovatim_addons/wizard/crm_lead_to_opportunity.py (+0/-44)
inovatim_reports/__init__.py (+0/-26)
inovatim_reports/__openerp__.py (+0/-39)
inovatim_reports/account_payment_term.py (+0/-8)
inovatim_reports/account_payment_term_view.xml (+0/-20)
inovatim_reports/i18n/en_US.po (+0/-528)
inovatim_reports/i18n/inovatim_reports.pot (+0/-528)
inovatim_reports/i18n/sl.po (+0/-528)
inovatim_reports/inovatim_reports.py (+0/-76)
inovatim_reports/inovatim_reports.xml (+0/-60)
inovatim_reports/report/__init__.py (+0/-25)
inovatim_reports/report/account_print_invoice.py (+0/-102)
inovatim_reports/report/account_print_invoice.rml (+0/-464)
inovatim_reports/report/purchase_order.py (+0/-34)
inovatim_reports/report/purchase_order.rml (+0/-325)
inovatim_reports/report/sale_order.py (+0/-85)
inovatim_reports/report/sale_order.rml (+0/-437)
inovatim_reports/report/stock_picking.py (+0/-99)
inovatim_reports/report/stock_picking.rml (+0/-402)
inovatim_reports/res_partner.py (+0/-34)
inovatim_reports/res_partner_view.xml (+0/-17)
To merge this branch: bzr merge lp:~sandi-dirntis/openerpsl/openerpsl_20140304_1
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+209216@code.launchpad.net

Description of the change

[DEL] Removed 2 addons

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'inovatim_addons'
2=== removed file 'inovatim_addons/__init__.py'
3--- inovatim_addons/__init__.py 2014-02-11 07:14:31 +0000
4+++ inovatim_addons/__init__.py 1970-01-01 00:00:00 +0000
5@@ -1,32 +0,0 @@
6-# -*- coding: utf-8 -*-
7-##############################################################################
8-#
9-# OpenERP, Open Source Management Solution
10-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
11-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
12-#
13-# This program is free software: you can redistribute it and/or modify
14-# it under the terms of the GNU Affero General Public License as
15-# published by the Free Software Foundation, either version 3 of the
16-# License, or (at your option) any later version.
17-#
18-# This program is distributed in the hope that it will be useful,
19-# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-# GNU Affero General Public License for more details.
22-#
23-# You should have received a copy of the GNU Affero General Public License
24-# along with this program. If not, see <http://www.gnu.org/licenses/>.
25-#
26-##############################################################################
27-
28-import res_partner
29-import sale_order
30-import sale_order_line
31-import stock_move
32-import stock_production_lot
33-import product_template
34-import product_product
35-import purchase_order_line
36-import purchase_order
37-import wizard
38
39=== removed file 'inovatim_addons/__openerp__.py'
40--- inovatim_addons/__openerp__.py 2014-02-11 07:14:31 +0000
41+++ inovatim_addons/__openerp__.py 1970-01-01 00:00:00 +0000
42@@ -1,45 +0,0 @@
43-# -*- coding: utf-8 -*-
44-##############################################################################
45-#
46-# OpenERP, Open Source Management Solution
47-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
48-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
49-#
50-# This program is free software: you can redistribute it and/or modify
51-# it under the terms of the GNU Affero General Public License as
52-# published by the Free Software Foundation, either version 3 of the
53-# License, or (at your option) any later version.
54-#
55-# This program is distributed in the hope that it will be useful,
56-# but WITHOUT ANY WARRANTY; without even the implied warranty of
57-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
58-# GNU Affero General Public License for more details.
59-#
60-# You should have received a copy of the GNU Affero General Public License
61-# along with this program. If not, see <http://www.gnu.org/licenses/>.
62-#
63-##############################################################################
64-
65-{
66- 'name': 'Inovatim Addons',
67- 'version': '1.0',
68- 'category': 'Sale',
69- 'description': """
70- This module adds following extensions: \n
71- - on sale order updates product quantity when product unit of sale quantity changes \n
72- """,
73- 'author': 'Mentis d.o.o.',
74- 'depends': ['crm','sale','sale_stock','purchase','stock','product','web_m2x_options'],
75- 'data': [
76- 'security/stock_security.xml',
77- 'res_partner_view.xml',
78- 'sale_order_view.xml',
79- 'stock_view.xml',
80- 'product_view.xml',
81- 'purchase_order_view.xml',
82- 'crm_opportunity_view.xml',
83- 'crm_lead_view.xml'
84- ],
85- 'installable': True,
86- 'active': False,
87-}
88
89=== removed file 'inovatim_addons/_common.py'
90--- inovatim_addons/_common.py 2014-01-22 18:07:39 +0000
91+++ inovatim_addons/_common.py 1970-01-01 00:00:00 +0000
92@@ -1,37 +0,0 @@
93-# -*- coding: utf-8 -*-
94-##############################################################################
95-#
96-# OpenERP, Open Source Management Solution
97-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
98-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
99-#
100-# This program is free software: you can redistribute it and/or modify
101-# it under the terms of the GNU Affero General Public License as
102-# published by the Free Software Foundation, either version 3 of the
103-# License, or (at your option) any later version.
104-#
105-# This program is distributed in the hope that it will be useful,
106-# but WITHOUT ANY WARRANTY; without even the implied warranty of
107-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
108-# GNU Affero General Public License for more details.
109-#
110-# You should have received a copy of the GNU Affero General Public License
111-# along with this program. If not, see <http://www.gnu.org/licenses/>.
112-#
113-##############################################################################
114-
115-def rounding(f, r):
116- if not r:
117- return f
118-
119- _index = r
120- _count = 0
121-
122- while _index % 1 > 0:
123- _index = _index * 10
124- _count += 1
125-
126- _result = round(f / r) * r
127- _result = round(_result, _count)
128-
129- return _result
130\ No newline at end of file
131
132=== removed file 'inovatim_addons/crm_lead_view.xml'
133--- inovatim_addons/crm_lead_view.xml 2014-02-11 07:14:31 +0000
134+++ inovatim_addons/crm_lead_view.xml 1970-01-01 00:00:00 +0000
135@@ -1,30 +0,0 @@
136-<?xml version="1.0"?>
137-<openerp>
138- <data>
139-
140- <record model="ir.ui.view" id="crm_case_form_view_inovatim_leads">
141- <field name="name">CRM - Leads Form</field>
142- <field name="model">crm.lead</field>
143- <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
144- <field name="priority">16</field>
145- <field name="arch" type="xml">
146- <field name="street2" position="replace"/>
147- <field name="state_id" position="replace"/>
148- <field name="zip" position="replace"/>
149- </field>
150- </record>
151-
152- <record model="ir.ui.view" id="crm_case_form_view_inovatim2_leads">
153- <field name="name">CRM - Leads Form</field>
154- <field name="model">crm.lead</field>
155- <field name="inherit_id" ref="crm_case_form_view_inovatim_leads"/>
156- <field name="priority">16</field>
157- <field name="arch" type="xml">
158- <field name="city" position="before">
159- <field name="zip" placeholder="ZIP" style="width: 34%%"/>
160- </field>
161- </field>
162- </record>
163-
164- </data>
165-</openerp>
166
167=== removed file 'inovatim_addons/crm_opportunity_view.xml'
168--- inovatim_addons/crm_opportunity_view.xml 2014-02-11 07:14:31 +0000
169+++ inovatim_addons/crm_opportunity_view.xml 1970-01-01 00:00:00 +0000
170@@ -1,31 +0,0 @@
171-<?xml version="1.0"?>
172-<openerp>
173- <data>
174-
175- <record model="ir.ui.view" id="crm_case_form_view_oppor_inovatim">
176- <field name="name">Opportunities</field>
177- <field name="model">crm.lead</field>
178- <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
179- <field name="priority">20</field>
180- <field name="arch" type="xml">
181- <field name="mobile" position="replace"/>
182- <field name="partner_id" position="attributes">
183- <attribute name="on_change">on_change_partner(partner_id)</attribute>
184- </field>
185- </field>
186- </record>
187-
188- <record model="ir.ui.view" id="crm_case_form_view_oppor_inovatim2">
189- <field name="name">Opportunities</field>
190- <field name="model">crm.lead</field>
191- <field name="inherit_id" ref="crm_case_form_view_oppor_inovatim"/>
192- <field name="priority">20</field>
193- <field name="arch" type="xml">
194- <field name="phone" position="after">
195- <field name="mobile"/>
196- </field>
197- </field>
198- </record>
199-
200- </data>
201-</openerp>
202
203=== removed directory 'inovatim_addons/i18n'
204=== removed file 'inovatim_addons/i18n/en_US.po'
205--- inovatim_addons/i18n/en_US.po 2014-01-07 13:39:04 +0000
206+++ inovatim_addons/i18n/en_US.po 1970-01-01 00:00:00 +0000
207@@ -1,120 +0,0 @@
208-# Translation of OpenERP Server.
209-# This file contains the translation of the following modules:
210-# * inovatim_addons
211-#
212-msgid ""
213-msgstr ""
214-"Project-Id-Version: OpenERP Server 7.0\n"
215-"Report-Msgid-Bugs-To: \n"
216-"POT-Creation-Date: 2014-01-07 13:31+0000\n"
217-"PO-Revision-Date: 2014-01-07 13:31+0000\n"
218-"Last-Translator: <>\n"
219-"Language-Team: \n"
220-"MIME-Version: 1.0\n"
221-"Content-Type: text/plain; charset=UTF-8\n"
222-"Content-Transfer-Encoding: \n"
223-"Plural-Forms: \n"
224-
225-#. module: inovatim_addons
226-#: view:sale.order:0
227-msgid "Unit Price Without Tax"
228-msgstr ""
229-
230-#. module: inovatim_addons
231-#: view:sale.order:0
232-msgid "base.group_sale_manager"
233-msgstr ""
234-
235-#. module: inovatim_addons
236-#: model:ir.model,name:inovatim_addons.model_product_product
237-msgid "Product"
238-msgstr ""
239-
240-#. module: inovatim_addons
241-#: field:sale.order.line,price_unit_tax:0
242-#: field:sale.order.line,price_unit_tax_fn:0
243-msgid "Unit Price With Tax"
244-msgstr ""
245-
246-#. module: inovatim_addons
247-#: view:product.product:0
248-msgid "False"
249-msgstr ""
250-
251-#. module: inovatim_addons
252-#: field:sale.order.line,th_weight_fn:0
253-msgid "Weight"
254-msgstr ""
255-
256-#. module: inovatim_addons
257-#: model:ir.model,name:inovatim_addons.model_stock_move
258-msgid "Stock Move"
259-msgstr ""
260-
261-#. module: inovatim_addons
262-#: view:product.product:0
263-msgid "List Price Without Tax"
264-msgstr ""
265-
266-#. module: inovatim_addons
267-#: field:sale.order.line,product_uos_fn:0
268-msgid "Product UOS"
269-msgstr ""
270-
271-#. module: inovatim_addons
272-#: field:product.template,list_price_tax:0
273-msgid "List Price With Tax"
274-msgstr ""
275-
276-#. module: inovatim_addons
277-#: model:ir.model,name:inovatim_addons.model_product_template
278-msgid "Product Template"
279-msgstr ""
280-
281-#. module: inovatim_addons
282-#: field:sale.order.line,price_unit_fn:0
283-msgid "Unit Price"
284-msgstr ""
285-
286-#. module: inovatim_addons
287-#: field:purchase.order.line,customer_ref:0
288-#: field:stock.move,customer_ref:0
289-msgid "Customer Reference"
290-msgstr ""
291-
292-#. module: inovatim_addons
293-#: model:ir.model,name:inovatim_addons.model_purchase_order_line
294-msgid "Purchase Order Line"
295-msgstr ""
296-
297-#. module: inovatim_addons
298-#: field:sale.order.line,product_uom_fn:0
299-msgid "Unit of Measure"
300-msgstr ""
301-
302-#. module: inovatim_addons
303-#: model:ir.model,name:inovatim_addons.model_purchase_order
304-msgid "Purchase Order"
305-msgstr ""
306-
307-#. module: inovatim_addons
308-#: view:sale.order:0
309-msgid "True"
310-msgstr ""
311-
312-#. module: inovatim_addons
313-#: field:purchase.order.line,pallete_qty:0
314-msgid "Pallete Quantity"
315-msgstr ""
316-
317-#. module: inovatim_addons
318-#: model:ir.model,name:inovatim_addons.model_sale_order_line
319-msgid "Sales Order Line"
320-msgstr ""
321-
322-#. module: inovatim_addons
323-#: help:purchase.order.line,customer_ref:0
324-#: help:stock.move,customer_ref:0
325-msgid "Customer reference"
326-msgstr ""
327-
328
329=== removed file 'inovatim_addons/i18n/inovatim_addons.pot'
330--- inovatim_addons/i18n/inovatim_addons.pot 2014-01-07 13:39:04 +0000
331+++ inovatim_addons/i18n/inovatim_addons.pot 1970-01-01 00:00:00 +0000
332@@ -1,120 +0,0 @@
333-# Translation of OpenERP Server.
334-# This file contains the translation of the following modules:
335-# * inovatim_addons
336-#
337-msgid ""
338-msgstr ""
339-"Project-Id-Version: OpenERP Server 7.0\n"
340-"Report-Msgid-Bugs-To: \n"
341-"POT-Creation-Date: 2014-01-07 13:31+0000\n"
342-"PO-Revision-Date: 2014-01-07 13:31+0000\n"
343-"Last-Translator: <>\n"
344-"Language-Team: \n"
345-"MIME-Version: 1.0\n"
346-"Content-Type: text/plain; charset=UTF-8\n"
347-"Content-Transfer-Encoding: \n"
348-"Plural-Forms: \n"
349-
350-#. module: inovatim_addons
351-#: view:sale.order:0
352-msgid "Unit Price Without Tax"
353-msgstr ""
354-
355-#. module: inovatim_addons
356-#: view:sale.order:0
357-msgid "base.group_sale_manager"
358-msgstr ""
359-
360-#. module: inovatim_addons
361-#: model:ir.model,name:inovatim_addons.model_product_product
362-msgid "Product"
363-msgstr ""
364-
365-#. module: inovatim_addons
366-#: field:sale.order.line,price_unit_tax:0
367-#: field:sale.order.line,price_unit_tax_fn:0
368-msgid "Unit Price With Tax"
369-msgstr ""
370-
371-#. module: inovatim_addons
372-#: view:product.product:0
373-msgid "False"
374-msgstr ""
375-
376-#. module: inovatim_addons
377-#: field:sale.order.line,th_weight_fn:0
378-msgid "Weight"
379-msgstr ""
380-
381-#. module: inovatim_addons
382-#: model:ir.model,name:inovatim_addons.model_stock_move
383-msgid "Stock Move"
384-msgstr ""
385-
386-#. module: inovatim_addons
387-#: view:product.product:0
388-msgid "List Price Without Tax"
389-msgstr ""
390-
391-#. module: inovatim_addons
392-#: field:sale.order.line,product_uos_fn:0
393-msgid "Product UOS"
394-msgstr ""
395-
396-#. module: inovatim_addons
397-#: field:product.template,list_price_tax:0
398-msgid "List Price With Tax"
399-msgstr ""
400-
401-#. module: inovatim_addons
402-#: model:ir.model,name:inovatim_addons.model_product_template
403-msgid "Product Template"
404-msgstr ""
405-
406-#. module: inovatim_addons
407-#: field:sale.order.line,price_unit_fn:0
408-msgid "Unit Price"
409-msgstr ""
410-
411-#. module: inovatim_addons
412-#: field:purchase.order.line,customer_ref:0
413-#: field:stock.move,customer_ref:0
414-msgid "Customer Reference"
415-msgstr ""
416-
417-#. module: inovatim_addons
418-#: model:ir.model,name:inovatim_addons.model_purchase_order_line
419-msgid "Purchase Order Line"
420-msgstr ""
421-
422-#. module: inovatim_addons
423-#: field:sale.order.line,product_uom_fn:0
424-msgid "Unit of Measure"
425-msgstr ""
426-
427-#. module: inovatim_addons
428-#: model:ir.model,name:inovatim_addons.model_purchase_order
429-msgid "Purchase Order"
430-msgstr ""
431-
432-#. module: inovatim_addons
433-#: view:sale.order:0
434-msgid "True"
435-msgstr ""
436-
437-#. module: inovatim_addons
438-#: field:purchase.order.line,pallete_qty:0
439-msgid "Pallete Quantity"
440-msgstr ""
441-
442-#. module: inovatim_addons
443-#: model:ir.model,name:inovatim_addons.model_sale_order_line
444-msgid "Sales Order Line"
445-msgstr ""
446-
447-#. module: inovatim_addons
448-#: help:purchase.order.line,customer_ref:0
449-#: help:stock.move,customer_ref:0
450-msgid "Customer reference"
451-msgstr ""
452-
453
454=== removed file 'inovatim_addons/i18n/sl.po'
455--- inovatim_addons/i18n/sl.po 2014-01-07 13:39:04 +0000
456+++ inovatim_addons/i18n/sl.po 1970-01-01 00:00:00 +0000
457@@ -1,120 +0,0 @@
458-# Translation of OpenERP Server.
459-# This file contains the translation of the following modules:
460-# * inovatim_addons
461-#
462-msgid ""
463-msgstr ""
464-"Project-Id-Version: OpenERP Server 7.0\n"
465-"Report-Msgid-Bugs-To: \n"
466-"POT-Creation-Date: 2014-01-07 13:31+0000\n"
467-"PO-Revision-Date: 2014-01-07 13:31+0000\n"
468-"Last-Translator: <>\n"
469-"Language-Team: \n"
470-"MIME-Version: 1.0\n"
471-"Content-Type: text/plain; charset=UTF-8\n"
472-"Content-Transfer-Encoding: \n"
473-"Plural-Forms: \n"
474-
475-#. module: inovatim_addons
476-#: view:sale.order:0
477-msgid "Unit Price Without Tax"
478-msgstr "Cena brez DDV"
479-
480-#. module: inovatim_addons
481-#: view:sale.order:0
482-msgid "base.group_sale_manager"
483-msgstr ""
484-
485-#. module: inovatim_addons
486-#: model:ir.model,name:inovatim_addons.model_product_product
487-msgid "Product"
488-msgstr "Izdelek"
489-
490-#. module: inovatim_addons
491-#: field:sale.order.line,price_unit_tax:0
492-#: field:sale.order.line,price_unit_tax_fn:0
493-msgid "Unit Price With Tax"
494-msgstr "Cena z DDV"
495-
496-#. module: inovatim_addons
497-#: view:product.product:0
498-msgid "False"
499-msgstr ""
500-
501-#. module: inovatim_addons
502-#: field:sale.order.line,th_weight_fn:0
503-msgid "Weight"
504-msgstr "Teža"
505-
506-#. module: inovatim_addons
507-#: model:ir.model,name:inovatim_addons.model_stock_move
508-msgid "Stock Move"
509-msgstr "Premik zaloge"
510-
511-#. module: inovatim_addons
512-#: view:product.product:0
513-msgid "List Price Without Tax"
514-msgstr "Prodajna cena brez DDV"
515-
516-#. module: inovatim_addons
517-#: field:sale.order.line,product_uos_fn:0
518-msgid "Product UOS"
519-msgstr "Prodajna enota mere"
520-
521-#. module: inovatim_addons
522-#: field:product.template,list_price_tax:0
523-msgid "List Price With Tax"
524-msgstr "Prodajna cena z DDV"
525-
526-#. module: inovatim_addons
527-#: model:ir.model,name:inovatim_addons.model_product_template
528-msgid "Product Template"
529-msgstr "Predloga izdelka"
530-
531-#. module: inovatim_addons
532-#: field:sale.order.line,price_unit_fn:0
533-msgid "Unit Price"
534-msgstr "Cena brez DDV"
535-
536-#. module: inovatim_addons
537-#: field:purchase.order.line,customer_ref:0
538-#: field:stock.move,customer_ref:0
539-msgid "Customer Reference"
540-msgstr "Šifra kupca"
541-
542-#. module: inovatim_addons
543-#: model:ir.model,name:inovatim_addons.model_purchase_order_line
544-msgid "Purchase Order Line"
545-msgstr "Postavka nabavnega naloga"
546-
547-#. module: inovatim_addons
548-#: field:sale.order.line,product_uom_fn:0
549-msgid "Unit of Measure"
550-msgstr "Enota mere"
551-
552-#. module: inovatim_addons
553-#: model:ir.model,name:inovatim_addons.model_purchase_order
554-msgid "Purchase Order"
555-msgstr "Nabavni nalog"
556-
557-#. module: inovatim_addons
558-#: view:sale.order:0
559-msgid "True"
560-msgstr ""
561-
562-#. module: inovatim_addons
563-#: field:purchase.order.line,pallete_qty:0
564-msgid "Pallete Quantity"
565-msgstr "Količina na paleti"
566-
567-#. module: inovatim_addons
568-#: model:ir.model,name:inovatim_addons.model_sale_order_line
569-msgid "Sales Order Line"
570-msgstr "Postavka prodajnega naloga"
571-
572-#. module: inovatim_addons
573-#: help:purchase.order.line,customer_ref:0
574-#: help:stock.move,customer_ref:0
575-msgid "Customer reference"
576-msgstr "Šifra kupca"
577-
578
579=== removed file 'inovatim_addons/product_product.py'
580--- inovatim_addons/product_product.py 2014-01-05 23:18:59 +0000
581+++ inovatim_addons/product_product.py 1970-01-01 00:00:00 +0000
582@@ -1,55 +0,0 @@
583-# -*- coding: utf-8 -*-
584-##############################################################################
585-#
586-# OpenERP, Open Source Management Solution
587-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
588-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
589-#
590-# This program is free software: you can redistribute it and/or modify
591-# it under the terms of the GNU Affero General Public License as
592-# published by the Free Software Foundation, either version 3 of the
593-# License, or (at your option) any later version.
594-#
595-# This program is distributed in the hope that it will be useful,
596-# but WITHOUT ANY WARRANTY; without even the implied warranty of
597-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
598-# GNU Affero General Public License for more details.
599-#
600-# You should have received a copy of the GNU Affero General Public License
601-# along with this program. If not, see <http://www.gnu.org/licenses/>.
602-#
603-##############################################################################
604-
605-from osv import osv, fields
606-import openerp.addons.decimal_precision as dp
607-
608-class product_product(osv.osv):
609- _inherit = "product.product"
610-
611- def onchange_list_price(self, cr, uid, ids, tax_id, list_price):
612- result = {}
613- if ids and tax_id:
614- _dp_digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
615- _taxes_ids = tax_id[0][2]
616- _taxes = self.pool.get('account.tax').browse(cr, uid, _taxes_ids)
617- result['list_price_tax'] = self.pool.get('account.tax').compute_all(cr, uid, _taxes, list_price, 1, ids[0])['total_included']
618- result['list_price_tax'] = round(result['list_price_tax'], _dp_digits)
619- result['list_price'] = self.pool.get('account.tax').compute_inv(cr, uid, _taxes, result['list_price_tax'], 1, ids[0])[0]['price_unit']
620- result['list_price'] = round(result['list_price'], _dp_digits)
621- else:
622- result['list_price_tax'] = list_price
623- return {'value': result}
624-
625- def onchange_list_price_tax(self, cr, uid, ids, tax_id, list_price_tax):
626- result = {}
627- if ids and tax_id:
628- _dp_digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
629- _taxes_ids = tax_id[0][2]
630- _taxes = self.pool.get('account.tax').browse(cr, uid, _taxes_ids)
631- result['list_price'] = self.pool.get('account.tax').compute_inv(cr, uid, _taxes, list_price_tax, 1, ids[0])[0]['price_unit']
632- result['list_price'] = round(result['list_price'], _dp_digits)
633- result['list_price_tax'] = self.pool.get('account.tax').compute_all(cr, uid, _taxes, result['list_price'], 1, ids[0])['total_included']
634- result['list_price_tax'] = round(result['list_price_tax'], _dp_digits)
635- else:
636- result['list_price'] = list_price_tax
637- return {'value': result}
638
639=== removed file 'inovatim_addons/product_template.py'
640--- inovatim_addons/product_template.py 2014-02-11 07:14:31 +0000
641+++ inovatim_addons/product_template.py 1970-01-01 00:00:00 +0000
642@@ -1,36 +0,0 @@
643-# -*- coding: utf-8 -*-
644-##############################################################################
645-#
646-# OpenERP, Open Source Management Solution
647-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
648-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
649-#
650-# This program is free software: you can redistribute it and/or modify
651-# it under the terms of the GNU Affero General Public License as
652-# published by the Free Software Foundation, either version 3 of the
653-# License, or (at your option) any later version.
654-#
655-# This program is distributed in the hope that it will be useful,
656-# but WITHOUT ANY WARRANTY; without even the implied warranty of
657-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
658-# GNU Affero General Public License for more details.
659-#
660-# You should have received a copy of the GNU Affero General Public License
661-# along with this program. If not, see <http://www.gnu.org/licenses/>.
662-#
663-##############################################################################
664-
665-from osv import osv, fields
666-import openerp.addons.decimal_precision as dp
667-
668-class product_template(osv.osv):
669- _inherit = "product.template"
670-
671- _columns={
672- 'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute=dp.get_precision('Payment Term'),
673- help='Coefficient to convert default Unit of Measure to Unit of Sale (uos = uom * coeff)'),
674- 'list_price_tax': fields.float('List Price With Tax', digits_compute=dp.get_precision('Product Price'))
675- }
676- _defaults={
677- 'list_price_tax': 0.0
678- }
679\ No newline at end of file
680
681=== removed file 'inovatim_addons/product_view.xml'
682--- inovatim_addons/product_view.xml 2014-01-22 18:07:39 +0000
683+++ inovatim_addons/product_view.xml 1970-01-01 00:00:00 +0000
684@@ -1,35 +0,0 @@
685-<?xml version="1.0" encoding="utf-8"?>
686-<openerp>
687- <data>
688- <record id="product_inovatim_normal_form_view" model="ir.ui.view">
689- <field name="name">product.inovatim.normal.form</field>
690- <field name="model">product.product</field>
691- <field name="inherit_id" ref="product.product_normal_form_view"/>
692- <field eval="7" name="priority"/>
693- <field name="arch" type="xml">
694- <field name="list_price" position="replace">
695- <field string="List Price Without Tax" name="list_price" on_change="onchange_list_price(taxes_id, list_price)" readonly="1"/>
696- <field name="list_price_tax" on_change="onchange_list_price_tax(taxes_id, list_price_tax)" readonly="1"/>
697- </field>
698- </field>
699- </record>
700-
701- <record id="product_inovatim2_normal_form_view" model="ir.ui.view">
702- <field name="name">product.inovatim.normal.form</field>
703- <field name="model">product.product</field>
704- <field name="inherit_id" ref="inovatim_addons.product_inovatim_normal_form_view"/>
705- <field name="groups_id" eval="[(6, 0, [ref('base.group_sale_manager')])]"/>
706- <field name="arch" type="xml">
707- <data>
708- <field name="list_price" position="attributes">
709- <attribute name="readonly">False</attribute>
710- </field>
711- <field name="list_price_tax" position="attributes">
712- <attribute name="readonly">False</attribute>
713- </field>
714- </data>
715- </field>
716- </record>
717-
718- </data>
719-</openerp>
720\ No newline at end of file
721
722=== removed file 'inovatim_addons/purchase_order.py'
723--- inovatim_addons/purchase_order.py 2014-01-05 23:18:59 +0000
724+++ inovatim_addons/purchase_order.py 1970-01-01 00:00:00 +0000
725@@ -1,35 +0,0 @@
726-# -*- coding: utf-8 -*-
727-##############################################################################
728-#
729-# OpenERP, Open Source Management Solution
730-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
731-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
732-#
733-# This program is free software: you can redistribute it and/or modify
734-# it under the terms of the GNU Affero General Public License as
735-# published by the Free Software Foundation, either version 3 of the
736-# License, or (at your option) any later version.
737-#
738-# This program is distributed in the hope that it will be useful,
739-# but WITHOUT ANY WARRANTY; without even the implied warranty of
740-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
741-# GNU Affero General Public License for more details.
742-#
743-# You should have received a copy of the GNU Affero General Public License
744-# along with this program. If not, see <http://www.gnu.org/licenses/>.
745-#
746-##############################################################################
747-
748-from osv import osv, fields
749-import openerp.addons.decimal_precision as dp
750-
751-class purchase_order(osv.osv):
752- _inherit = "purchase.order"
753-
754- def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, context=None):
755- res = super(purchase_order,self)._create_pickings(cr, uid, order, order_lines, picking_id, context)
756- picking_id = int(res[0])
757- for picking in self.pool.get('stock.picking.in').browse(cr, uid, [picking_id], context=None):
758- for _line in picking.move_lines:
759- _line.write({'customer_ref': _line.purchase_line_id.customer_ref})
760- return res
761
762=== removed file 'inovatim_addons/purchase_order_line.py'
763--- inovatim_addons/purchase_order_line.py 2014-01-05 23:18:59 +0000
764+++ inovatim_addons/purchase_order_line.py 1970-01-01 00:00:00 +0000
765@@ -1,54 +0,0 @@
766-# -*- coding: utf-8 -*-
767-##############################################################################
768-#
769-# OpenERP, Open Source Management Solution
770-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
771-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
772-#
773-# This program is free software: you can redistribute it and/or modify
774-# it under the terms of the GNU Affero General Public License as
775-# published by the Free Software Foundation, either version 3 of the
776-# License, or (at your option) any later version.
777-#
778-# This program is distributed in the hope that it will be useful,
779-# but WITHOUT ANY WARRANTY; without even the implied warranty of
780-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
781-# GNU Affero General Public License for more details.
782-#
783-# You should have received a copy of the GNU Affero General Public License
784-# along with this program. If not, see <http://www.gnu.org/licenses/>.
785-#
786-##############################################################################
787-
788-from osv import osv, fields
789-import openerp.addons.decimal_precision as dp
790-
791-class purchase_order_line(osv.osv):
792- _inherit = "purchase.order.line"
793-
794- def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
795- partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
796- name=False, price_unit=False, context=None):
797- res = super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist_id, product_id, qty, uom_id,
798- partner_id, date_order, fiscal_position_id, date_planned, name, price_unit, context)
799- if product_id:
800- _product = self.pool.get('product.product').browse(cr, uid, product_id, context)
801- res['value']['pallete_qty'] = _product.aq_pallete_qty or 0.0
802- return res
803-
804- def onchange_pallete_qty(self, cr, uid, ids, product_id):
805- result = {}
806- if product_id:
807- _product = self.pool.get('product.product').browse(cr, uid, product_id)
808- result['pallete_qty'] = _product.aq_pallete_qty or 0.0
809- else:
810- result['pallete_qty'] = 0.0
811- return {'value': result}
812-
813- _columns = {
814- 'customer_ref': fields.char('Customer Reference', size=16, help="Customer reference"),
815- 'pallete_qty': fields.float('Pallete Quantity', digits_compute=dp.get_precision('Product Price'))
816- }
817- _defaults = {
818- 'pallete_qty': 0.0
819- }
820\ No newline at end of file
821
822=== removed file 'inovatim_addons/purchase_order_view.xml'
823--- inovatim_addons/purchase_order_view.xml 2014-02-11 07:14:31 +0000
824+++ inovatim_addons/purchase_order_view.xml 1970-01-01 00:00:00 +0000
825@@ -1,21 +0,0 @@
826-<?xml version="1.0" encoding="utf-8"?>
827-<openerp>
828- <data>
829- <record id="purchase_order_inovatim_form" model="ir.ui.view">
830- <field name="name">purchase.order.inovatim.form</field>
831- <field name="model">purchase.order</field>
832- <field name="inherit_id" ref="purchase.purchase_order_form"/>
833- <field name="arch" type="xml">
834- <field name="product_id" position="before">
835- <field name="customer_ref"/>
836- </field>
837- <field name="product_qty" position="before">
838- <field name="pallete_qty" on_change="onchange_pallete_qty(product_id)"/>
839- </field>
840- <field name="warehouse_id" position="attributes">
841- <attribute name="required">1</attribute>
842- </field>
843- </field>
844- </record>
845- </data>
846-</openerp>
847\ No newline at end of file
848
849=== removed file 'inovatim_addons/res_partner.py'
850--- inovatim_addons/res_partner.py 2014-01-22 18:07:39 +0000
851+++ inovatim_addons/res_partner.py 1970-01-01 00:00:00 +0000
852@@ -1,31 +0,0 @@
853-# -*- coding: utf-8 -*-
854-##############################################################################
855-#
856-# OpenERP, Open Source Management Solution
857-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
858-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
859-#
860-# This program is free software: you can redistribute it and/or modify
861-# it under the terms of the GNU Affero General Public License as
862-# published by the Free Software Foundation, either version 3 of the
863-# License, or (at your option) any later version.
864-#
865-# This program is distributed in the hope that it will be useful,
866-# but WITHOUT ANY WARRANTY; without even the implied warranty of
867-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
868-# GNU Affero General Public License for more details.
869-#
870-# You should have received a copy of the GNU Affero General Public License
871-# along with this program. If not, see <http://www.gnu.org/licenses/>.
872-#
873-##############################################################################
874-
875-from osv import osv, fields
876-from tools.translate import _
877-
878-class res_partner(osv.osv):
879- _inherit = 'res.partner'
880-
881- _columns = {
882- 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="International Commercial Terms are a series of predefined commercial terms used in international transactions."),
883- }
884\ No newline at end of file
885
886=== removed file 'inovatim_addons/res_partner_view.xml'
887--- inovatim_addons/res_partner_view.xml 2014-01-22 18:07:39 +0000
888+++ inovatim_addons/res_partner_view.xml 1970-01-01 00:00:00 +0000
889@@ -1,43 +0,0 @@
890-<?xml version="1.0" encoding="utf-8"?>
891-<openerp>
892- <data>
893-
894- <record id="view_partner_property_inovatim_form" model="ir.ui.view">
895- <field name="name">res.partner.product.property.form.inherit</field>
896- <field name="model">res.partner</field>
897- <field name="inherit_id" ref="product.view_partner_property_form"/>
898- <field name="arch" type="xml">
899- <field name="property_product_pricelist" position="before">
900- <field name="incoterm" groups="base.group_user"/>
901- </field>
902- </field>
903- </record>
904-
905- <record id="view_partner_inovatim_form" model="ir.ui.view">
906- <field name="name">res.partner.inovatim.form</field>
907- <field name="model">res.partner</field>
908- <field name="inherit_id" ref="base.view_partner_form"/>
909- <field name="arch" type="xml">
910- <field name="state_id" position="attributes">
911- <attribute name="invisible">True</attribute>
912- </field>
913- <field name="street2" position="attributes">
914- <attribute name="invisible">True</attribute>
915- </field>
916- <field name="zip" position="replace"/>
917- </field>
918- </record>
919-
920- <record id="view_partner_inovatim2_form" model="ir.ui.view">
921- <field name="name">res.partner.inovatim.form</field>
922- <field name="model">res.partner</field>
923- <field name="inherit_id" ref="inovatim_addons.view_partner_inovatim_form"/>
924- <field name="arch" type="xml">
925- <field name="city" position="before">
926- <field name="zip" placeholder="ZIP" style="width: 20%%" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
927- </field>
928- </field>
929- </record>
930-
931- </data>
932-</openerp>
933\ No newline at end of file
934
935=== removed file 'inovatim_addons/sale_order.py'
936--- inovatim_addons/sale_order.py 2014-02-11 07:14:31 +0000
937+++ inovatim_addons/sale_order.py 1970-01-01 00:00:00 +0000
938@@ -1,44 +0,0 @@
939-# -*- coding: utf-8 -*-
940-##############################################################################
941-#
942-# OpenERP, Open Source Management Solution
943-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
944-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
945-#
946-# This program is free software: you can redistribute it and/or modify
947-# it under the terms of the GNU Affero General Public License as
948-# published by the Free Software Foundation, either version 3 of the
949-# License, or (at your option) any later version.
950-#
951-# This program is distributed in the hope that it will be useful,
952-# but WITHOUT ANY WARRANTY; without even the implied warranty of
953-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
954-# GNU Affero General Public License for more details.
955-#
956-# You should have received a copy of the GNU Affero General Public License
957-# along with this program. If not, see <http://www.gnu.org/licenses/>.
958-#
959-##############################################################################
960-
961-from osv import osv, fields
962-from _common import rounding
963-import openerp.addons.decimal_precision as dp
964-
965-class sale_order(osv.osv):
966- _inherit = "sale.order"
967-
968- def onchange_partner_id(self, cr, uid, ids, partner=False, context=None):
969- res = super(sale_order, self).onchange_partner_id(cr, uid, ids, partner, context)
970- if partner and res and 'value' in res:
971- result = res['value']
972- partner_id = self.pool.get('res.partner').browse(cr, uid, partner, context)
973- if partner_id and partner_id.incoterm:
974- result['incoterm'] = partner_id.incoterm.id
975- res['value'] = result
976- return res
977-
978- def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
979- _result = super(sale_order, self)._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context)
980- if line.prodlot_id:
981- _result['prodlot_id'] = line.prodlot_id.id
982- return _result
983
984=== removed file 'inovatim_addons/sale_order_line.py'
985--- inovatim_addons/sale_order_line.py 2014-02-11 07:14:31 +0000
986+++ inovatim_addons/sale_order_line.py 1970-01-01 00:00:00 +0000
987@@ -1,171 +0,0 @@
988-# -*- coding: utf-8 -*-
989-##############################################################################
990-#
991-# OpenERP, Open Source Management Solution
992-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
993-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
994-#
995-# This program is free software: you can redistribute it and/or modify
996-# it under the terms of the GNU Affero General Public License as
997-# published by the Free Software Foundation, either version 3 of the
998-# License, or (at your option) any later version.
999-#
1000-# This program is distributed in the hope that it will be useful,
1001-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1002-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1003-# GNU Affero General Public License for more details.
1004-#
1005-# You should have received a copy of the GNU Affero General Public License
1006-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1007-#
1008-##############################################################################
1009-
1010-from osv import osv, fields
1011-from _common import rounding
1012-import openerp.addons.decimal_precision as dp
1013-
1014-class sale_order_line(osv.osv):
1015- _inherit = "sale.order.line"
1016-
1017- def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
1018- uom=False, qty_uos=0, uos=False, name='', partner_id=False,
1019- lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, prodlot=False, serial=False, flag=False, context=None):
1020- res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id,
1021- lang, update_tax, date_order, packaging, fiscal_position, flag, context)
1022- if res and product and 'value' in res:
1023- result = res['value']
1024- if 'product_uom' in result:
1025- result['product_uom_fn'] = result['product_uom']
1026- if 'product_uos' in result:
1027- result['product_uos_fn'] = result['product_uos']
1028- if 'price_unit' in result:
1029- result['price_unit_fn'] = result['price_unit']
1030- if 'th_weight' in result:
1031- result['th_weight_fn'] = result['th_weight']
1032- if not serial and product:
1033- result['serial_fn'] = self._get_serial(cr, uid, ids, product)
1034- else:
1035- result['serial_fn'] = serial
1036- result['prodlot_id'] = prodlot
1037- res['value'] = result
1038- return res
1039-
1040- def onchange_uom_quantity(self, cr, uid, ids, product_id, product_uom_qty, prodlot):
1041- result = {}
1042- if product_id:
1043- result = self._calc_uos_qty(cr, uid, product_id, product_uom_qty, prodlot)
1044- return {'value': result}
1045-
1046- def onchange_uos_quantity(self, cr, uid, ids, product_id, product_uos_qty, prodlot):
1047- result = {}
1048- if product_id:
1049- result = self._calc_uom_qty(cr, uid, product_id, product_uos_qty, prodlot)
1050- return {'value': result}
1051-
1052- def onchange_price_unit(self, cr, uid, ids, tax_id, price_unit, discount, product_id, partner_id):
1053- result = {}
1054- if tax_id and product_id and partner_id:
1055- _dp_digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
1056- _taxes_ids = tax_id[0][2]
1057- _taxes = self.pool.get('account.tax').browse(cr, uid, _taxes_ids)
1058- result['price_unit_tax'] = self.pool.get('account.tax').compute_all(cr, uid, _taxes, price_unit * (1-(discount or 0.0)/100.0), 1, product_id, partner_id)['total_included']
1059- result['price_unit_tax'] = round(result['price_unit_tax'], _dp_digits)
1060- result['price_unit'] = self.pool.get('account.tax').compute_inv(cr, uid, _taxes, result['price_unit_tax'] * (1-(discount or 0.0)/100.0), 1, product_id, partner_id)[0]['price_unit']
1061- result['price_unit'] = round(result['price_unit'], _dp_digits)
1062- result['price_unit_fn'] = result['price_unit']
1063- else:
1064- result['price_unit_tax'] = price_unit
1065- result['price_unit_tax_fn'] = result['price_unit_tax']
1066- return {'value': result}
1067-
1068- def onchange_price_unit_tax(self, cr, uid, ids, tax_id, price_unit_tax, discount, product_id, partner_id):
1069- result = {}
1070- if tax_id and product_id and partner_id:
1071- _dp_digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
1072- _taxes_ids = tax_id[0][2]
1073- _taxes = self.pool.get('account.tax').browse(cr, uid, _taxes_ids)
1074- result['price_unit'] = self.pool.get('account.tax').compute_inv(cr, uid, _taxes, price_unit_tax * (1-(discount or 0.0)/100.0), 1, product_id, partner_id)[0]['price_unit']
1075- result['price_unit'] = round(result['price_unit'], _dp_digits)
1076- result['price_unit_tax'] = self.pool.get('account.tax').compute_all(cr, uid, _taxes, result['price_unit'] * (1-(discount or 0.0)/100.0), 1, product_id, partner_id)['total_included']
1077- result['price_unit_tax'] = round(result['price_unit_tax'], _dp_digits)
1078- result['price_unit_tax_fn'] = result['price_unit_tax']
1079- else:
1080- result['price_unit'] = price_unit_tax
1081- result['price_unit_fn'] = result['price_unit']
1082- return {'value': result}
1083-
1084- def prodlot_id_change(self, cr, uid, ids, product, prodlot, context=None):
1085- result = {}
1086- if self._get_serial(cr, uid, ids, product):
1087- result['product_uos_qty'] = 0.0
1088- if product and prodlot:
1089- _prodlot_id = self.pool.get('stock.production.lot').search(cr, uid, [('id','=',prodlot),
1090- ('product_id','=',product)])
1091- if len(_prodlot_id) > 0:
1092- _prodlot = self.pool.get('stock.production.lot').browse(cr, uid, _prodlot_id[0], context)
1093- if _prodlot:
1094- result['product_uom_qty'] = _prodlot.stock_available
1095- return {'value': result}
1096-
1097- def _get_fn_values(self, cr, uid, ids, field_name, arg, context):
1098- res = {}
1099- for _line in self.browse(cr, uid, ids):
1100- values = {}
1101- if 'product_uom_fn' in field_name:
1102- values['product_uom_fn'] = _line.product_uom.id
1103- if 'product_uos_fn' in field_name:
1104- values['product_uos_fn'] = _line.product_uos.id
1105- if 'price_unit_tax_fn' in field_name:
1106- values['price_unit_tax_fn'] = _line.price_unit_tax
1107- if 'price_unit_fn' in field_name:
1108- values['price_unit_fn'] = _line.price_unit
1109- if 'th_weight_fn' in field_name:
1110- values['th_weight_fn'] = _line.th_weight
1111- if 'serial_fn' in field_name:
1112- values['serial_fn'] = _line._get_serial(_line.product_id.id)
1113- res[_line.id] = values
1114- return res
1115-
1116- def _get_serial(self, cr, uid, ids, product):
1117- _result = False
1118- if product:
1119- _product_id = self.pool.get('product.product').browse(cr, uid, product, None)
1120- if _product_id:
1121- _result = _product_id.track_production
1122- return _result
1123-
1124- def _calc_uos_qty(self, cr, uid, product, product_uom_qty, prodlot):
1125- result = {}
1126- if product:
1127- _product = self.pool.get('product.product').browse(cr, uid, product)
1128- if prodlot:
1129- _prodlot_id = self.pool.get('stock.production.lot').browse(cr, uid, prodlot, None)
1130- if _prodlot_id and _prodlot_id.stock_available < product_uom_qty:
1131- product_uom_qty = _prodlot_id.stock_available
1132- _product_uom_qty = rounding(product_uom_qty, _product.uom_id.rounding)
1133- _product_uos_qty = rounding(_product_uom_qty * _product.uos_coeff, _product.uos_id.rounding)
1134- result['product_uom_qty'] = _product_uom_qty
1135- result['product_uos_qty'] = _product_uos_qty
1136- return result
1137-
1138- def _calc_uom_qty(self, cr, uid, product, product_uos_qty, prodlot):
1139- result = {}
1140- if product:
1141- _product = self.pool.get('product.product').browse(cr, uid, product)
1142- _product_uos_qty = rounding(product_uos_qty, _product.uos_id.rounding)
1143- _product_uom_qty = rounding(_product_uos_qty / _product.uos_coeff, _product.uom_id.rounding)
1144- result['product_uos_qty'] = _product_uos_qty
1145- result['product_uom_qty'] = _product_uom_qty
1146- return result
1147-
1148-
1149- _columns = {
1150- 'price_unit_tax': fields.float('Unit Price With Tax', required=True, digits_compute=dp.get_precision('Product Price')),
1151- 'product_uom_fn': fields.function(_get_fn_values, string='Unit of Measure', obj="product.uom", type="many2one", multi=True),
1152- 'product_uos_fn': fields.function(_get_fn_values, string='Product UOS', obj="product.uom", type="many2one", multi=True),
1153- 'price_unit_tax_fn': fields.function(_get_fn_values, string='Unit Price With Tax', type="float", multi=True, digits_compute=dp.get_precision('Product Price')),
1154- 'price_unit_fn': fields.function(_get_fn_values, string='Unit Price', type="float", multi=True, digits_compute=dp.get_precision('Product Price')),
1155- 'th_weight_fn': fields.function(_get_fn_values, string='Weight', type="float", multi=True),
1156- 'serial_fn': fields.function(_get_fn_values, string='Weight', type="boolean", multi=True),
1157- 'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id),('stock_available','!=',0)]"),
1158- }
1159
1160=== removed file 'inovatim_addons/sale_order_view.xml'
1161--- inovatim_addons/sale_order_view.xml 2014-02-11 07:14:31 +0000
1162+++ inovatim_addons/sale_order_view.xml 1970-01-01 00:00:00 +0000
1163@@ -1,139 +0,0 @@
1164-<?xml version="1.0" encoding="utf-8"?>
1165-<openerp>
1166- <data>
1167- <record id="view_order_inovatim_form" model="ir.ui.view">
1168- <field name="name">sale.order.inovatim.form</field>
1169- <field name="model">sale.order</field>
1170- <field name="inherit_id" ref="sale_stock.view_order_form_inherit"/>
1171- <field name="arch" type="xml">
1172-
1173- <!-- REMOVED FIELDS -->
1174- <field name="incoterm" position="replace"/>
1175- <field name="payment_term" position="replace"/>
1176- <field name="user_id" position="replace"/>
1177-
1178- <!-- REPLACED FIELDS -->
1179- <field name="product_id" position="replace">
1180- <field name="product_id"
1181- context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
1182- groups="base.group_user"
1183- on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,False,product_uos_qty,False,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, prodlot_id, serial_fn, False, context)"/>
1184- </field>
1185- <field name="product_uom_qty" position="replace">
1186- <field name="product_uom_qty" class="oe_inline" on_change="onchange_uom_quantity(product_id, product_uom_qty, prodlot_id)"/>
1187- </field>
1188- <field name="product_uos_qty" position="replace">
1189- <field name="product_uos_qty" class="oe_inline" on_change="onchange_uos_quantity(product_id, product_uos_qty, prodlot_id)"/>
1190- </field>
1191- <field name="price_unit" position="replace">
1192- <field string="Unit Price Without Tax" name="price_unit" on_change="onchange_price_unit(tax_id, price_unit, discount, product_id, parent.partner_id)" groups="base.group_sale_manager"/>
1193- </field>
1194-
1195- <!-- ADDED FIELDS -->
1196- <field name="product_uom" position="after">
1197- <field name="product_uom_fn" class="oe_inline"/>
1198- </field>
1199- <field name="product_uos" position="after">
1200- <field name="product_uos_fn" class="oe_inline"/>
1201- </field>
1202- <field name="price_unit" position="after">
1203- <field string="Unit Price Without Tax" name="price_unit_fn"/>
1204- <field name="price_unit_tax" on_change="onchange_price_unit_tax(tax_id, price_unit_tax, discount, product_id, parent.partner_id)" groups="base.group_sale_manager"/>
1205- <field name="price_unit_tax_fn"/>
1206- </field>
1207- <field name="th_weight" position="after">
1208- <field name="th_weight_fn"/>
1209- </field>
1210- <div name="discount" position="after">
1211- <field name="serial_fn" invisible="1"/>
1212- <field name="prodlot_id"
1213- context="{'show_qty': True}"
1214- options="{'create': false, 'create_edit': false, 'no_open': true}"
1215- attrs="{'required':[('serial_fn','=',True)]}"
1216- on_change="prodlot_id_change(product_id, prodlot_id)"/>
1217- </div>
1218-
1219- <!-- ATTRIBUTES CHANGED -->
1220- <field name="partner_id" position="attributes">
1221- <attribute name="domain">[('customer','=',True),('parent_id','=',False)]</attribute>
1222- </field>
1223- <field name="product_uom" position="attributes">
1224- <attribute name="groups">base.group_sale_manager</attribute>
1225- </field>
1226- <field name="product_uos" position="attributes">
1227- <attribute name="groups">base.group_sale_manager</attribute>
1228- </field>
1229- <field name="th_weight" position="attributes">
1230- <attribute name="groups">base.group_sale_manager</attribute>
1231- </field>
1232- <field name="address_allotment_id" position="attributes">
1233- <attribute name="groups">base.group_sale_manager</attribute>
1234- </field>
1235- <field name="type" position="attributes">
1236- <attribute name="groups">base.group_sale_manager</attribute>
1237- </field>
1238- <field name="tax_id" position="attributes">
1239- <attribute name="groups">base.group_sale_manager</attribute>
1240- </field>
1241- </field>
1242- </record>
1243-
1244- <record id="view_order_inovatim2_form" model="ir.ui.view">
1245- <field name="name">sale.order.inovatim.form</field>
1246- <field name="model">sale.order</field>
1247- <field name="inherit_id" ref="inovatim_addons.view_order_inovatim_form"/>
1248- <field name="groups_id" eval="[(6, 0, [ref('base.group_sale_manager')])]"/>
1249- <field name="arch" type="xml">
1250- <field name="price_unit_fn" position="attributes">
1251- <attribute name="invisible">True</attribute>
1252- </field>
1253- <field name="price_unit_tax_fn" position="attributes">
1254- <attribute name="invisible">True</attribute>
1255- </field>
1256- <field name="product_uom_fn" position="attributes">
1257- <attribute name="invisible">True</attribute>
1258- </field>
1259- <field name="product_uos_fn" position="attributes">
1260- <attribute name="invisible">True</attribute>
1261- </field>
1262- <field name="th_weight_fn" position="attributes">
1263- <attribute name="invisible">True</attribute>
1264- </field>
1265- </field>
1266- </record>
1267-
1268- <record id="view_order_inovatim3_form" model="ir.ui.view">
1269- <field name="name">sale.order.inovatim.form</field>
1270- <field name="model">sale.order</field>
1271- <field name="inherit_id" ref="inovatim_addons.view_order_inovatim_form"/>
1272- <field name="arch" type="xml">
1273- <field name="pricelist_id" position="after">
1274- <field name="incoterm" required="1"/>
1275- <field name="payment_term" required="1"/>
1276- <field name="user_id"/>
1277- </field>
1278- <!--xpath expr="//tree[@string='Sales Order Lines']/field[@name='tax_id']" position="attributes">
1279- <attribute name="invisible">True</attribute>
1280- </xpath>
1281- <xpath expr="//tree[@string='Sales Order Lines']/field[@name='product_uom']" position="after">
1282- <field name="product_uos_qty"/>
1283- <field name="product_uos"/>
1284- <field name="prodlot_id"/>
1285- </xpath-->
1286- </field>
1287- </record>
1288-
1289- <record id="view_order_inovatim_form_inherit" model="ir.ui.view">
1290- <field name="name">sale.order.inovatim.form.sale.stock</field>
1291- <field name="model">sale.order</field>
1292- <field name="inherit_id" ref="sale_stock.view_order_form_inherit"/>
1293- <field name="arch" type="xml">
1294- <data>
1295- <field name="product_packaging" position="attributes">
1296- <attribute name="invisible">True</attribute>
1297- </field>
1298- </data>
1299- </field>
1300- </record>
1301- </data>
1302-</openerp>
1303\ No newline at end of file
1304
1305=== removed directory 'inovatim_addons/security'
1306=== removed file 'inovatim_addons/security/stock_security.xml'
1307--- inovatim_addons/security/stock_security.xml 2014-01-22 18:07:39 +0000
1308+++ inovatim_addons/security/stock_security.xml 1970-01-01 00:00:00 +0000
1309@@ -1,11 +0,0 @@
1310-<?xml version="1.0" encoding="utf-8"?>
1311-<openerp>
1312- <data noupdate="0">
1313- <record id="group_stock_headmanager" model="res.groups">
1314- <field name="name">Head Manager</field>
1315- <field name="category_id" ref="base.module_category_warehouse_management"/>
1316- <field name="implied_ids" eval="[(4, ref('stock.group_stock_manager'))]"/>
1317- <field name="users" eval="[(4, ref('base.user_root'))]"/>
1318- </record>
1319- </data>
1320-</openerp>
1321\ No newline at end of file
1322
1323=== removed file 'inovatim_addons/stock_move.py'
1324--- inovatim_addons/stock_move.py 2014-01-05 23:18:59 +0000
1325+++ inovatim_addons/stock_move.py 1970-01-01 00:00:00 +0000
1326@@ -1,44 +0,0 @@
1327-# -*- coding: utf-8 -*-
1328-##############################################################################
1329-#
1330-# OpenERP, Open Source Management Solution
1331-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
1332-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
1333-#
1334-# This program is free software: you can redistribute it and/or modify
1335-# it under the terms of the GNU Affero General Public License as
1336-# published by the Free Software Foundation, either version 3 of the
1337-# License, or (at your option) any later version.
1338-#
1339-# This program is distributed in the hope that it will be useful,
1340-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1341-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1342-# GNU Affero General Public License for more details.
1343-#
1344-# You should have received a copy of the GNU Affero General Public License
1345-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1346-#
1347-##############################################################################
1348-
1349-from osv import osv, fields
1350-from _common import rounding
1351-import openerp.addons.decimal_precision as dp
1352-
1353-class stock_move(osv.osv):
1354- _inherit = "stock.move"
1355-
1356- def onchange_uos_quantity(self, cr, uid, ids, product_id, product_uos_qty, product_uos, product_uom):
1357- result = {}
1358- warning = {}
1359- if product_id:
1360- _product = self.pool.get('product.product').browse(cr, uid, product_id)
1361- product_uos_qty = rounding(product_uos_qty, _product.uos_id.rounding)
1362- _product_qty = rounding(product_uos_qty / _product.uos_coeff, _product.uom_id.rounding)
1363- result['product_uos_qty'] = product_uos_qty
1364- result['product_qty'] = _product_qty
1365-
1366- return {'value': result, 'warning': ''}
1367-
1368- _columns = {
1369- 'customer_ref': fields.char('Customer Reference', size=16, help="Customer reference"),
1370- }
1371
1372=== removed file 'inovatim_addons/stock_production_lot.py'
1373--- inovatim_addons/stock_production_lot.py 2014-02-11 07:14:31 +0000
1374+++ inovatim_addons/stock_production_lot.py 1970-01-01 00:00:00 +0000
1375@@ -1,58 +0,0 @@
1376-# -*- coding: utf-8 -*-
1377-##############################################################################
1378-#
1379-# OpenERP, Open Source Management Solution
1380-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
1381-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
1382-#
1383-# This program is free software: you can redistribute it and/or modify
1384-# it under the terms of the GNU Affero General Public License as
1385-# published by the Free Software Foundation, either version 3 of the
1386-# License, or (at your option) any later version.
1387-#
1388-# This program is distributed in the hope that it will be useful,
1389-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1390-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1391-# GNU Affero General Public License for more details.
1392-#
1393-# You should have received a copy of the GNU Affero General Public License
1394-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1395-#
1396-##############################################################################
1397-
1398-from osv import osv, fields
1399-from tools.translate import _
1400-import openerp.addons.decimal_precision as dp
1401-from _common import rounding
1402-
1403-class stock_production_lot(osv.osv):
1404- _inherit = "stock.production.lot"
1405-
1406- def name_get(self, cr, uid, ids, context=None):
1407- if not ids:
1408- return []
1409- res = []
1410- for _lot in self.read(cr, uid, ids, ['id', 'name', 'stock_available', 'product_id'], context):
1411- if context.get('show_qty', False):
1412- _lang = context.get('lang', False)
1413- if _lang:
1414- _dp_digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product UoS')
1415- _lang_id = self.pool.get('res.lang').search(cr, uid, [('code','=',_lang)])
1416- _stock_available = self.pool.get('res.lang').format(cr, uid, _lang_id, '%.' + str(_dp_digits) + 'f', _lot['stock_available'])
1417-
1418- if _lot['product_id']:
1419- _product = self.pool.get('product.template').browse(cr, uid, _lot['product_id'][0], context)
1420- _uom_id = _product.uom_id.name
1421- if _product.uos_id:
1422- _uos_qty = rounding(_lot['stock_available'] * _product.uos_coeff, _product.uos_id.rounding)
1423- _uos_id = _product.uos_id.name
1424- _uos_available = self.pool.get('res.lang').format(cr, uid, _lang_id, '%.' + str(_dp_digits) + 'f', _uos_qty)
1425- res.append((_lot['id'], _('LOT') + ' ' + _lot['name'] + ': ' + _stock_available + ' ' + _uom_id + ' - ' + _uos_available + ' ' + _uos_id))
1426- else:
1427- res.append((_lot['id'], _('LOT') + ' ' + _lot['name'] + ': ' + _stock_available + ' ' + _uom_id))
1428- else:
1429- res.append((_lot['id'], _lot['name']))
1430- else:
1431- res.append((_lot['id'], _lot['name']))
1432-
1433- return res
1434\ No newline at end of file
1435
1436=== removed file 'inovatim_addons/stock_view.xml'
1437--- inovatim_addons/stock_view.xml 2014-01-22 18:07:39 +0000
1438+++ inovatim_addons/stock_view.xml 1970-01-01 00:00:00 +0000
1439@@ -1,48 +0,0 @@
1440-<?xml version="1.0" encoding="utf-8"?>
1441-<openerp>
1442- <data>
1443- <record id="view_move_inovatim_tree" model="ir.ui.view">
1444- <field name="name">stock.move.inovatim.tree</field>
1445- <field name="model">stock.move</field>
1446- <field name="inherit_id" ref="stock.view_move_picking_tree"/>
1447- <field name="arch" type="xml">
1448- <field name="product_id" position="before">
1449- <field name="customer_ref"/>
1450- </field>
1451- <field name="product_uos" position="before">
1452- <field name="product_uos_qty" groups="product.group_uos"/>
1453- </field>
1454- </field>
1455- </record>
1456-
1457- <record id="view_move_inovatim_form" model="ir.ui.view">
1458- <field name="name">stock.move.inovatim.form</field>
1459- <field name="model">stock.move</field>
1460- <field name="inherit_id" ref="stock.view_move_picking_form"/>
1461- <field name="arch" type="xml">
1462- <button name="force_assign" position="replace">
1463- <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="stock.group_stock_headmanager"/>
1464- </button>
1465- <field name="product_id" position="before">
1466- <field name="customer_ref"/>
1467- </field>
1468- </field>
1469- </record>
1470-
1471- <record id="view_picking_out_inovatim_form" model="ir.ui.view">
1472- <field name="name">stock.picking.out.form</field>
1473- <field name="model">stock.picking.out</field>
1474- <field name="inherit_id" ref="stock.view_picking_out_form"/>
1475- <field name="priority" eval="12"/>
1476- <field name="arch" type="xml">
1477- <button name="draft_force_assign" position="replace">
1478- <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="stock.group_stock_headmanager"/>
1479- </button>
1480- <button name="force_assign" position="replace">
1481- <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="stock.group_stock_headmanager"/>
1482- </button>
1483- </field>
1484- </record>
1485-
1486- </data>
1487-</openerp>
1488\ No newline at end of file
1489
1490=== removed directory 'inovatim_addons/wizard'
1491=== removed file 'inovatim_addons/wizard/__init__.py'
1492--- inovatim_addons/wizard/__init__.py 2014-02-11 07:14:31 +0000
1493+++ inovatim_addons/wizard/__init__.py 1970-01-01 00:00:00 +0000
1494@@ -1,23 +0,0 @@
1495-# -*- coding: utf-8 -*-
1496-##############################################################################
1497-#
1498-# OpenERP, Open Source Management Solution
1499-# Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
1500-# Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
1501-#
1502-# This program is free software: you can redistribute it and/or modify
1503-# it under the terms of the GNU Affero General Public License as
1504-# published by the Free Software Foundation, either version 3 of the
1505-# License, or (at your option) any later version.
1506-#
1507-# This program is distributed in the hope that it will be useful,
1508-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1509-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1510-# GNU Affero General Public License for more details.
1511-#
1512-# You should have received a copy of the GNU Affero General Public License
1513-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1514-#
1515-##############################################################################
1516-
1517-import crm_lead_to_opportunity
1518\ No newline at end of file
1519
1520=== removed file 'inovatim_addons/wizard/crm_lead_to_opportunity.py'
1521--- inovatim_addons/wizard/crm_lead_to_opportunity.py 2014-02-11 07:14:31 +0000
1522+++ inovatim_addons/wizard/crm_lead_to_opportunity.py 1970-01-01 00:00:00 +0000
1523@@ -1,44 +0,0 @@
1524-# -*- coding: utf-8 -*-
1525-##############################################################################
1526-#
1527-# OpenERP, Open Source Management Solution
1528-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
1529-#
1530-# This program is free software: you can redistribute it and/or modify
1531-# it under the terms of the GNU Affero General Public License as
1532-# published by the Free Software Foundation, either version 3 of the
1533-# License, or (at your option) any later version.
1534-#
1535-# This program is distributed in the hope that it will be useful,
1536-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1537-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1538-# GNU Affero General Public License for more details.
1539-#
1540-# You should have received a copy of the GNU Affero General Public License
1541-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1542-#
1543-##############################################################################
1544-
1545-from openerp.osv import fields, osv
1546-from openerp.tools.translate import _
1547-from openerp import tools
1548-import re
1549-
1550-class crm_lead2opportunity_partner(osv.osv_memory):
1551- _inherit = 'crm.lead2opportunity.partner'
1552-
1553- def view_init(self, cr, uid, fields, context=None):
1554- """
1555- Check some preconditions before the wizard executes.
1556- """
1557- if context is None:
1558- context = {}
1559- lead_obj = self.pool.get('crm.lead')
1560- for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
1561- if lead.state in ['done', 'cancel']:
1562- raise osv.except_osv(_("Warning!"), _("Closed/Cancelled leads cannot be converted into opportunities."))
1563- if lead.partner_name and lead.partner_name != '':
1564- raise osv.except_osv(_("Warning!"), _("Partner name must be blank."))
1565- if lead.partner_id:
1566- raise osv.except_osv(_("Warning!"), _("Partner must not be set."))
1567- return False
1568\ No newline at end of file
1569
1570=== removed directory 'inovatim_reports'
1571=== removed file 'inovatim_reports/__init__.py'
1572--- inovatim_reports/__init__.py 2014-02-25 12:29:43 +0000
1573+++ inovatim_reports/__init__.py 1970-01-01 00:00:00 +0000
1574@@ -1,26 +0,0 @@
1575-# -*- coding: utf-8 -*-
1576-##############################################################################
1577-#
1578-# OpenERP, Open Source Management Solution
1579-# Copyright (C) 2014 Mentis d.o.o. (<http://www.mentis.si>)
1580-#
1581-# This program is free software: you can redistribute it and/or modify
1582-# it under the terms of the GNU Affero General Public License as
1583-# published by the Free Software Foundation, either version 3 of the
1584-# License, or (at your option) any later version.
1585-#
1586-# This program is distributed in the hope that it will be useful,
1587-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1588-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1589-# GNU Affero General Public License for more details.
1590-#
1591-# You should have received a copy of the GNU Affero General Public License
1592-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1593-#
1594-##############################################################################
1595-
1596-import report
1597-import inovatim_reports
1598-import account_payment_term
1599-import res_partner
1600-
1601
1602=== removed file 'inovatim_reports/__openerp__.py'
1603--- inovatim_reports/__openerp__.py 2014-02-25 12:29:43 +0000
1604+++ inovatim_reports/__openerp__.py 1970-01-01 00:00:00 +0000
1605@@ -1,39 +0,0 @@
1606-# -*- coding: utf-8 -*-
1607-##############################################################################
1608-#
1609-# OpenERP, Open Source Management Solution
1610-# Copyright (C) 2014 Mentis d.o.o. (<http://www.mentis.si>)
1611-#
1612-# This program is free software: you can redistribute it and/or modify
1613-# it under the terms of the GNU Affero General Public License as
1614-# published by the Free Software Foundation, either version 3 of the
1615-# License, or (at your option) any later version.
1616-#
1617-# This program is distributed in the hope that it will be useful,
1618-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1619-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1620-# GNU Affero General Public License for more details.
1621-#
1622-# You should have received a copy of the GNU Affero General Public License
1623-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1624-#
1625-##############################################################################
1626-
1627-{
1628- "name": "Inovatim Reports",
1629- "version": "1.0",
1630- "author": "Mentis d.o.o.",
1631- "category": "Generic Modules",
1632- "depends": ['base','sale','purchase','account','stock'],
1633- "description": """Inovatim Reports - replacing original OpenERP reports. """,
1634- "init_xml": [],
1635- "update_xml": [
1636- 'inovatim_reports.xml',
1637- 'account_payment_term_view.xml',
1638- 'res_partner_view.xml',
1639- ],
1640- "demo_xml": [],
1641- "active": False,
1642- "installable": True,
1643-}
1644-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1645
1646=== removed file 'inovatim_reports/account_payment_term.py'
1647--- inovatim_reports/account_payment_term.py 2014-01-22 11:35:04 +0000
1648+++ inovatim_reports/account_payment_term.py 1970-01-01 00:00:00 +0000
1649@@ -1,8 +0,0 @@
1650-from openerp.osv import fields, osv
1651-
1652-class account_payment_term(osv.osv):
1653- _inherit = "account.payment.term"
1654-
1655- _columns = {
1656- 'date_due_note': fields.char('Date Due Note', size=64),
1657- }
1658
1659=== removed file 'inovatim_reports/account_payment_term_view.xml'
1660--- inovatim_reports/account_payment_term_view.xml 2014-01-20 08:10:25 +0000
1661+++ inovatim_reports/account_payment_term_view.xml 1970-01-01 00:00:00 +0000
1662@@ -1,20 +0,0 @@
1663-<?xml version="1.0"?>
1664-<openerp>
1665- <data>
1666-
1667- <record id="view_payment_term_form_due_date_note_inherit" model="ir.ui.view">
1668- <field name="name">payment_term_form_due_date_inherit</field>
1669- <field name="model">account.payment.term</field>
1670- <field name="inherit_id" ref="account.view_payment_term_form" />
1671- <field name="arch" type="xml">
1672- <data>
1673- <xpath expr="field[@name='note']" position="before">
1674- <field name="date_due_note" />
1675- </xpath>
1676- </data>
1677- </field>
1678- </record>
1679-
1680- </data>
1681-</openerp>
1682-
1683
1684=== removed directory 'inovatim_reports/i18n'
1685=== removed file 'inovatim_reports/i18n/en_US.po'
1686--- inovatim_reports/i18n/en_US.po 2014-02-28 10:06:39 +0000
1687+++ inovatim_reports/i18n/en_US.po 1970-01-01 00:00:00 +0000
1688@@ -1,528 +0,0 @@
1689-# Translation of OpenERP Server.
1690-# This file contains the translation of the following modules:
1691-# * inovatim_reports
1692-#
1693-msgid ""
1694-msgstr ""
1695-"Project-Id-Version: OpenERP Server 7.0\n"
1696-"Report-Msgid-Bugs-To: \n"
1697-"POT-Creation-Date: 2014-01-19 16:01+0000\n"
1698-"PO-Revision-Date: 2014-01-19 16:01+0000\n"
1699-"Last-Translator: <>\n"
1700-"Language-Team: \n"
1701-"MIME-Version: 1.0\n"
1702-"Content-Type: text/plain; charset=UTF-8\n"
1703-"Content-Transfer-Encoding: \n"
1704-"Plural-Forms: \n"
1705-
1706-#. module: inovatim_reports
1707-#: model:ir.model,name:inovatim_reports.model_account_payment_term
1708-msgid "Payment Term"
1709-msgstr "Payment Term"
1710-
1711-#. module: inovatim_reports
1712-#: report:account.invoice.inovatim:0
1713-#: report:sale.order.inovatim:0
1714-msgid "Payment Term:"
1715-msgstr "Payment term:"
1716-
1717-#. module: inovatim_reports
1718-#: report:account.invoice.inovatim:0
1719-msgid "Delivery Date:"
1720-msgstr "Delivery Date:"
1721-
1722-#. module: inovatim_reports
1723-#: report:account.invoice.inovatim:0
1724-msgid "Due Date:"
1725-msgstr "Due Date:"
1726-
1727-#. module: inovatim_reports
1728-#: report:account.invoice.inovatim:0
1729-msgid "VAT:"
1730-msgstr "VAT:"
1731-
1732-#. module: inovatim_reports
1733-#: report:account.invoice.inovatim:0
1734-msgid "Invoice issued by:"
1735-msgstr "Invoice issued by:"
1736-
1737-#. module: inovatim_reports
1738-#: report:account.invoice.inovatim:0
1739-#: report:sale.order.inovatim:0
1740-msgid "Code"
1741-msgstr "Code"
1742-
1743-#. module: inovatim_reports
1744-#: report:account.invoice.inovatim:0
1745-#: report:stock.picking.list.inovatim:0
1746-#: report:stock.picking.list.inovatim.out:0
1747-#: report:stock.picking.list.inovatim.in:0
1748-msgid "Partner phone:"
1749-msgstr "Partner phone:"
1750-
1751-#. module: inovatim_reports
1752-#: report:account.invoice.inovatim:0
1753-#: report:sale.order.inovatim:0
1754-msgid "UM"
1755-msgstr "UM"
1756-
1757-#. module: inovatim_reports
1758-#: report:account.invoice.inovatim:0
1759-#: report:sale.order.inovatim:0
1760-msgid "Package"
1761-msgstr "Package"
1762-
1763-#. module: inovatim_reports
1764-#: report:account.invoice.inovatim:0
1765-#: report:sale.order.inovatim:0
1766-msgid "Disc."
1767-msgstr "Disc."
1768-
1769-#. module: inovatim_reports
1770-#: report:account.invoice.inovatim:0
1771-msgid "Price (EUR)"
1772-msgstr "Price (EUR)"
1773-
1774-#. module: inovatim_reports
1775-#: report:account.invoice.inovatim:0
1776-msgid "Delivery method:"
1777-msgstr "Delivery method:"
1778-
1779-#. module: inovatim_reports
1780-#: report:account.invoice.inovatim:0
1781-#: report:sale.order.inovatim:0
1782-msgid "Total net weight:"
1783-msgstr "Total net weight:"
1784-
1785-#. module: inovatim_reports
1786-#: report:account.invoice.inovatim:0
1787-msgid "Cancelled Invoice"
1788-msgstr "Cancelled Invoice"
1789-
1790-#. module: inovatim_reports
1791-#: report:account.invoice.inovatim:0
1792-msgid "Description"
1793-msgstr "Description"
1794-
1795-#. module: inovatim_reports
1796-#: report:account.invoice.inovatim:0
1797-msgid "Disc. (%)"
1798-msgstr "Disc. (%)"
1799-
1800-#. module: inovatim_reports
1801-#: report:account.invoice.inovatim:0
1802-msgid "Draft Invoice"
1803-msgstr "Draft Invoice"
1804-
1805-#. module: inovatim_reports
1806-#: report:account.invoice.inovatim:0
1807-msgid "Invoice"
1808-msgstr "Invoice"
1809-
1810-#. module: inovatim_reports
1811-#: report:account.invoice.inovatim:0
1812-msgid "Invoice Date"
1813-msgstr "Invoice Date"
1814-
1815-#. module: inovatim_reports
1816-#: report:account.invoice.inovatim:0
1817-msgid "Invoice issued by:"
1818-msgstr "Invoice issued by:"
1819-
1820-#. module: inovatim_reports
1821-#: report:account.invoice.inovatim:0
1822-msgid "Net Total:"
1823-msgstr "Net Total:"
1824-
1825-#. module: inovatim_reports
1826-#: report:account.invoice.inovatim:0
1827-msgid "PRO-FORMA"
1828-msgstr "PRO-FORMA"
1829-
1830-#. module: inovatim_reports
1831-#: report:account.invoice.inovatim:0
1832-msgid "Quantity"
1833-msgstr "Quantity"
1834-
1835-#. module: inovatim_reports
1836-#: report:account.invoice.inovatim:0
1837-msgid "Reference:"
1838-msgstr "Reference:"
1839-
1840-#. module: inovatim_reports
1841-#: report:account.invoice.inovatim:0
1842-msgid "Refund"
1843-msgstr "Refund"
1844-
1845-#. module: inovatim_reports
1846-#: report:account.invoice.inovatim:0
1847-msgid "Supplier Invoice"
1848-msgstr "Supplier Invoice"
1849-
1850-#. module: inovatim_reports
1851-#: report:account.invoice.inovatim:0
1852-msgid "Supplier Refund"
1853-msgstr "Supplier Refund"
1854-
1855-#. module: inovatim_reports
1856-#: report:account.invoice.inovatim:0
1857-#: report:purchase.order.inovatim:0
1858-msgid "Taxes:"
1859-msgstr "Taxes:"
1860-
1861-#. module: inovatim_reports
1862-#: report:account.invoice.inovatim:0
1863-#: report:purchase.order.inovatim:0
1864-msgid "Total:"
1865-msgstr "Total:"
1866-
1867-#. module: inovatim_reports
1868-#: report:account.invoice.inovatim:0
1869-#: report:purchase.order.inovatim:0
1870-msgid "Unit Price"
1871-msgstr "Unit Price"
1872-
1873-#. module: inovatim_reports
1874-#: report:account.invoice.inovatim:0
1875-msgid "VAT:"
1876-msgstr "VAT:"
1877-
1878-#. module: inovatim_reports
1879-#: report:account.invoice.inovatim:0
1880-msgid "Disc. Total:"
1881-msgstr "Disc. Total:"
1882-
1883-#. module: inovatim_reports
1884-#: report:account.invoice.inovatim:0
1885-msgid "Net:"
1886-msgstr "Net:"
1887-
1888-#. module: inovatim_reports
1889-#: report:account.invoice.inovatim:0
1890-msgid "Disc. (€)"
1891-msgstr "Disc. (€)"
1892-
1893-
1894-
1895-
1896-
1897-#. module: inovatim_reports
1898-#: report:sale.order.inovatim:0
1899-msgid "Expiration date:"
1900-msgstr "Expiration date:"
1901-
1902-#. module: inovatim_reports
1903-#: report:sale.order.inovatim:0
1904-msgid "Confirmation date:"
1905-msgstr "Confirmation date:"
1906-
1907-#. module: inovatim_reports
1908-#: report:sale.order.inovatim:0
1909-msgid "Customer reference:"
1910-msgstr "Customer reference:"
1911-
1912-#. module: inovatim_reports
1913-#: report:sale.order.inovatim:0
1914-msgid "Description"
1915-msgstr "Description"
1916-
1917-#. module: inovatim_reports
1918-#: report:sale.order.inovatim:0
1919-msgid "Disc. (%)"
1920-msgstr "Disc. (%)"
1921-
1922-#. module: inovatim_reports
1923-#: report:sale.order.inovatim:0
1924-msgid "email:"
1925-msgstr "email:"
1926-
1927-#. module: inovatim_reports
1928-#: report:sale.order.inovatim:0
1929-msgid "Incoterm:"
1930-msgstr "Incoterm:"
1931-
1932-#. module: inovatim_reports
1933-#: report:sale.order.inovatim:0
1934-msgid "Invoice address :"
1935-msgstr "Invoice address :"
1936-
1937-#. module: inovatim_reports
1938-#: report:sale.order.inovatim:0
1939-#: report:purchase.order.inovatim:0
1940-msgid "Net Total:"
1941-msgstr "Net Total:"
1942-
1943-#. module: inovatim_reports
1944-#: report:sale.order.inovatim:0
1945-msgid "Order N°"
1946-msgstr "Order N°"
1947-
1948-#. module: inovatim_reports
1949-#: report:sale.order.inovatim:0
1950-msgid "Order reference:"
1951-msgstr "Order reference:"
1952-
1953-#. module: inovatim_reports
1954-#: report:sale.order.inovatim:0
1955-#: report:purchase.order.inovatim:0
1956-msgid "Payment terms:"
1957-msgstr "Payment terms:"
1958-
1959-#. module: inovatim_reports
1960-#: report:sale.order.inovatim:0
1961-msgid "Place, date:"
1962-msgstr "Place, date:"
1963-
1964-#. module: inovatim_reports
1965-#: report:sale.order.inovatim:0
1966-msgid "Price"
1967-msgstr "Price"
1968-
1969-#. module: inovatim_reports
1970-#: report:sale.order.inovatim:0
1971-msgid "Quantity"
1972-msgstr "Quantity"
1973-
1974-#. module: inovatim_reports
1975-#: report:sale.order.inovatim:0
1976-msgid "Quotation N°"
1977-msgstr "Quotation N°"
1978-
1979-#. module: inovatim_reports
1980-#: report:sale.order.inovatim:0
1981-msgid "Salesperson:"
1982-msgstr "Salesperson:"
1983-
1984-#. module: inovatim_reports
1985-#: report:sale.order.inovatim:0
1986-msgid "Shipping address :"
1987-msgstr "Shipping address :"
1988-
1989-#. module: inovatim_reports
1990-#: report:sale.order.inovatim:0
1991-msgid "Taxes :"
1992-msgstr "Taxes :"
1993-
1994-#. module: inovatim_reports
1995-#: report:sale.order.inovatim:0
1996-msgid "tel.:"
1997-msgstr "tel.:"
1998-
1999-#. module: inovatim_reports
2000-#: report:sale.order.inovatim:0
2001-msgid "Total :"
2002-msgstr "Total :"
2003-
2004-#. module: inovatim_reports
2005-#: report:sale.order.inovatim:0
2006-msgid "Unit Price"
2007-msgstr "Unit Price"
2008-
2009-#. module: inovatim_reports
2010-#: report:sale.order.inovatim:0
2011-msgid "VAT"
2012-msgstr "VAT"
2013-
2014-#. module: inovatim_reports
2015-#: report:sale.order.inovatim:0
2016-#: report:purchase.order.inovatim:0
2017-msgid "VAT:"
2018-msgstr "VAT:"
2019-
2020-#. module: inovatim_reports
2021-#: report:sale.order.inovatim:0
2022-msgid "Disc. (€)"
2023-msgstr "Disc. (€)"
2024-
2025-#. module: inovatim_reports
2026-#: report:sale.order.inovatim:0
2027-msgid "Taxes (%)"
2028-msgstr "Taxes (%)"
2029-
2030-#. module: inovatim_reports
2031-#: report:sale.order.inovatim:0
2032-msgid "Price (€)"
2033-msgstr "Price (€)"
2034-
2035-#. module: inovatim_reports
2036-#: report:sale.order.inovatim:0
2037-msgid "Disc. Total:"
2038-msgstr "Disc. Total:"
2039-
2040-#. module: inovatim_reports
2041-#: report:sale.order.inovatim:0
2042-msgid "Net:"
2043-msgstr ""
2044-
2045-
2046-
2047-
2048-
2049-#. module: inovatim_reports
2050-#: report:stock.picking.list.inovatim:0
2051-#: report:stock.picking.list.inovatim.out:0
2052-#: report:stock.picking.list.inovatim.in:0
2053-msgid "Delivery Order:"
2054-msgstr "Delivery Order:"
2055-
2056-#. module: inovatim_reports
2057-#: report:stock.picking.list.inovatim:0
2058-#: report:stock.picking.list.inovatim.out:0
2059-#: report:stock.picking.list.inovatim.in:0
2060-msgid "Incoming Shipment:"
2061-msgstr "Incoming Shipment:"
2062-
2063-#. module: inovatim_reports
2064-#: report:stock.picking.list.inovatim:0
2065-#: report:stock.picking.list.inovatim.out:0
2066-#: report:stock.picking.list.inovatim.in:0
2067-msgid "Internal Shipment:"
2068-msgstr "Internal Shipment:"
2069-
2070-#. module: inovatim_reports
2071-#: report:stock.picking.list.inovatim:0
2072-#: report:stock.picking.list.inovatim.out:0
2073-#: report:stock.picking.list.inovatim.in:0
2074-msgid "Warehouse Address:"
2075-msgstr "Warehouse Address:"
2076-
2077-#. module: inovatim_reports
2078-#: report:stock.picking.list.inovatim:0
2079-#: report:stock.picking.list.inovatim.out:0
2080-#: report:stock.picking.list.inovatim.in:0
2081-msgid "Scheduled Date:"
2082-msgstr "Scheduled Date:"
2083-
2084-#. module: inovatim_reports
2085-#: report:stock.picking.list.inovatim:0
2086-#: report:stock.picking.list.inovatim.out:0
2087-#: report:stock.picking.list.inovatim.in:0
2088-msgid "Order:"
2089-msgstr "Order:"
2090-
2091-#. module: inovatim_reports
2092-#: report:stock.picking.list.inovatim:0
2093-#: report:stock.picking.list.inovatim.out:0
2094-#: report:stock.picking.list.inovatim.in:0
2095-msgid "Customer reference:"
2096-msgstr "Customer reference:"
2097-
2098-#. module: inovatim_reports
2099-#: report:stock.picking.list.inovatim:0
2100-#: report:stock.picking.list.inovatim.out:0
2101-#: report:stock.picking.list.inovatim.in:0
2102-msgid "Delivery method:"
2103-msgstr "Delivery method:"
2104-
2105-#. module: inovatim_reports
2106-#: report:stock.picking.list.inovatim:0
2107-#: report:stock.picking.list.inovatim.out:0
2108-#: report:stock.picking.list.inovatim.in:0
2109-msgid "Total net weight:"
2110-msgstr "Total net weight:"
2111-
2112-#. module: inovatim_reports
2113-#: report:stock.picking.list.inovatim:0
2114-#: report:stock.picking.list.inovatim.out:0
2115-#: report:stock.picking.list.inovatim.in:0
2116-#: report:purchase.order.inovatim:0
2117-msgid "Code"
2118-msgstr "Code"
2119-
2120-#. module: inovatim_reports
2121-#: report:stock.picking.list.inovatim:0
2122-#: report:stock.picking.list.inovatim.out:0
2123-#: report:stock.picking.list.inovatim.in:0
2124-#: report:purchase.order.inovatim:0
2125-msgid "Description"
2126-msgstr "Description"
2127-
2128-#. module: inovatim_reports
2129-#: report:stock.picking.list.inovatim:0
2130-#: report:stock.picking.list.inovatim.out:0
2131-#: report:stock.picking.list.inovatim.in:0
2132-#: report:purchase.order.inovatim:0
2133-msgid "Quantity"
2134-msgstr "Quantity"
2135-
2136-#. module: inovatim_reports
2137-#: report:stock.picking.list.inovatim:0
2138-#: report:stock.picking.list.inovatim.out:0
2139-#: report:stock.picking.list.inovatim.in:0
2140-#: report:purchase.order.inovatim:0
2141-msgid "UM"
2142-msgstr "UM"
2143-
2144-#. module: inovatim_reports
2145-#: report:stock.picking.list.inovatim:0
2146-#: report:stock.picking.list.inovatim.out:0
2147-#: report:stock.picking.list.inovatim.in:0
2148-msgid "Package"
2149-msgstr "Package"
2150-
2151-#. module: inovatim_reports
2152-#: report:stock.picking.list.inovatim:0
2153-#: report:stock.picking.list.inovatim.out:0
2154-#: report:stock.picking.list.inovatim.in:0
2155-msgid "Price (€) / unit"
2156-msgstr "Price (€) / unit"
2157-
2158-#. module: inovatim_reports
2159-#: report:stock.picking.list.inovatim:0
2160-#: report:stock.picking.list.inovatim.out:0
2161-#: report:stock.picking.list.inovatim.in:0
2162-msgid "Issued by:"
2163-msgstr "Issued by:"
2164-
2165-#. module: inovatim_reports
2166-#: report:stock.picking.list.inovatim:0
2167-#: report:stock.picking.list.inovatim.out:0
2168-#: report:stock.picking.list.inovatim.in:0
2169-msgid "Received by:"
2170-msgstr "Received by:"
2171-
2172-#. module: inovatim_reports
2173-#: report:stock.picking.list.inovatim:0
2174-#: report:stock.picking.list.inovatim.out:0
2175-#: report:stock.picking.list.inovatim.in:0
2176-msgid "Place, date:"
2177-msgstr "Place, date:"
2178-
2179-
2180-
2181-
2182-
2183-#. module: inovatim_reports
2184-#: report:purchase.order.inovatim:0
2185-msgid "Purchase Order Confirmation:"
2186-msgstr "Purchase Order Confirmation:"
2187-
2188-#. module: inovatim_reports
2189-#: report:purchase.order.inovatim:0
2190-msgid "Request for Quotation:"
2191-msgstr "Request for Quotation:"
2192-
2193-#. module: inovatim_reports
2194-#: report:purchase.order.inovatim:0
2195-msgid "Order Date:"
2196-msgstr "Order Date:"
2197-
2198-#. module: inovatim_reports
2199-#: report:purchase.order.inovatim:0
2200-msgid "Validated By:"
2201-msgstr "Validated By:"
2202-
2203-#. module: inovatim_reports
2204-#: report:purchase.order.inovatim:0
2205-msgid "Customer reference"
2206-msgstr "Customer reference"
2207-
2208-#. module: inovatim_reports
2209-#: report:purchase.order.inovatim:0
2210-msgid "Net Price (€)"
2211-msgstr "Net Price (€)"
2212-
2213-#. module: inovatim_reports
2214-#: field:res.partner,delivery_prices:0
2215-msgid "Prices on delivery report"
2216-msgstr ""
2217
2218=== removed file 'inovatim_reports/i18n/inovatim_reports.pot'
2219--- inovatim_reports/i18n/inovatim_reports.pot 2014-02-28 10:06:39 +0000
2220+++ inovatim_reports/i18n/inovatim_reports.pot 1970-01-01 00:00:00 +0000
2221@@ -1,528 +0,0 @@
2222-# Translation of OpenERP Server.
2223-# This file contains the translation of the following modules:
2224-# * inovatim_reports
2225-#
2226-msgid ""
2227-msgstr ""
2228-"Project-Id-Version: OpenERP Server 7.0\n"
2229-"Report-Msgid-Bugs-To: \n"
2230-"POT-Creation-Date: 2014-01-19 16:01+0000\n"
2231-"PO-Revision-Date: 2014-01-19 16:01+0000\n"
2232-"Last-Translator: <>\n"
2233-"Language-Team: \n"
2234-"MIME-Version: 1.0\n"
2235-"Content-Type: text/plain; charset=UTF-8\n"
2236-"Content-Transfer-Encoding: \n"
2237-"Plural-Forms: \n"
2238-
2239-#. module: inovatim_reports
2240-#: model:ir.model,name:inovatim_reports.model_account_payment_term
2241-msgid "Payment Term"
2242-msgstr ""
2243-
2244-#. module: inovatim_reports
2245-#: report:account.invoice.inovatim:0
2246-#: report:sale.order.inovatim:0
2247-msgid "Payment Term:"
2248-msgstr ""
2249-
2250-#. module: inovatim_reports
2251-#: report:account.invoice.inovatim:0
2252-msgid "Delivery Date:"
2253-msgstr ""
2254-
2255-#. module: inovatim_reports
2256-#: report:account.invoice.inovatim:0
2257-msgid "Due Date:"
2258-msgstr ""
2259-
2260-#. module: inovatim_reports
2261-#: report:account.invoice.inovatim:0
2262-msgid "VAT:"
2263-msgstr ""
2264-
2265-#. module: inovatim_reports
2266-#: report:account.invoice.inovatim:0
2267-msgid "Invoice issued by:"
2268-msgstr ""
2269-
2270-#. module: inovatim_reports
2271-#: report:account.invoice.inovatim:0
2272-#: report:sale.order.inovatim:0
2273-msgid "Code"
2274-msgstr ""
2275-
2276-#. module: inovatim_reports
2277-#: report:account.invoice.inovatim:0
2278-#: report:stock.picking.list.inovatim:0
2279-#: report:stock.picking.list.inovatim.out:0
2280-#: report:stock.picking.list.inovatim.in:0
2281-msgid "Partner phone:"
2282-msgstr ""
2283-
2284-#. module: inovatim_reports
2285-#: report:account.invoice.inovatim:0
2286-#: report:sale.order.inovatim:0
2287-msgid "UM"
2288-msgstr ""
2289-
2290-#. module: inovatim_reports
2291-#: report:account.invoice.inovatim:0
2292-#: report:sale.order.inovatim:0
2293-msgid "Package"
2294-msgstr ""
2295-
2296-#. module: inovatim_reports
2297-#: report:account.invoice.inovatim:0
2298-#: report:sale.order.inovatim:0
2299-msgid "Disc."
2300-msgstr ""
2301-
2302-#. module: inovatim_reports
2303-#: report:account.invoice.inovatim:0
2304-msgid "Price (EUR)"
2305-msgstr ""
2306-
2307-#. module: inovatim_reports
2308-#: report:account.invoice.inovatim:0
2309-msgid "Delivery method:"
2310-msgstr ""
2311-
2312-#. module: inovatim_reports
2313-#: report:account.invoice.inovatim:0
2314-#: report:sale.order.inovatim:0
2315-msgid "Total net weight:"
2316-msgstr ""
2317-
2318-#. module: inovatim_reports
2319-#: report:account.invoice.inovatim:0
2320-msgid "Cancelled Invoice"
2321-msgstr ""
2322-
2323-#. module: inovatim_reports
2324-#: report:account.invoice.inovatim:0
2325-msgid "Description"
2326-msgstr ""
2327-
2328-#. module: inovatim_reports
2329-#: report:account.invoice.inovatim:0
2330-msgid "Disc. (%)"
2331-msgstr ""
2332-
2333-#. module: inovatim_reports
2334-#: report:account.invoice.inovatim:0
2335-msgid "Draft Invoice"
2336-msgstr ""
2337-
2338-#. module: inovatim_reports
2339-#: report:account.invoice.inovatim:0
2340-msgid "Invoice"
2341-msgstr ""
2342-
2343-#. module: inovatim_reports
2344-#: report:account.invoice.inovatim:0
2345-msgid "Invoice Date"
2346-msgstr ""
2347-
2348-#. module: inovatim_reports
2349-#: report:account.invoice.inovatim:0
2350-msgid "Invoice issued by:"
2351-msgstr ""
2352-
2353-#. module: inovatim_reports
2354-#: report:account.invoice.inovatim:0
2355-msgid "Net Total:"
2356-msgstr ""
2357-
2358-#. module: inovatim_reports
2359-#: report:account.invoice.inovatim:0
2360-msgid "PRO-FORMA"
2361-msgstr ""
2362-
2363-#. module: inovatim_reports
2364-#: report:account.invoice.inovatim:0
2365-msgid "Quantity"
2366-msgstr ""
2367-
2368-#. module: inovatim_reports
2369-#: report:account.invoice.inovatim:0
2370-msgid "Reference:"
2371-msgstr ""
2372-
2373-#. module: inovatim_reports
2374-#: report:account.invoice.inovatim:0
2375-msgid "Refund"
2376-msgstr ""
2377-
2378-#. module: inovatim_reports
2379-#: report:account.invoice.inovatim:0
2380-msgid "Supplier Invoice"
2381-msgstr ""
2382-
2383-#. module: inovatim_reports
2384-#: report:account.invoice.inovatim:0
2385-msgid "Supplier Refund"
2386-msgstr ""
2387-
2388-#. module: inovatim_reports
2389-#: report:account.invoice.inovatim:0
2390-#: report:purchase.order.inovatim:0
2391-msgid "Taxes:"
2392-msgstr ""
2393-
2394-#. module: inovatim_reports
2395-#: report:account.invoice.inovatim:0
2396-#: report:purchase.order.inovatim:0
2397-msgid "Total:"
2398-msgstr ""
2399-
2400-#. module: inovatim_reports
2401-#: report:account.invoice.inovatim:0
2402-#: report:purchase.order.inovatim:0
2403-msgid "Unit Price"
2404-msgstr ""
2405-
2406-#. module: inovatim_reports
2407-#: report:account.invoice.inovatim:0
2408-msgid "VAT:"
2409-msgstr ""
2410-
2411-#. module: inovatim_reports
2412-#: report:account.invoice.inovatim:0
2413-msgid "Disc. Total:"
2414-msgstr ""
2415-
2416-#. module: inovatim_reports
2417-#: report:account.invoice.inovatim:0
2418-msgid "Net:"
2419-msgstr ""
2420-
2421-#. module: inovatim_reports
2422-#: report:account.invoice.inovatim:0
2423-msgid "Disc. (€)"
2424-msgstr ""
2425-
2426-
2427-
2428-
2429-
2430-#. module: inovatim_reports
2431-#: report:sale.order.inovatim:0
2432-msgid "Expiration date:"
2433-msgstr ""
2434-
2435-#. module: inovatim_reports
2436-#: report:sale.order.inovatim:0
2437-msgid "Confirmation date:"
2438-msgstr ""
2439-
2440-#. module: inovatim_reports
2441-#: report:sale.order.inovatim:0
2442-msgid "Customer reference:"
2443-msgstr ""
2444-
2445-#. module: inovatim_reports
2446-#: report:sale.order.inovatim:0
2447-msgid "Description"
2448-msgstr ""
2449-
2450-#. module: inovatim_reports
2451-#: report:sale.order.inovatim:0
2452-msgid "Disc. (%)"
2453-msgstr ""
2454-
2455-#. module: inovatim_reports
2456-#: report:sale.order.inovatim:0
2457-msgid "email:"
2458-msgstr ""
2459-
2460-#. module: inovatim_reports
2461-#: report:sale.order.inovatim:0
2462-msgid "Incoterm:"
2463-msgstr ""
2464-
2465-#. module: inovatim_reports
2466-#: report:sale.order.inovatim:0
2467-msgid "Invoice address :"
2468-msgstr ""
2469-
2470-#. module: inovatim_reports
2471-#: report:sale.order.inovatim:0
2472-#: report:purchase.order.inovatim:0
2473-msgid "Net Total:"
2474-msgstr ""
2475-
2476-#. module: inovatim_reports
2477-#: report:sale.order.inovatim:0
2478-msgid "Order N°"
2479-msgstr ""
2480-
2481-#. module: inovatim_reports
2482-#: report:sale.order.inovatim:0
2483-msgid "Order reference:"
2484-msgstr ""
2485-
2486-#. module: inovatim_reports
2487-#: report:sale.order.inovatim:0
2488-#: report:purchase.order.inovatim:0
2489-msgid "Payment terms:"
2490-msgstr ""
2491-
2492-#. module: inovatim_reports
2493-#: report:sale.order.inovatim:0
2494-msgid "Place, date:"
2495-msgstr ""
2496-
2497-#. module: inovatim_reports
2498-#: report:sale.order.inovatim:0
2499-msgid "Price"
2500-msgstr ""
2501-
2502-#. module: inovatim_reports
2503-#: report:sale.order.inovatim:0
2504-msgid "Quantity"
2505-msgstr ""
2506-
2507-#. module: inovatim_reports
2508-#: report:sale.order.inovatim:0
2509-msgid "Quotation N°"
2510-msgstr ""
2511-
2512-#. module: inovatim_reports
2513-#: report:sale.order.inovatim:0
2514-msgid "Salesperson:"
2515-msgstr ""
2516-
2517-#. module: inovatim_reports
2518-#: report:sale.order.inovatim:0
2519-msgid "Shipping address :"
2520-msgstr ""
2521-
2522-#. module: inovatim_reports
2523-#: report:sale.order.inovatim:0
2524-msgid "Taxes :"
2525-msgstr ""
2526-
2527-#. module: inovatim_reports
2528-#: report:sale.order.inovatim:0
2529-msgid "tel.:"
2530-msgstr ""
2531-
2532-#. module: inovatim_reports
2533-#: report:sale.order.inovatim:0
2534-msgid "Total :"
2535-msgstr ""
2536-
2537-#. module: inovatim_reports
2538-#: report:sale.order.inovatim:0
2539-msgid "Unit Price"
2540-msgstr ""
2541-
2542-#. module: inovatim_reports
2543-#: report:sale.order.inovatim:0
2544-msgid "VAT"
2545-msgstr ""
2546-
2547-#. module: inovatim_reports
2548-#: report:sale.order.inovatim:0
2549-#: report:purchase.order.inovatim:0
2550-msgid "VAT:"
2551-msgstr ""
2552-
2553-#. module: inovatim_reports
2554-#: report:sale.order.inovatim:0
2555-msgid "Disc. (€)"
2556-msgstr ""
2557-
2558-#. module: inovatim_reports
2559-#: report:sale.order.inovatim:0
2560-msgid "Taxes (%)"
2561-msgstr ""
2562-
2563-#. module: inovatim_reports
2564-#: report:sale.order.inovatim:0
2565-msgid "Price (€)"
2566-msgstr ""
2567-
2568-#. module: inovatim_reports
2569-#: report:sale.order.inovatim:0
2570-msgid "Disc. Total:"
2571-msgstr ""
2572-
2573-#. module: inovatim_reports
2574-#: report:sale.order.inovatim:0
2575-msgid "Net:"
2576-msgstr ""
2577-
2578-
2579-
2580-
2581-
2582-#. module: inovatim_reports
2583-#: report:stock.picking.list.inovatim:0
2584-#: report:stock.picking.list.inovatim.out:0
2585-#: report:stock.picking.list.inovatim.in:0
2586-msgid "Delivery Order:"
2587-msgstr ""
2588-
2589-#. module: inovatim_reports
2590-#: report:stock.picking.list.inovatim:0
2591-#: report:stock.picking.list.inovatim.out:0
2592-#: report:stock.picking.list.inovatim.in:0
2593-msgid "Incoming Shipment:"
2594-msgstr ""
2595-
2596-#. module: inovatim_reports
2597-#: report:stock.picking.list.inovatim:0
2598-#: report:stock.picking.list.inovatim.out:0
2599-#: report:stock.picking.list.inovatim.in:0
2600-msgid "Internal Shipment:"
2601-msgstr ""
2602-
2603-#. module: inovatim_reports
2604-#: report:stock.picking.list.inovatim:0
2605-#: report:stock.picking.list.inovatim.out:0
2606-#: report:stock.picking.list.inovatim.in:0
2607-msgid "Warehouse Address:"
2608-msgstr ""
2609-
2610-#. module: inovatim_reports
2611-#: report:stock.picking.list.inovatim:0
2612-#: report:stock.picking.list.inovatim.out:0
2613-#: report:stock.picking.list.inovatim.in:0
2614-msgid "Scheduled Date:"
2615-msgstr ""
2616-
2617-#. module: inovatim_reports
2618-#: report:stock.picking.list.inovatim:0
2619-#: report:stock.picking.list.inovatim.out:0
2620-#: report:stock.picking.list.inovatim.in:0
2621-msgid "Order:"
2622-msgstr ""
2623-
2624-#. module: inovatim_reports
2625-#: report:stock.picking.list.inovatim:0
2626-#: report:stock.picking.list.inovatim.out:0
2627-#: report:stock.picking.list.inovatim.in:0
2628-msgid "Customer reference:"
2629-msgstr ""
2630-
2631-#. module: inovatim_reports
2632-#: report:stock.picking.list.inovatim:0
2633-#: report:stock.picking.list.inovatim.out:0
2634-#: report:stock.picking.list.inovatim.in:0
2635-msgid "Delivery method:"
2636-msgstr ""
2637-
2638-#. module: inovatim_reports
2639-#: report:stock.picking.list.inovatim:0
2640-#: report:stock.picking.list.inovatim.out:0
2641-#: report:stock.picking.list.inovatim.in:0
2642-msgid "Total net weight:"
2643-msgstr ""
2644-
2645-#. module: inovatim_reports
2646-#: report:stock.picking.list.inovatim:0
2647-#: report:stock.picking.list.inovatim.out:0
2648-#: report:stock.picking.list.inovatim.in:0
2649-#: report:purchase.order.inovatim:0
2650-msgid "Code"
2651-msgstr ""
2652-
2653-#. module: inovatim_reports
2654-#: report:stock.picking.list.inovatim:0
2655-#: report:stock.picking.list.inovatim.out:0
2656-#: report:stock.picking.list.inovatim.in:0
2657-#: report:purchase.order.inovatim:0
2658-msgid "Description"
2659-msgstr ""
2660-
2661-#. module: inovatim_reports
2662-#: report:stock.picking.list.inovatim:0
2663-#: report:stock.picking.list.inovatim.out:0
2664-#: report:stock.picking.list.inovatim.in:0
2665-#: report:purchase.order.inovatim:0
2666-msgid "Quantity"
2667-msgstr ""
2668-
2669-#. module: inovatim_reports
2670-#: report:stock.picking.list.inovatim:0
2671-#: report:stock.picking.list.inovatim.out:0
2672-#: report:stock.picking.list.inovatim.in:0
2673-#: report:purchase.order.inovatim:0
2674-msgid "UM"
2675-msgstr ""
2676-
2677-#. module: inovatim_reports
2678-#: report:stock.picking.list.inovatim:0
2679-#: report:stock.picking.list.inovatim.out:0
2680-#: report:stock.picking.list.inovatim.in:0
2681-msgid "Package"
2682-msgstr ""
2683-
2684-#. module: inovatim_reports
2685-#: report:stock.picking.list.inovatim:0
2686-#: report:stock.picking.list.inovatim.out:0
2687-#: report:stock.picking.list.inovatim.in:0
2688-msgid "Price (€) / unit"
2689-msgstr ""
2690-
2691-#. module: inovatim_reports
2692-#: report:stock.picking.list.inovatim:0
2693-#: report:stock.picking.list.inovatim.out:0
2694-#: report:stock.picking.list.inovatim.in:0
2695-msgid "Issued by:"
2696-msgstr ""
2697-
2698-#. module: inovatim_reports
2699-#: report:stock.picking.list.inovatim:0
2700-#: report:stock.picking.list.inovatim.out:0
2701-#: report:stock.picking.list.inovatim.in:0
2702-msgid "Received by:"
2703-msgstr ""
2704-
2705-#. module: inovatim_reports
2706-#: report:stock.picking.list.inovatim:0
2707-#: report:stock.picking.list.inovatim.out:0
2708-#: report:stock.picking.list.inovatim.in:0
2709-msgid "Place, date:"
2710-msgstr ""
2711-
2712-
2713-
2714-
2715-
2716-#. module: inovatim_reports
2717-#: report:purchase.order.inovatim:0
2718-msgid "Purchase Order Confirmation:"
2719-msgstr ""
2720-
2721-#. module: inovatim_reports
2722-#: report:purchase.order.inovatim:0
2723-msgid "Request for Quotation:"
2724-msgstr ""
2725-
2726-#. module: inovatim_reports
2727-#: report:purchase.order.inovatim:0
2728-msgid "Order Date:"
2729-msgstr ""
2730-
2731-#. module: inovatim_reports
2732-#: report:purchase.order.inovatim:0
2733-msgid "Validated By:"
2734-msgstr ""
2735-
2736-#. module: inovatim_reports
2737-#: report:purchase.order.inovatim:0
2738-msgid "Customer reference"
2739-msgstr ""
2740-
2741-#. module: inovatim_reports
2742-#: report:purchase.order.inovatim:0
2743-msgid "Net Price (€)"
2744-msgstr ""
2745-
2746-#. module: inovatim_reports
2747-#: field:res.partner,delivery_prices:0
2748-msgid "Prices on delivery report"
2749-msgstr ""
2750
2751=== removed file 'inovatim_reports/i18n/sl.po'
2752--- inovatim_reports/i18n/sl.po 2014-02-28 10:06:39 +0000
2753+++ inovatim_reports/i18n/sl.po 1970-01-01 00:00:00 +0000
2754@@ -1,528 +0,0 @@
2755-# Translation of OpenERP Server.
2756-# This file contains the translation of the following modules:
2757-# * inovatim_reports
2758-#
2759-msgid ""
2760-msgstr ""
2761-"Project-Id-Version: OpenERP Server 7.0\n"
2762-"Report-Msgid-Bugs-To: \n"
2763-"POT-Creation-Date: 2014-01-19 16:01+0000\n"
2764-"PO-Revision-Date: 2014-01-19 16:01+0000\n"
2765-"Last-Translator: <>\n"
2766-"Language-Team: \n"
2767-"MIME-Version: 1.0\n"
2768-"Content-Type: text/plain; charset=UTF-8\n"
2769-"Content-Transfer-Encoding: \n"
2770-"Plural-Forms: \n"
2771-
2772-#. module: inovatim_reports
2773-#: model:ir.model,name:inovatim_reports.model_account_payment_term
2774-msgid "Payment Term"
2775-msgstr "Plačilni pogoj"
2776-
2777-#. module: account
2778-#: report:account.invoice.inovatim:0
2779-#: report:sale.order.inovatim:0
2780-msgid "Payment Term:"
2781-msgstr "Plačilni pogoj:"
2782-
2783-#. module: inovatim_reports
2784-#: report:account.invoice.inovatim:0
2785-msgid "Delivery Date:"
2786-msgstr "Datum dobave:"
2787-
2788-#. module: inovatim_reports
2789-#: report:account.invoice.inovatim:0
2790-msgid "Due Date:"
2791-msgstr "Datum valute:"
2792-
2793-#. module: inovatim_reports
2794-#: report:account.invoice.inovatim:0
2795-msgid "VAT:"
2796-msgstr "ID DDV:"
2797-
2798-#. module: inovatim_reports
2799-#: report:account.invoice.inovatim:0
2800-msgid "Invoice issued by:"
2801-msgstr "Račun izdal:"
2802-
2803-#. module: inovatim_reports
2804-#: report:account.invoice.inovatim:0
2805-#: report:sale.order.inovatim:0
2806-msgid "Code"
2807-msgstr "Koda"
2808-
2809-#. module: inovatim_reports
2810-#: report:account.invoice.inovatim:0
2811-#: report:stock.picking.list.inovatim:0
2812-#: report:stock.picking.list.inovatim.out:0
2813-#: report:stock.picking.list.inovatim.in:0
2814-msgid "Partner phone:"
2815-msgstr "Tel.št. kupca:"
2816-
2817-#. module: inovatim_reports
2818-#: report:account.invoice.inovatim:0
2819-#: report:sale.order.inovatim:0
2820-msgid "UM"
2821-msgstr "EM"
2822-
2823-#. module: inovatim_reports
2824-#: report:account.invoice.inovatim:0
2825-#: report:sale.order.inovatim:0
2826-msgid "Package"
2827-msgstr "Paketi"
2828-
2829-#. module: inovatim_reports
2830-#: report:account.invoice.inovatim:0
2831-#: report:sale.order.inovatim:0
2832-msgid "Disc."
2833-msgstr "Rabat"
2834-
2835-#. module: inovatim_reports
2836-#: report:account.invoice.inovatim:0
2837-msgid "Price (EUR)"
2838-msgstr "Vrednost (EUR)"
2839-
2840-#. module: inovatim_reports
2841-#: report:account.invoice.inovatim:0
2842-msgid "Delivery method:"
2843-msgstr "Način dostave:"
2844-
2845-#. module: inovatim_reports
2846-#: report:account.invoice.inovatim:0
2847-#: report:sale.order.inovatim:0
2848-msgid "Total net weight:"
2849-msgstr "Skupaj neto teža:"
2850-
2851-#. module: inovatim_reports
2852-#: report:account.invoice.inovatim:0
2853-msgid "Cancelled Invoice"
2854-msgstr "Preklicani račun"
2855-
2856-#. module: inovatim_reports
2857-#: report:account.invoice.inovatim:0
2858-msgid "Description"
2859-msgstr "Naziv"
2860-
2861-#. module: inovatim_reports
2862-#: report:account.invoice.inovatim:0
2863-msgid "Disc. (%)"
2864-msgstr "Pop. (%)"
2865-
2866-#. module: inovatim_reports
2867-#: report:account.invoice.inovatim:0
2868-msgid "Draft Invoice"
2869-msgstr "Osnutek računa"
2870-
2871-#. module: inovatim_reports
2872-#: report:account.invoice.inovatim:0
2873-msgid "Invoice"
2874-msgstr "Račun"
2875-
2876-#. module: inovatim_reports
2877-#: report:account.invoice.inovatim:0
2878-msgid "Invoice Date"
2879-msgstr "Datum DUR"
2880-
2881-#. module: inovatim_reports
2882-#: report:account.invoice.inovatim:0
2883-msgid "Invoice issued by:"
2884-msgstr "Račun izdal:"
2885-
2886-#. module: inovatim_reports
2887-#: report:account.invoice.inovatim:0
2888-msgid "Net Total:"
2889-msgstr "Skupaj neto:"
2890-
2891-#. module: inovatim_reports
2892-#: report:account.invoice.inovatim:0
2893-msgid "PRO-FORMA"
2894-msgstr "Predračun"
2895-
2896-#. module: inovatim_reports
2897-#: report:account.invoice.inovatim:0
2898-msgid "Quantity"
2899-msgstr "Količina"
2900-
2901-#. module: inovatim_reports
2902-#: report:account.invoice.inovatim:0
2903-msgid "Reference:"
2904-msgstr "Referenca:"
2905-
2906-#. module: inovatim_reports
2907-#: report:account.invoice.inovatim:0
2908-msgid "Refund"
2909-msgstr "Dobropis"
2910-
2911-#. module: inovatim_reports
2912-#: report:account.invoice.inovatim:0
2913-msgid "Supplier Invoice"
2914-msgstr "Račun dobavitelja"
2915-
2916-#. module: inovatim_reports
2917-#: report:account.invoice.inovatim:0
2918-msgid "Supplier Refund"
2919-msgstr "Dobropis"
2920-
2921-#. module: inovatim_reports
2922-#: report:account.invoice.inovatim:0
2923-#: report:purchase.order.inovatim:0
2924-msgid "Taxes:"
2925-msgstr "Davki:"
2926-
2927-#. module: inovatim_reports
2928-#: report:account.invoice.inovatim:0
2929-#: report:purchase.order.inovatim:0
2930-msgid "Total:"
2931-msgstr "Skupaj:"
2932-
2933-#. module: inovatim_reports
2934-#: report:account.invoice.inovatim:0
2935-#: report:purchase.order.inovatim:0
2936-msgid "Unit Price"
2937-msgstr "Cena enote"
2938-
2939-#. module: inovatim_reports
2940-#: report:account.invoice.inovatim:0
2941-msgid "VAT:"
2942-msgstr "ID DDV:"
2943-
2944-#. module: inovatim_reports
2945-#: report:account.invoice.inovatim:0
2946-msgid "Disc. Total:"
2947-msgstr "Skupaj popust:"
2948-
2949-#. module: inovatim_reports
2950-#: report:account.invoice.inovatim:0
2951-msgid "Net:"
2952-msgstr "Skupaj brez DDV:"
2953-
2954-#. module: inovatim_reports
2955-#: report:account.invoice.inovatim:0
2956-msgid "Disc. (€)"
2957-msgstr "Pop. (€)"
2958-
2959-
2960-
2961-
2962-
2963-#. module: inovatim_reports
2964-#: report:sale.order.inovatim:0
2965-msgid "Expiration date:"
2966-msgstr "Datum veljavnosti:"
2967-
2968-#. module: inovatim_reports
2969-#: report:sale.order.inovatim:0
2970-msgid "Confirmation date:"
2971-msgstr "Datum potrditve:"
2972-
2973-#. module: inovatim_reports
2974-#: report:sale.order.inovatim:0
2975-msgid "Customer reference:"
2976-msgstr "Referenca kupca:"
2977-
2978-#. module: inovatim_reports
2979-#: report:sale.order.inovatim:0
2980-msgid "Description"
2981-msgstr "Opis"
2982-
2983-#. module: inovatim_reports
2984-#: report:sale.order.inovatim:0
2985-msgid "Disc. (%)"
2986-msgstr "Pop. (%)"
2987-
2988-#. module: inovatim_reports
2989-#: report:sale.order.inovatim:0
2990-msgid "email:"
2991-msgstr "email:"
2992-
2993-#. module: inovatim_reports
2994-#: report:sale.order.inovatim:0
2995-msgid "Incoterm:"
2996-msgstr "Način dostave:"
2997-
2998-#. module: inovatim_reports
2999-#: report:sale.order.inovatim:0
3000-msgid "Invoice address :"
3001-msgstr "Naslov za račun:"
3002-
3003-#. module: inovatim_reports
3004-#: report:sale.order.inovatim:0
3005-#: report:purchase.order.inovatim:0
3006-msgid "Net Total:"
3007-msgstr "Skupaj neto:"
3008-
3009-#. module: inovatim_reports
3010-#: report:sale.order.inovatim:0
3011-msgid "Order N°"
3012-msgstr "Naročilo št."
3013-
3014-#. module: inovatim_reports
3015-#: report:sale.order.inovatim:0
3016-msgid "Order reference:"
3017-msgstr "Referenca:"
3018-
3019-#. module: inovatim_reports
3020-#: report:sale.order.inovatim:0
3021-#: report:purchase.order.inovatim:0
3022-msgid "Payment terms:"
3023-msgstr "Plačilni pogoji:"
3024-
3025-#. module: inovatim_reports
3026-#: report:sale.order.inovatim:0
3027-msgid "Place, date:"
3028-msgstr "Kraj, datum:"
3029-
3030-#. module: inovatim_reports
3031-#: report:sale.order.inovatim:0
3032-msgid "Price"
3033-msgstr "Cena"
3034-
3035-#. module: inovatim_reports
3036-#: report:sale.order.inovatim:0
3037-msgid "Quantity"
3038-msgstr "Količina"
3039-
3040-#. module: inovatim_reports
3041-#: report:sale.order.inovatim:0
3042-msgid "Quotation N°"
3043-msgstr "Ponudba št."
3044-
3045-#. module: inovatim_reports
3046-#: report:sale.order.inovatim:0
3047-msgid "Salesperson:"
3048-msgstr "Prodajalec:"
3049-
3050-#. module: inovatim_reports
3051-#: report:sale.order.inovatim:0
3052-msgid "Shipping address :"
3053-msgstr "Naslov za odpremo"
3054-
3055-#. module: inovatim_reports
3056-#: report:sale.order.inovatim:0
3057-msgid "Taxes :"
3058-msgstr "Davki:"
3059-
3060-#. module: inovatim_reports
3061-#: report:sale.order.inovatim:0
3062-msgid "tel.:"
3063-msgstr "tel.:"
3064-
3065-#. module: inovatim_reports
3066-#: report:sale.order.inovatim:0
3067-msgid "Total :"
3068-msgstr "Skupaj:"
3069-
3070-#. module: inovatim_reports
3071-#: report:sale.order.inovatim:0
3072-msgid "Unit Price"
3073-msgstr "Cena enote"
3074-
3075-#. module: inovatim_reports
3076-#: report:sale.order.inovatim:0
3077-msgid "VAT"
3078-msgstr "ID DDV"
3079-
3080-#. module: inovatim_reports
3081-#: report:sale.order.inovatim:0
3082-#: report:purchase.order.inovatim:0
3083-msgid "VAT:"
3084-msgstr "ID DDV:"
3085-
3086-#. module: inovatim_reports
3087-#: report:sale.order.inovatim:0
3088-msgid "Disc. (€)"
3089-msgstr "Pop. (€)"
3090-
3091-#. module: inovatim_reports
3092-#: report:sale.order.inovatim:0
3093-msgid "Taxes (%)"
3094-msgstr "Davki (%)"
3095-
3096-#. module: inovatim_reports
3097-#: report:sale.order.inovatim:0
3098-msgid "Price (€)"
3099-msgstr "Vrednost (€)"
3100-
3101-#. module: inovatim_reports
3102-#: report:sale.order.inovatim:0
3103-msgid "Disc. Total:"
3104-msgstr "Skupaj popust:"
3105-
3106-#. module: inovatim_reports
3107-#: report:sale.order.inovatim:0
3108-msgid "Net:"
3109-msgstr "Skupaj brez DDV:"
3110-
3111-
3112-
3113-
3114-
3115-#. module: inovatim_reports
3116-#: report:stock.picking.list.inovatim:0
3117-#: report:stock.picking.list.inovatim.out:0
3118-#: report:stock.picking.list.inovatim.in:0
3119-msgid "Delivery Order:"
3120-msgstr "Dobavnica:"
3121-
3122-#. module: inovatim_reports
3123-#: report:stock.picking.list.inovatim:0
3124-#: report:stock.picking.list.inovatim.out:0
3125-#: report:stock.picking.list.inovatim.in:0
3126-msgid "Incoming Shipment:"
3127-msgstr "Prihajajoče pošiljke:"
3128-
3129-#. module: inovatim_reports
3130-#: report:stock.picking.list.inovatim:0
3131-#: report:stock.picking.list.inovatim.out:0
3132-#: report:stock.picking.list.inovatim.in:0
3133-msgid "Internal Shipment:"
3134-msgstr "Interna pošiljka:"
3135-
3136-#. module: inovatim_reports
3137-#: report:stock.picking.list.inovatim:0
3138-#: report:stock.picking.list.inovatim.out:0
3139-#: report:stock.picking.list.inovatim.in:0
3140-msgid "Warehouse Address:"
3141-msgstr "Naslov skladišča:"
3142-
3143-#. module: inovatim_reports
3144-#: report:stock.picking.list.inovatim:0
3145-#: report:stock.picking.list.inovatim.out:0
3146-#: report:stock.picking.list.inovatim.in:0
3147-msgid "Scheduled Date:"
3148-msgstr "Načrtovani datum:"
3149-
3150-#. module: inovatim_reports
3151-#: report:stock.picking.list.inovatim:0
3152-#: report:stock.picking.list.inovatim.out:0
3153-#: report:stock.picking.list.inovatim.in:0
3154-msgid "Order:"
3155-msgstr "Naročilo:"
3156-
3157-#. module: inovatim_reports
3158-#: report:stock.picking.list.inovatim:0
3159-#: report:stock.picking.list.inovatim.out:0
3160-#: report:stock.picking.list.inovatim.in:0
3161-msgid "Customer reference:"
3162-msgstr "Referenca kupca:"
3163-
3164-#. module: inovatim_reports
3165-#: report:stock.picking.list.inovatim:0
3166-#: report:stock.picking.list.inovatim.out:0
3167-#: report:stock.picking.list.inovatim.in:0
3168-msgid "Delivery method:"
3169-msgstr "Način dostave:"
3170-
3171-#. module: inovatim_reports
3172-#: report:stock.picking.list.inovatim:0
3173-#: report:stock.picking.list.inovatim.out:0
3174-#: report:stock.picking.list.inovatim.in:0
3175-msgid "Total net weight:"
3176-msgstr "Skupaj neto teža:"
3177-
3178-#. module: inovatim_reports
3179-#: report:stock.picking.list.inovatim:0
3180-#: report:stock.picking.list.inovatim.out:0
3181-#: report:stock.picking.list.inovatim.in:0
3182-#: report:purchase.order.inovatim:0
3183-msgid "Code"
3184-msgstr "Koda"
3185-
3186-#. module: inovatim_reports
3187-#: report:stock.picking.list.inovatim:0
3188-#: report:stock.picking.list.inovatim.out:0
3189-#: report:stock.picking.list.inovatim.in:0
3190-#: report:purchase.order.inovatim:0
3191-msgid "Description"
3192-msgstr "Opis"
3193-
3194-#. module: inovatim_reports
3195-#: report:stock.picking.list.inovatim:0
3196-#: report:stock.picking.list.inovatim.out:0
3197-#: report:stock.picking.list.inovatim.in:0
3198-#: report:purchase.order.inovatim:0
3199-msgid "Quantity"
3200-msgstr "Količina"
3201-
3202-#. module: inovatim_reports
3203-#: report:stock.picking.list.inovatim:0
3204-#: report:stock.picking.list.inovatim.out:0
3205-#: report:stock.picking.list.inovatim.in:0
3206-#: report:purchase.order.inovatim:0
3207-msgid "UM"
3208-msgstr "EM"
3209-
3210-#. module: inovatim_reports
3211-#: report:stock.picking.list.inovatim:0
3212-#: report:stock.picking.list.inovatim.out:0
3213-#: report:stock.picking.list.inovatim.in:0
3214-msgid "Package"
3215-msgstr "Paketi"
3216-
3217-#. module: inovatim_reports
3218-#: report:stock.picking.list.inovatim:0
3219-#: report:stock.picking.list.inovatim.out:0
3220-#: report:stock.picking.list.inovatim.in:0
3221-msgid "Price (€) / unit"
3222-msgstr "Cena (€) / enoto"
3223-
3224-#. module: inovatim_reports
3225-#: report:stock.picking.list.inovatim:0
3226-#: report:stock.picking.list.inovatim.out:0
3227-#: report:stock.picking.list.inovatim.in:0
3228-msgid "Issued by:"
3229-msgstr "Izdal:"
3230-
3231-#. module: inovatim_reports
3232-#: report:stock.picking.list.inovatim:0
3233-#: report:stock.picking.list.inovatim.out:0
3234-#: report:stock.picking.list.inovatim.in:0
3235-msgid "Received by:"
3236-msgstr "Prevzel:"
3237-
3238-#. module: inovatim_reports
3239-#: report:stock.picking.list.inovatim:0
3240-#: report:stock.picking.list.inovatim.out:0
3241-#: report:stock.picking.list.inovatim.in:0
3242-msgid "Place, date:"
3243-msgstr "Kraj, datum:"
3244-
3245-
3246-
3247-
3248-
3249-#. module: inovatim_reports
3250-#: report:purchase.order.inovatim:0
3251-msgid "Purchase Order Confirmation:"
3252-msgstr "Nabavni nalog:"
3253-
3254-#. module: inovatim_reports
3255-#: report:purchase.order.inovatim:0
3256-msgid "Request for Quotation:"
3257-msgstr "Ponudba:"
3258-
3259-#. module: inovatim_reports
3260-#: report:purchase.order.inovatim:0
3261-msgid "Order Date:"
3262-msgstr "Datum naročila:"
3263-
3264-#. module: inovatim_reports
3265-#: report:purchase.order.inovatim:0
3266-msgid "Validated By:"
3267-msgstr "Naročnik:"
3268-
3269-#. module: inovatim_reports
3270-#: report:purchase.order.inovatim:0
3271-msgid "Customer reference"
3272-msgstr "Kupčeva ref."
3273-
3274-#. module: inovatim_reports
3275-#: report:purchase.order.inovatim:0
3276-msgid "Net Price (€)"
3277-msgstr "Neto cena (€)"
3278-
3279-#. module: inovatim_reports
3280-#: field:res.partner,delivery_prices:0
3281-msgid "Prices on delivery report"
3282-msgstr "Prikaz cen na dobavnici"
3283
3284=== removed file 'inovatim_reports/inovatim_reports.py'
3285--- inovatim_reports/inovatim_reports.py 2014-01-22 11:35:04 +0000
3286+++ inovatim_reports/inovatim_reports.py 1970-01-01 00:00:00 +0000
3287@@ -1,76 +0,0 @@
3288-# -*- coding: utf-8 -*-
3289-##############################################################################
3290-#
3291-# OpenERP, Open Source Management Solution
3292-# Copyright (C) 2014 Mentis d.o.o.
3293-#
3294-# This program is free software: you can redistribute it and/or modify
3295-# it under the terms of the GNU Affero General Public License as
3296-# published by the Free Software Foundation, either version 3 of the
3297-# License, or (at your option) any later version.
3298-#
3299-# This program is distributed in the hope that it will be useful,
3300-# but WITHOUT ANY WARRANTY; without even the implied warranty of
3301-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3302-# GNU Affero General Public License for more details.
3303-#
3304-# You should have received a copy of the GNU Affero General Public License
3305-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3306-#
3307-##############################################################################
3308-
3309-from osv import fields, osv
3310-from tools.translate import _
3311-
3312-class sale_order(osv.osv):
3313- _inherit = "sale.order"
3314-
3315- def print_quotation(self, cr, uid, ids, context=None):
3316- res = super(sale_order,self).print_quotation(cr, uid, ids, context)
3317- if res['report_name'] == 'sale.order':
3318- res['report_name'] = 'sale.order.inovatim'
3319- return res
3320-
3321-sale_order()
3322-
3323-class account_invoice(osv.osv):
3324- _inherit = "account.invoice"
3325-
3326- def invoice_print(self, cr, uid, ids, context=None):
3327- res = super(account_invoice,self).invoice_print(cr, uid, ids, context)
3328- if res['report_name'] == 'account.invoice':
3329- res['report_name'] = 'account.invoice.inovatim'
3330- return res
3331-
3332-account_invoice()
3333-
3334-class purchase_order(osv.osv):
3335- _inherit = "purchase.order"
3336-
3337- def print_quotation(self, cr, uid, ids, context=None):
3338- res = super(purchase_order,self).print_quotation(cr, uid, ids, context)
3339- if res['report_name'] == 'purchase.quotation':
3340- res['report_name'] = 'purchase.order.inovatim'
3341- return res
3342-
3343-purchase_order()
3344-
3345-class stock_picking(osv.osv):
3346- _inherit = 'stock.picking'
3347- _columns = {
3348- 'deliver_id': fields.many2one('res.users', 'User'),
3349- }
3350-
3351-stock_picking()
3352-
3353-class stock_picking_out(osv.osv):
3354- _inherit = 'stock.picking.out'
3355- _columns = {
3356- 'deliver_id': fields.many2one('res.users', 'User'),
3357- }
3358-
3359- def action_process(self, cr, uid, ids, context=None):
3360- self.pool.get('stock.picking').write(cr, uid, ids, {'deliver_id':uid})
3361- return super(stock_picking_out, self).action_process(cr, uid, ids, context=context)
3362-
3363-stock_picking_out()
3364
3365=== removed file 'inovatim_reports/inovatim_reports.xml'
3366--- inovatim_reports/inovatim_reports.xml 2014-01-20 08:10:25 +0000
3367+++ inovatim_reports/inovatim_reports.xml 1970-01-01 00:00:00 +0000
3368@@ -1,60 +0,0 @@
3369-<?xml version="1.0" encoding="utf-8"?>
3370-<openerp>
3371- <data>
3372- <report
3373- auto="False"
3374- id="sale.report_sale_order"
3375- model="sale.order"
3376- name="sale.order.inovatim"
3377- rml="inovatim_reports/report/sale_order.rml"
3378- string="Quotation / Order"
3379- />
3380- <report
3381- auto="False"
3382- id="account.account_invoices"
3383- model="account.invoice"
3384- name="account.invoice.inovatim"
3385- rml="inovatim_reports/report/account_print_invoice.rml"
3386- string="Invoices"
3387- attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
3388- attachment_use="True"
3389- usage="default"
3390- />
3391- <report
3392- auto="False"
3393- id="purchase.report_purchase_order"
3394- model="purchase.order"
3395- name="purchase.order.inovatim"
3396- rml="inovatim_reports/report/purchase_order.rml"
3397- usage="default"
3398- string="Purchase Order"
3399- />
3400-
3401- <report
3402- auto="False"
3403- id="stock.report_picking_list"
3404- model="stock.picking"
3405- name="stock.picking.list.inovatim"
3406- string="Picking Slip"
3407- rml="inovatim_reports/report/stock_picking.rml"
3408- />
3409- <report
3410- auto="False"
3411- id="stock.report_picking_list_in"
3412- model="stock.picking.in"
3413- name="stock.picking.list.inovatim.in"
3414- string="Receipt Slip"
3415- rml="inovatim_reports/report/stock_picking.rml"
3416- />
3417-
3418- <report
3419- auto="False"
3420- id="stock.report_picking_list_out"
3421- model="stock.picking.out"
3422- name="stock.picking.list.inovatim.out"
3423- string="Delivery Slip"
3424- rml="inovatim_reports/report/stock_picking.rml"
3425- />
3426-
3427- </data>
3428-</openerp>
3429
3430=== removed directory 'inovatim_reports/report'
3431=== removed file 'inovatim_reports/report/__init__.py'
3432--- inovatim_reports/report/__init__.py 2014-01-22 11:35:04 +0000
3433+++ inovatim_reports/report/__init__.py 1970-01-01 00:00:00 +0000
3434@@ -1,25 +0,0 @@
3435-# -*- coding: utf-8 -*-
3436-##############################################################################
3437-#
3438-# OpenERP, Open Source Management Solution
3439-# Copyright (C) 2014 Mentis do.o.o. (<http://www.mentis.si>).
3440-#
3441-# This program is free software: you can redistribute it and/or modify
3442-# it under the terms of the GNU Affero General Public License as
3443-# published by the Free Software Foundation, either version 3 of the
3444-# License, or (at your option) any later version.
3445-#
3446-# This program is distributed in the hope that it will be useful,
3447-# but WITHOUT ANY WARRANTY; without even the implied warranty of
3448-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3449-# GNU Affero General Public License for more details.
3450-#
3451-# You should have received a copy of the GNU Affero General Public License
3452-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3453-#
3454-##############################################################################
3455-
3456-import account_print_invoice
3457-import sale_order
3458-import stock_picking
3459-import purchase_order
3460
3461=== removed file 'inovatim_reports/report/account_print_invoice.py'
3462--- inovatim_reports/report/account_print_invoice.py 2014-01-22 16:24:16 +0000
3463+++ inovatim_reports/report/account_print_invoice.py 1970-01-01 00:00:00 +0000
3464@@ -1,102 +0,0 @@
3465-# -*- coding: utf-8 -*-
3466-##############################################################################
3467-#
3468-# OpenERP, Open Source Management Solution
3469-# Copyright (C) 2013 Mentis d.o.o.
3470-#
3471-# This program is free software: you can redistribute it and/or modify
3472-# it under the terms of the GNU Affero General Public License as
3473-# published by the Free Software Foundation, either version 3 of the
3474-# License, or (at your option) any later version.
3475-#
3476-# This program is distributed in the hope that it will be useful,
3477-# but WITHOUT ANY WARRANTY; without even the implied warranty of
3478-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3479-# GNU Affero General Public License for more details.
3480-#
3481-# You should have received a copy of the GNU Affero General Public License
3482-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3483-#
3484-##############################################################################
3485-
3486-import time
3487-from openerp.report import report_sxw
3488-
3489-class account_invoice(report_sxw.rml_parse):
3490- def __init__(self, cr, uid, name, context):
3491- super(account_invoice, self).__init__(cr, uid, name, context=context)
3492- self.localcontext.update({
3493- 'time': time,
3494- 'get_total_discount': self._get_total_discount,
3495- 'get_total_net': self._get_total_net,
3496- 'get_uom_qty': self._get_uom_qty,
3497- 'get_units': self._get_units,
3498- 'get_uos_qty': self._get_uos_qty,
3499- 'get_total_weight': self._get_total_weight,
3500- })
3501-
3502- def _get_total_discount(self, invoice):
3503- disc_total = 0
3504- for line in invoice.invoice_line:
3505- disc_total += line.quantity * line.price_unit * line.discount / 100
3506- return disc_total
3507-
3508- def _get_total_net(self, invoice):
3509- value_total = 0
3510- for line in invoice.invoice_line:
3511- value_total += line.quantity * line.price_unit
3512- return value_total
3513-
3514- def _get_uom_qty(self, invoice_line):
3515- line_obj = self.pool.get('sale.order.line')
3516- line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
3517-
3518- sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
3519- if sale_line.product_uom.id != invoice_line.uos_id.id:
3520- res = sale_line.product_uom_qty
3521- else:
3522- res = invoice_line.quantity
3523-
3524- if res == 0:
3525- return ''
3526- else:
3527- return res
3528-
3529- def _get_units(self, invoice_line):
3530- line_obj = self.pool.get('sale.order.line')
3531- line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
3532-
3533- sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
3534- if sale_line.product_uom.id != invoice_line.uos_id.id:
3535- #res = sale_line.product_uom.name
3536- return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, sale_line.product_uom.name)
3537- else:
3538- #res = invoice_line.uos_id.name
3539- return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, invoice_line.uos_id.name)
3540-
3541- def _get_uos_qty(self, invoice_line):
3542- line_obj = self.pool.get('sale.order.line')
3543- line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
3544-
3545- sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
3546- if invoice_line.uos_id.id != sale_line.product_uom.id:
3547- res = invoice_line.quantity
3548- if res == 0:
3549- return ''
3550- else:
3551- return res
3552- else:
3553- return ''
3554-
3555- def _get_total_weight(self, invoice):
3556- invoice_line_ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])
3557-
3558- line_obj = self.pool.get('sale.order.line')
3559- line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', 'in' , invoice_line_ids)])
3560- sum = 0
3561- for sale_line in line_obj.browse(self.cr, self. uid, line_ids):
3562- sum = sum + sale_line.product_uom_qty * sale_line.product_id.weight
3563-
3564- return sum
3565-
3566-report_sxw.report_sxw('report.account.invoice.inovatim', 'account.invoice', 'inovatim_reports/report/account_print_invoice.rml', parser=account_invoice)
3567
3568=== removed file 'inovatim_reports/report/account_print_invoice.rml'
3569--- inovatim_reports/report/account_print_invoice.rml 2014-02-25 12:29:43 +0000
3570+++ inovatim_reports/report/account_print_invoice.rml 1970-01-01 00:00:00 +0000
3571@@ -1,464 +0,0 @@
3572-<?xml version="1.0"?>
3573-<document filename="test.pdf">
3574- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
3575- <pageTemplate id="first">
3576- <frame id="first" x1="34.0" y1="57.0" width="530" height="757"/>
3577- </pageTemplate>
3578- </template>
3579- <stylesheet>
3580- <blockTableStyle id="Standard_Outline">
3581- <blockAlignment value="LEFT"/>
3582- <blockValign value="TOP"/>
3583- </blockTableStyle>
3584- <blockTableStyle id="Table_Partner_Address">
3585- <blockAlignment value="LEFT"/>
3586- <blockValign value="TOP"/>
3587- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3588- </blockTableStyle>
3589- <blockTableStyle id="Table1">
3590- <blockAlignment value="LEFT"/>
3591- <blockValign value="TOP"/>
3592- </blockTableStyle>
3593- <blockTableStyle id="Table_invoice_data">
3594- <blockAlignment value="LEFT"/>
3595- <blockValign value="TOP"/>
3596- </blockTableStyle>
3597- <blockTableStyle id="Table_Customer_data">
3598- <blockAlignment value="LEFT"/>
3599- <blockValign value="TOP"/>
3600- </blockTableStyle>
3601- <blockTableStyle id="Table7">
3602- <blockAlignment value="LEFT"/>
3603- <blockValign value="TOP"/>
3604- <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
3605- <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
3606- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3607- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3608- <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
3609- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3610- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3611- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
3612- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
3613- <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
3614- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
3615- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
3616- <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
3617- <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
3618- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
3619- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
3620- <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
3621- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
3622- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
3623- <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
3624- <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
3625- <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
3626- <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-1"/>
3627- <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
3628- <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
3629- <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
3630- <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
3631- <lineStyle kind="LINEBEFORE" colorName="#000000" start="9,0" stop="9,-1"/>
3632- <lineStyle kind="LINEAFTER" colorName="#000000" start="9,0" stop="9,-1"/>
3633- <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
3634- <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
3635- <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
3636- <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
3637- <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
3638- <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
3639- <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
3640- <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/>
3641- <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/>
3642- <blockBackground colorName="#e6e6e6" start="7,0" stop="7,-1"/>
3643- <blockBackground colorName="#e6e6e6" start="8,0" stop="8,-1"/>
3644- <blockBackground colorName="#e6e6e6" start="9,0" stop="9,-1"/>
3645- </blockTableStyle>
3646- <blockTableStyle id="Table8">
3647- <blockAlignment value="LEFT"/>
3648- <blockValign value="TOP"/>
3649- </blockTableStyle>
3650- <blockTableStyle id="Table10">
3651- <blockAlignment value="LEFT"/>
3652- <blockValign value="TOP"/>
3653- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3654- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3655- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,3" stop="0,3"/>
3656- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3657- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,3" stop="1,3"/>
3658- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3659- </blockTableStyle>
3660- <blockTableStyle id="Table_te&#x17E;a">
3661- <blockAlignment value="LEFT"/>
3662- <blockValign value="TOP"/>
3663- </blockTableStyle>
3664- <blockTableStyle id="Table_notes">
3665- <blockAlignment value="LEFT"/>
3666- <blockValign value="TOP"/>
3667- </blockTableStyle>
3668- <blockTableStyle id="Table_noga">
3669- <blockAlignment value="LEFT"/>
3670- <blockValign value="TOP"/>
3671- </blockTableStyle>
3672- <blockTableStyle id="Fakturiral">
3673- <blockAlignment value="LEFT"/>
3674- <blockValign value="TOP"/>
3675- </blockTableStyle>
3676- <initialize>
3677- <paraStyle name="all" alignment="justify"/>
3678- </initialize>
3679- <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
3680- <paraStyle name="P2" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
3681- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
3682- <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
3683- <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
3684- <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3685- <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3686- <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3687- <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3688- <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3689- <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3690- <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3691- <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3692- <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3693- <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3694- <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3695- <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3696- <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3697- <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3698- <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3699- <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3700- <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
3701- <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
3702- <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
3703- <paraStyle name="P25" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
3704- <paraStyle name="P26" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
3705- <paraStyle name="P27" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
3706- <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3707- <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3708- <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3709- <paraStyle name="Standard" fontName="Helvetica"/>
3710- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3711- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3712- <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3713- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
3714- <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
3715- <paraStyle name="Index" fontName="Helvetica"/>
3716- <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
3717- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
3718- <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3719- <paraStyle name="Footer" fontName="Helvetica"/>
3720- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
3721- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3722- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
3723- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
3724- <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3725- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
3726- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
3727- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
3728- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
3729- <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3730- <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3731- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
3732- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
3733- <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3734- <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3735- <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3736- <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3737- <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3738- <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3739- <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3740- <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
3741- <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3742- <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
3743- <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
3744- <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
3745- <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3746- <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
3747- <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
3748- <paraStyle name="Endnote" rightIndent="0.0" leftIndent="17.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
3749- <images/>
3750- </stylesheet>
3751- <story>
3752- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
3753- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
3754- <blockTable colWidths="337.0,188.0" style="Table_Partner_Address">
3755- <tr>
3756- <td>
3757- <para style="terp_default_8">
3758- <font color="white"> </font>
3759- </para>
3760- </td>
3761- <td>
3762- <para style="P7">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
3763- <para style="P6">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
3764- <para style="P6">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
3765- <para style="P6">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
3766- <para style="P6">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
3767- <para style="P6">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
3768- <para style="P6">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
3769- </td>
3770- </tr>
3771- </blockTable>
3772- <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1">
3773- <tr>
3774- <td>
3775- <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
3776- <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
3777- <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
3778- <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
3779- </td>
3780- <td>
3781- <para style="P8">
3782- <font color="white"> </font>
3783- </para>
3784- </td>
3785- <td>
3786- <blockTable colWidths="104.0,87.0" style="Table_invoice_data">
3787- <tr>
3788- <td>
3789- <para style="P21">Ljubljana:</para>
3790- </td>
3791- <td>
3792- <para style="P21">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
3793- </td>
3794- </tr>
3795- <tr>
3796- <td>
3797- <para style="P21">Delivery Date:</para>
3798- </td>
3799- <td>
3800- <para style="P21">[[ formatLang(o.date_invoice,date=True) ]]</para>
3801- </td>
3802- </tr>
3803- <tr>
3804- <td>
3805- <para style="P21">Due Date:</para>
3806- </td>
3807- <td>
3808- <para style="P20">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
3809- </td>
3810- </tr>
3811- <tr>
3812- <td>
3813- <para style="P21">Payment Term:</para>
3814- </td>
3815- <td>
3816- <para style="P21">[[ o.payment_term.name ]]</para>
3817- </td>
3818- </tr>
3819- <tr>
3820- <td>
3821- <para style="P21">Partner phone:</para>
3822- </td>
3823- <td>
3824- <para style="P21">[[ o.partner_id.mobile or o.partner_id.phone]]</para>
3825- </td>
3826- </tr>
3827- </blockTable>
3828- <para style="terp_default_8">
3829- <font color="white"> </font>
3830- </para>
3831- </td>
3832- </tr>
3833- </blockTable>
3834- <para style="terp_default_9">
3835- <font color="white"> </font>
3836- </para>
3837- <para style="terp_default_9">
3838- <font color="white"> </font>
3839- </para>
3840- <blockTable colWidths="265.0,265.0" style="Table_Customer_data">
3841- <tr>
3842- <td>
3843- <para style="P9">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
3844- </td>
3845- <td>
3846- <para style="P1">
3847- <font color="white"> </font>
3848- </para>
3849- </td>
3850- </tr>
3851- </blockTable>
3852- <blockTable colWidths="49.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table7">
3853- <tr>
3854- <td>
3855- <para style="P24">Code</para>
3856- </td>
3857- <td>
3858- <para style="P24">Description</para>
3859- </td>
3860- <td>
3861- <para style="P26">Quantity</para>
3862- </td>
3863- <td>
3864- <para style="P26">UM</para>
3865- </td>
3866- <td>
3867- <para style="P27">Package</para>
3868- </td>
3869- <td>
3870- <para style="P27">LOT</para>
3871- </td>
3872- <td>
3873- <para style="P27">Unit Price </para>
3874- </td>
3875- <td>
3876- <para style="P27">Disc.</para>
3877- </td>
3878- <td>
3879- <para style="P26">DDV (%)</para>
3880- </td>
3881- <td>
3882- <para style="P27">Price (EUR)</para>
3883- </td>
3884- </tr>
3885- </blockTable>
3886- <section>
3887- <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
3888- <blockTable colWidths="49.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" style="Table8">
3889- <tr>
3890- <td>
3891- <para style="P12">[[ l.product_id.default_code ]]</para>
3892- </td>
3893- <td>
3894- <para style="P11">[[ l.name ]]</para>
3895- </td>
3896- <td>
3897- <para style="P17">[[ formatLang(get_uom_qty(l)) ]] </para>
3898- </td>
3899- <td>
3900- <para style="P17">[[ get_units(l) ]] </para>
3901- </td>
3902- <td>
3903- <para style="P17">[[ formatLang(get_uos_qty(l)) ]] </para>
3904- </td>
3905- <td>
3906- <para style="P17">
3907- <font color="white"> </font>
3908- </para>
3909- </td>
3910- <td>
3911- <para style="P18">[[ formatLang(l.price_unit) ]]</para>
3912- </td>
3913- <td>
3914- <para style="P17">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
3915- </td>
3916- <td>
3917- <para style="P29">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
3918- </td>
3919- <td>
3920- <para style="P16">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
3921- </td>
3922- </tr>
3923- </blockTable>
3924- </section>
3925- <blockTable colWidths="280.0,248.0" style="Table10">
3926- <tr>
3927- <td>
3928- <para style="P13">Net Total:</para>
3929- </td>
3930- <td>
3931- <para style="P15">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
3932- </td>
3933- </tr>
3934- <tr>
3935- <td>
3936- <para style="P13">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
3937- </td>
3938- <td>
3939- <para style="P15">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
3940- </td>
3941- </tr>
3942- <tr>
3943- <td>
3944- <para style="P28">Taxes:</para>
3945- </td>
3946- <td>
3947- <para style="P15">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
3948- </td>
3949- </tr>
3950- <tr>
3951- <td>
3952- <para style="P25">Total:</para>
3953- </td>
3954- <td>
3955- <para style="P30">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
3956- </td>
3957- </tr>
3958- </blockTable>
3959- <para style="P22">-</para>
3960- <blockTable colWidths="355.0,175.0" style="Table_te&#x17E;a">
3961- <tr>
3962- <td>
3963- <para style="terp_default_8">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para>
3964- <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
3965- </td>
3966- <td>
3967- <para style="P19">
3968- <font color="white"> </font>
3969- </para>
3970- </td>
3971- </tr>
3972- </blockTable>
3973- <para style="P22">-</para>
3974- <blockTable colWidths="530.0" style="Table_notes">
3975- <tr>
3976- <td>
3977- <para style="P13">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
3978- <para style="P13">
3979- <font color="white"> </font>
3980- </para>
3981- </td>
3982- </tr>
3983- </blockTable>
3984- <blockTable colWidths="530.0" style="Table_noga">
3985- <tr>
3986- <td>
3987- <para style="P2">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
3988- </td>
3989- </tr>
3990- <tr>
3991- <td>
3992- <para style="P2">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
3993- </td>
3994- </tr>
3995- <tr>
3996- <td>
3997- <para style="P3">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>
3998- </td>
3999- </tr>
4000- <tr>
4001- <td>
4002- <para style="P4">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
4003- </td>
4004- </tr>
4005- <tr>
4006- <td>
4007- <para style="P2">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
4008- </td>
4009- </tr>
4010- </blockTable>
4011- <para style="P23">-</para>
4012- <para style="P23">-</para>
4013- <para style="P23">-</para>
4014- <para style="P23">-</para>
4015- <para style="P23">-</para>
4016- <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral">
4017- <tr>
4018- <td>
4019- <para style="terp_default_9">
4020- <font color="white"> </font>
4021- </para>
4022- </td>
4023- <td>
4024- <para style="P5">Invoice issued by:</para>
4025- </td>
4026- <td>
4027- <para style="P14">[[ o.user_id.name ]]</para>
4028- </td>
4029- </tr>
4030- </blockTable>
4031- <para style="Standard">
4032- <font color="white"> </font>
4033- </para>
4034- </story>
4035-</document>
4036
4037=== removed file 'inovatim_reports/report/account_print_invoice.sxw'
4038Binary files inovatim_reports/report/account_print_invoice.sxw 2014-02-25 12:29:43 +0000 and inovatim_reports/report/account_print_invoice.sxw 1970-01-01 00:00:00 +0000 differ
4039=== removed file 'inovatim_reports/report/purchase_order.py'
4040--- inovatim_reports/report/purchase_order.py 2014-01-22 11:35:04 +0000
4041+++ inovatim_reports/report/purchase_order.py 1970-01-01 00:00:00 +0000
4042@@ -1,34 +0,0 @@
4043-# -*- coding: utf-8 -*-
4044-##############################################################################
4045-#
4046-# OpenERP, Open Source Management Solution
4047-# Copyright (C) 2014 Mentis d.o.o.
4048-#
4049-# This program is free software: you can redistribute it and/or modify
4050-# it under the terms of the GNU Affero General Public License as
4051-# published by the Free Software Foundation, either version 3 of the
4052-# License, or (at your option) any later version.
4053-#
4054-# This program is distributed in the hope that it will be useful,
4055-# but WITHOUT ANY WARRANTY; without even the implied warranty of
4056-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4057-# GNU Affero General Public License for more details.
4058-#
4059-# You should have received a copy of the GNU Affero General Public License
4060-# along with this program. If not, see <http://www.gnu.org/licenses/>.
4061-#
4062-##############################################################################
4063-
4064-import time
4065-from openerp.report import report_sxw
4066-from openerp.osv import osv
4067-
4068-class order(report_sxw.rml_parse):
4069- def __init__(self, cr, uid, name, context):
4070- super(order, self).__init__(cr, uid, name, context=context)
4071- self.localcontext.update({'time': time})
4072-
4073-report_sxw.report_sxw('report.purchase.order.inovatim','purchase.order','inovatim_reports/report/purchase_order.rml',parser=order)
4074-
4075-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4076-
4077
4078=== removed file 'inovatim_reports/report/purchase_order.rml'
4079--- inovatim_reports/report/purchase_order.rml 2014-02-25 12:29:43 +0000
4080+++ inovatim_reports/report/purchase_order.rml 1970-01-01 00:00:00 +0000
4081@@ -1,325 +0,0 @@
4082-<?xml version="1.0"?>
4083-<document filename="test.pdf">
4084- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
4085- <pageTemplate id="first">
4086- <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
4087- </pageTemplate>
4088- </template>
4089- <stylesheet>
4090- <blockTableStyle id="Standard_Outline">
4091- <blockAlignment value="LEFT"/>
4092- <blockValign value="TOP"/>
4093- </blockTableStyle>
4094- <blockTableStyle id="Table_naslov">
4095- <blockAlignment value="LEFT"/>
4096- <blockValign value="TOP"/>
4097- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
4098- </blockTableStyle>
4099- <blockTableStyle id="Tableau1">
4100- <blockAlignment value="LEFT"/>
4101- <blockValign value="TOP"/>
4102- </blockTableStyle>
4103- <blockTableStyle id="Tableau2">
4104- <blockAlignment value="LEFT"/>
4105- <blockValign value="TOP"/>
4106- </blockTableStyle>
4107- <blockTableStyle id="Table_order_data">
4108- <blockAlignment value="LEFT"/>
4109- <blockValign value="TOP"/>
4110- </blockTableStyle>
4111- <blockTableStyle id="Table_davek">
4112- <blockAlignment value="LEFT"/>
4113- <blockValign value="TOP"/>
4114- </blockTableStyle>
4115- <blockTableStyle id="Table_Header_Pur_ord_Line">
4116- <blockAlignment value="LEFT"/>
4117- <blockValign value="TOP"/>
4118- <lineStyle kind="LINEBEFORE" colorName="#666666" start="0,0" stop="0,-1"/>
4119- <lineStyle kind="LINEABOVE" colorName="#666666" start="0,0" stop="0,0"/>
4120- <lineStyle kind="LINEBELOW" colorName="#666666" start="0,-1" stop="0,-1"/>
4121- <lineStyle kind="LINEBEFORE" colorName="#666666" start="1,0" stop="1,-1"/>
4122- <lineStyle kind="LINEABOVE" colorName="#666666" start="1,0" stop="1,0"/>
4123- <lineStyle kind="LINEBELOW" colorName="#666666" start="1,-1" stop="1,-1"/>
4124- <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/>
4125- <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/>
4126- <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/>
4127- <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/>
4128- <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/>
4129- <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/>
4130- <lineStyle kind="LINEBEFORE" colorName="#666666" start="4,0" stop="4,-1"/>
4131- <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/>
4132- <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/>
4133- <lineStyle kind="LINEBEFORE" colorName="#666666" start="5,0" stop="5,-1"/>
4134- <lineStyle kind="LINEABOVE" colorName="#666666" start="5,0" stop="5,0"/>
4135- <lineStyle kind="LINEBELOW" colorName="#666666" start="5,-1" stop="5,-1"/>
4136- <lineStyle kind="LINEBEFORE" colorName="#666666" start="6,0" stop="6,-1"/>
4137- <lineStyle kind="LINEAFTER" colorName="#666666" start="6,0" stop="6,-1"/>
4138- <lineStyle kind="LINEABOVE" colorName="#666666" start="6,0" stop="6,0"/>
4139- <lineStyle kind="LINEBELOW" colorName="#666666" start="6,-1" stop="6,-1"/>
4140- <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
4141- <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
4142- <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
4143- <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
4144- <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
4145- <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/>
4146- <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/>
4147- </blockTableStyle>
4148- <blockTableStyle id="Table_Order_Pur_line_Content">
4149- <blockAlignment value="LEFT"/>
4150- <blockValign value="TOP"/>
4151- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
4152- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
4153- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
4154- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
4155- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
4156- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
4157- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
4158- </blockTableStyle>
4159- <blockTableStyle id="Table_All_Total_Detail">
4160- <blockAlignment value="LEFT"/>
4161- <blockValign value="TOP"/>
4162- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
4163- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
4164- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
4165- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
4166- </blockTableStyle>
4167- <initialize>
4168- <paraStyle name="all" alignment="justify"/>
4169- </initialize>
4170- <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4171- <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4172- <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
4173- <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4174- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4175- <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4176- <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
4177- <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4178- <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4179- <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
4180- <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4181- <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4182- <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4183- <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4184- <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4185- <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4186- <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4187- <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4188- <paraStyle name="Standard" fontName="Helvetica"/>
4189- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
4190- <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
4191- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
4192- <paraStyle name="Table Contents" fontName="Helvetica"/>
4193- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
4194- <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
4195- <paraStyle name="Index" fontName="Helvetica"/>
4196- <paraStyle name="Footer" fontName="Helvetica"/>
4197- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
4198- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4199- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
4200- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
4201- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
4202- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4203- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4204- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4205- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
4206- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4207- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
4208- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4209- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4210- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4211- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
4212- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4213- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4214- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4215- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4216- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4217- <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4218- <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4219- <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4220- <images/>
4221- </stylesheet>
4222- <story>
4223- <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
4224- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
4225- <blockTable colWidths="283.0,252.0" style="Table_naslov">
4226- <tr>
4227- <td>
4228- <para style="P3">
4229- <font color="white"> </font>
4230- </para>
4231- </td>
4232- <td>
4233- <para style="P2">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation: [[ o.name ]]</para>
4234- <para style="P1">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation: [[ o.name ]]</para>
4235- </td>
4236- </tr>
4237- </blockTable>
4238- <blockTable colWidths="278.0,257.0" style="Tableau1">
4239- <tr>
4240- <td>
4241- <blockTable colWidths="277.0" style="Tableau2">
4242- <tr>
4243- <td>
4244- <para style="P17">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
4245- <para style="P17">[[ (o.partner_id.street) or '' ]]</para>
4246- <para style="P17">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
4247- <para style="P17">[[ (o.partner_id.country_id.name) or '' ]]</para>
4248- </td>
4249- </tr>
4250- <tr>
4251- <td>
4252- <para style="P17">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
4253- <para style="P17">Shipping address :</para>
4254- <para style="P17">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
4255- <para style="P17">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica">removeParentNode('para')</font>]]</para>
4256- </td>
4257- </tr>
4258- </blockTable>
4259- <para style="terp_default_9">
4260- <font color="white"> </font>
4261- </para>
4262- </td>
4263- <td>
4264- <blockTable colWidths="146.0,111.0" style="Table_order_data">
4265- <tr>
4266- <td>
4267- <para style="P6">Order Date:</para>
4268- </td>
4269- <td>
4270- <para style="P6">[[formatLang(o.date_order,date=True) ]]</para>
4271- </td>
4272- </tr>
4273- <tr>
4274- <td>
4275- <para style="P6">Validated By:</para>
4276- </td>
4277- <td>
4278- <para style="P6">[[ (o.validator and o.validator.name) or '' ]]</para>
4279- </td>
4280- </tr>
4281- </blockTable>
4282- <para style="terp_default_8">
4283- <font color="white"> </font>
4284- </para>
4285- <para style="terp_default_8">
4286- <font color="white"> </font>
4287- </para>
4288- <para style="terp_default_8">
4289- <font color="white"> </font>
4290- </para>
4291- <para style="terp_default_8">
4292- <font color="white"> </font>
4293- </para>
4294- <para style="terp_default_8">
4295- <font color="white"> </font>
4296- </para>
4297- <para style="terp_default_8">
4298- <font color="white"> </font>
4299- </para>
4300- <para style="terp_default_8">
4301- <font color="white"> </font>
4302- </para>
4303- </td>
4304- </tr>
4305- </blockTable>
4306- <para style="terp_default_9">
4307- <font color="white"> </font>
4308- </para>
4309- <blockTable colWidths="267.0,267.0" style="Table_davek">
4310- <tr>
4311- <td>
4312- <para style="P4">VAT: [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
4313- </td>
4314- <td>
4315- <para style="P3">
4316- <font color="white"> </font>
4317- </para>
4318- </td>
4319- </tr>
4320- </blockTable>
4321- <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
4322- <tr>
4323- <td>
4324- <para style="P10">Customer reference</para>
4325- </td>
4326- <td>
4327- <para style="P11">Code</para>
4328- </td>
4329- <td>
4330- <para style="P11">Description</para>
4331- </td>
4332- <td>
4333- <para style="P12">Quantity</para>
4334- </td>
4335- <td>
4336- <para style="P12">UM</para>
4337- </td>
4338- <td>
4339- <para style="P13">Unit Price</para>
4340- </td>
4341- <td>
4342- <para style="P13">Net Price (€) </para>
4343- </td>
4344- </tr>
4345- </blockTable>
4346- <section>
4347- <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
4348- <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">
4349- <tr>
4350- <td>
4351- <para style="P15">[[ line.customer_ref ]]</para>
4352- </td>
4353- <td>
4354- <para style="P15">[[ line.product_id.default_code ]]</para>
4355- </td>
4356- <td>
4357- <para style="P14">[[ line.name ]]</para>
4358- </td>
4359- <td>
4360- <para style="P8">[[ formatLang(line.product_qty ) ]] </para>
4361- </td>
4362- <td>
4363- <para style="P8">[[ line.product_uom.name ]]</para>
4364- </td>
4365- <td>
4366- <para style="P8">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
4367- </td>
4368- <td>
4369- <para style="P8">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
4370- </td>
4371- </tr>
4372- </blockTable>
4373- </section>
4374- <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">
4375- <tr>
4376- <td>
4377- <para style="P16">Net Total:</para>
4378- </td>
4379- <td>
4380- <para style="P9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
4381- </td>
4382- </tr>
4383- <tr>
4384- <td>
4385- <para style="P16">Taxes:</para>
4386- </td>
4387- <td>
4388- <para style="P9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
4389- </td>
4390- </tr>
4391- <tr>
4392- <td>
4393- <para style="P5">Total:</para>
4394- </td>
4395- <td>
4396- <para style="P18">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
4397- </td>
4398- </tr>
4399- </blockTable>
4400- <para style="P7">-</para>
4401- <para style="P7">-</para>
4402- <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
4403- <para style="P7">-</para>
4404- <para style="terp_default_9">Payment terms: [[ (o.payment_term_id and o.payment_term_id.note and format(o.payment_term_id and o.payment_term_id.note)) or removeParentNode('para') ]]</para>
4405- </story>
4406-</document>
4407
4408=== removed file 'inovatim_reports/report/purchase_order.sxw'
4409Binary files inovatim_reports/report/purchase_order.sxw 2014-02-25 12:29:43 +0000 and inovatim_reports/report/purchase_order.sxw 1970-01-01 00:00:00 +0000 differ
4410=== removed file 'inovatim_reports/report/sale_order.py'
4411--- inovatim_reports/report/sale_order.py 2014-01-27 10:41:36 +0000
4412+++ inovatim_reports/report/sale_order.py 1970-01-01 00:00:00 +0000
4413@@ -1,85 +0,0 @@
4414-# -*- coding: utf-8 -*-
4415-##############################################################################
4416-#
4417-# OpenERP, Open Source Management Solution
4418-# Copyright (C) 2014 Mentis d.o.o.
4419-#
4420-# This program is free software: you can redistribute it and/or modify
4421-# it under the terms of the GNU Affero General Public License as
4422-# published by the Free Software Foundation, either version 3 of the
4423-# License, or (at your option) any later version.
4424-#
4425-# This program is distributed in the hope that it will be useful,
4426-# but WITHOUT ANY WARRANTY; without even the implied warranty of
4427-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4428-# GNU Affero General Public License for more details.
4429-#
4430-# You should have received a copy of the GNU Affero General Public License
4431-# along with this program. If not, see <http://www.gnu.org/licenses/>.
4432-#
4433-##############################################################################
4434-
4435-import time
4436-from openerp.report import report_sxw
4437-
4438-class order(report_sxw.rml_parse):
4439- def __init__(self, cr, uid, name, context=None):
4440- super(order, self).__init__(cr, uid, name, context=context)
4441- self.localcontext.update({
4442- 'time': time,
4443- 'get_total_discount': self._get_total_discount,
4444- 'get_total_net': self._get_total_net,
4445- 'get_units': self._get_units,
4446- 'get_packets': self._get_packets,
4447- 'get_total_weight': self._get_total_weight,
4448- })
4449-
4450- def _get_total_discount(self, order):
4451- disc_total = 0
4452- for line in order.order_line:
4453- #if line.product_uos:
4454- # disc_tmp = line.product_uos_qty * line.price_unit * line.discount / 100
4455- #else:
4456- # disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100
4457- disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100
4458- disc_total += disc_tmp
4459-
4460- return disc_total
4461-
4462- def _get_total_net(self, order):
4463- value_total = 0
4464- for line in order.order_line:
4465- if line.product_uos:
4466- value_tmp = line.product_uos_qty * line.price_unit
4467- else:
4468- value_tmp = line.product_uom_qty * line.price_unit
4469- value_total += value_tmp
4470-
4471- return value_total
4472-
4473- def _get_units(self, invoice_line):
4474- line_obj = self.pool.get('sale.order.line')
4475- line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
4476- res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom']
4477- if res:
4478- return res.name
4479- else:
4480- return ''
4481-
4482- def _get_total_weight(self, sale):
4483- line_obj = self.pool.get('sale.order.line')
4484- line_ids = line_obj.search(self.cr, self.uid, [('order_id', '=' , sale.id)])
4485- sum = 0
4486- for sale_line in line_obj.browse(self.cr, self. uid, line_ids):
4487- sum = sum + sale_line.product_uom_qty * sale_line.product_id.weight
4488-
4489- return sum
4490-
4491- def _get_packets(self, sale_line):
4492- if sale_line.product_uos.id and sale_line.product_uom.id != sale_line.product_uos.id:
4493- return sale_line.product_uos_qty
4494- else:
4495- return ''
4496-
4497-
4498-report_sxw.report_sxw('report.sale.order.inovatim', 'sale.order', 'inovatim_reports/report/sale_order.rml', parser=order, header="external")
4499
4500=== removed file 'inovatim_reports/report/sale_order.rml'
4501--- inovatim_reports/report/sale_order.rml 2014-02-25 12:29:43 +0000
4502+++ inovatim_reports/report/sale_order.rml 1970-01-01 00:00:00 +0000
4503@@ -1,437 +0,0 @@
4504-<?xml version="1.0"?>
4505-<document filename="test.pdf">
4506- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
4507- <pageTemplate id="first">
4508- <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
4509- </pageTemplate>
4510- </template>
4511- <stylesheet>
4512- <blockTableStyle id="Standard_Outline">
4513- <blockAlignment value="LEFT"/>
4514- <blockValign value="TOP"/>
4515- </blockTableStyle>
4516- <blockTableStyle id="Table_naslov">
4517- <blockAlignment value="LEFT"/>
4518- <blockValign value="TOP"/>
4519- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
4520- </blockTableStyle>
4521- <blockTableStyle id="Table_customer_data">
4522- <blockAlignment value="LEFT"/>
4523- <blockValign value="TOP"/>
4524- </blockTableStyle>
4525- <blockTableStyle id="Table_order_inf">
4526- <blockAlignment value="LEFT"/>
4527- <blockValign value="TOP"/>
4528- </blockTableStyle>
4529- <blockTableStyle id="Table_davek">
4530- <blockAlignment value="LEFT"/>
4531- <blockValign value="TOP"/>
4532- </blockTableStyle>
4533- <blockTableStyle id="Table4">
4534- <blockAlignment value="LEFT"/>
4535- <blockValign value="TOP"/>
4536- <lineStyle kind="LINEBEFORE" colorName="#666666" start="0,0" stop="0,-1"/>
4537- <lineStyle kind="LINEABOVE" colorName="#666666" start="0,0" stop="0,0"/>
4538- <lineStyle kind="LINEBELOW" colorName="#666666" start="0,-1" stop="0,-1"/>
4539- <lineStyle kind="LINEBEFORE" colorName="#666666" start="1,0" stop="1,-1"/>
4540- <lineStyle kind="LINEABOVE" colorName="#666666" start="1,0" stop="1,0"/>
4541- <lineStyle kind="LINEBELOW" colorName="#666666" start="1,-1" stop="1,-1"/>
4542- <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/>
4543- <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/>
4544- <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/>
4545- <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/>
4546- <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/>
4547- <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/>
4548- <lineStyle kind="LINEBEFORE" colorName="#666666" start="4,0" stop="4,-1"/>
4549- <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/>
4550- <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/>
4551- <lineStyle kind="LINEBEFORE" colorName="#666666" start="5,0" stop="5,-1"/>
4552- <lineStyle kind="LINEABOVE" colorName="#666666" start="5,0" stop="5,0"/>
4553- <lineStyle kind="LINEBELOW" colorName="#666666" start="5,-1" stop="5,-1"/>
4554- <lineStyle kind="LINEBEFORE" colorName="#666666" start="6,0" stop="6,-1"/>
4555- <lineStyle kind="LINEABOVE" colorName="#666666" start="6,0" stop="6,0"/>
4556- <lineStyle kind="LINEBELOW" colorName="#666666" start="6,-1" stop="6,-1"/>
4557- <lineStyle kind="LINEBEFORE" colorName="#666666" start="7,0" stop="7,-1"/>
4558- <lineStyle kind="LINEABOVE" colorName="#666666" start="7,0" stop="7,0"/>
4559- <lineStyle kind="LINEBELOW" colorName="#666666" start="7,-1" stop="7,-1"/>
4560- <lineStyle kind="LINEBEFORE" colorName="#666666" start="8,0" stop="8,-1"/>
4561- <lineStyle kind="LINEABOVE" colorName="#666666" start="8,0" stop="8,0"/>
4562- <lineStyle kind="LINEBELOW" colorName="#666666" start="8,-1" stop="8,-1"/>
4563- <lineStyle kind="LINEBEFORE" colorName="#666666" start="9,0" stop="9,-1"/>
4564- <lineStyle kind="LINEAFTER" colorName="#666666" start="9,0" stop="9,-1"/>
4565- <lineStyle kind="LINEABOVE" colorName="#666666" start="9,0" stop="9,0"/>
4566- <lineStyle kind="LINEBELOW" colorName="#666666" start="9,-1" stop="9,-1"/>
4567- <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
4568- <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
4569- <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
4570- <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
4571- <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
4572- <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/>
4573- <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/>
4574- <blockBackground colorName="#e6e6e6" start="7,0" stop="7,-1"/>
4575- <blockBackground colorName="#e6e6e6" start="8,0" stop="8,-1"/>
4576- <blockBackground colorName="#e6e6e6" start="9,0" stop="9,-1"/>
4577- </blockTableStyle>
4578- <blockTableStyle id="Table5">
4579- <blockAlignment value="LEFT"/>
4580- <blockValign value="TOP"/>
4581- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
4582- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
4583- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
4584- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
4585- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
4586- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
4587- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
4588- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
4589- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
4590- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
4591- </blockTableStyle>
4592- <blockTableStyle id="Table_tax">
4593- <blockAlignment value="LEFT"/>
4594- <blockValign value="TOP"/>
4595- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
4596- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
4597- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,3" stop="0,3"/>
4598- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
4599- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,3" stop="1,3"/>
4600- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
4601- </blockTableStyle>
4602- <blockTableStyle id="Table_dobava">
4603- <blockAlignment value="LEFT"/>
4604- <blockValign value="TOP"/>
4605- </blockTableStyle>
4606- <blockTableStyle id="Table_prosti_opis">
4607- <blockAlignment value="LEFT"/>
4608- <blockValign value="TOP"/>
4609- </blockTableStyle>
4610- <blockTableStyle id="Table_bold">
4611- <blockAlignment value="LEFT"/>
4612- <blockValign value="TOP"/>
4613- </blockTableStyle>
4614- <initialize>
4615- <paraStyle name="all" alignment="justify"/>
4616- </initialize>
4617- <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4618- <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4619- <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4620- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
4621- <paraStyle name="P5" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4622- <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4623- <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4624- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4625- <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4626- <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4627- <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4628- <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
4629- <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
4630- <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
4631- <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
4632- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
4633- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4634- <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4635- <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4636- <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4637- <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4638- <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4639- <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4640- <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4641- <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4642- <paraStyle name="P26" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4643- <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4644- <paraStyle name="Standard" fontName="Helvetica"/>
4645- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
4646- <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
4647- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
4648- <paraStyle name="Table Contents" fontName="Helvetica"/>
4649- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
4650- <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
4651- <paraStyle name="Index" fontName="Helvetica"/>
4652- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4653- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4654- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4655- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4656- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4657- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
4658- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4659- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4660- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
4661- <paraStyle name="Footer" fontName="Helvetica"/>
4662- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
4663- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
4664- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
4665- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
4666- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
4667- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4668- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
4669- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
4670- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4671- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4672- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4673- <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4674- <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
4675- <paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
4676- <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
4677- <paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
4678- <images/>
4679- </stylesheet>
4680- <story>
4681- <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
4682- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
4683- <blockTable colWidths="270.0,270.0" style="Table_naslov">
4684- <tr>
4685- <td>
4686- <para style="P15">
4687- <font color="white"> </font>
4688- </para>
4689- </td>
4690- <td>
4691- <para style="P16">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
4692- <para style="P16">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
4693- </td>
4694- </tr>
4695- </blockTable>
4696- <blockTable colWidths="264.0,276.0" style="Table_customer_data">
4697- <tr>
4698- <td>
4699- <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
4700- <para style="P11">[[ (o.partner_id.street) or '' ]]</para>
4701- <para style="P11">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
4702- <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para>
4703- <para style="P11">
4704- <font color="white"> </font>
4705- </para>
4706- <para style="P18">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
4707- <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
4708- <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
4709- <para style="P11">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
4710- <para style="P11">
4711- <font color="white"> </font>
4712- </para>
4713- <para style="P18">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
4714- <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
4715- <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
4716- <para style="P7">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
4717- </td>
4718- <td>
4719- <blockTable colWidths="137.0,133.0" style="Table_order_inf">
4720- <tr>
4721- <td>
4722- <para style="P2">Ljubljana,</para>
4723- </td>
4724- <td>
4725- <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para>
4726- </td>
4727- </tr>
4728- <tr>
4729- <td>
4730- <para style="P2">Expiration date:</para>
4731- </td>
4732- <td>
4733- <para style="P8">
4734- <font color="white"> </font>
4735- </para>
4736- </td>
4737- </tr>
4738- <tr>
4739- <td>
4740- <para style="P2">Customer reference:</para>
4741- </td>
4742- <td>
4743- <para style="P2">[[ o.client_order_ref ]]</para>
4744- </td>
4745- </tr>
4746- <tr>
4747- <td>
4748- <para style="P2">Payment Term:</para>
4749- </td>
4750- <td>
4751- <para style="P2">[[ o.payment_term.name ]]</para>
4752- </td>
4753- </tr>
4754- <tr>
4755- <td>
4756- <para style="P2">Salesperson:</para>
4757- </td>
4758- <td>
4759- <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone ]]</para>
4760- </td>
4761- </tr>
4762- <tr>
4763- <td>
4764- <para style="P2">
4765- <font color="white"> </font>
4766- </para>
4767- </td>
4768- <td>
4769- <para style="P2">
4770- <font color="white"> </font>
4771- </para>
4772- </td>
4773- </tr>
4774- </blockTable>
4775- <para style="P15">
4776- <font color="white"> </font>
4777- </para>
4778- </td>
4779- </tr>
4780- </blockTable>
4781- <para style="terp_default_8">
4782- <font color="white"> </font>
4783- </para>
4784- <blockTable colWidths="314.0,226.0" style="Table_davek">
4785- <tr>
4786- <td>
4787- <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
4788- <para style="P5">
4789- <font color="white"> </font>
4790- </para>
4791- </td>
4792- <td>
4793- <para style="P22">
4794- <font color="white"> </font>
4795- </para>
4796- </td>
4797- </tr>
4798- </blockTable>
4799- <blockTable colWidths="55.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
4800- <tr>
4801- <td>
4802- <para style="P23">Code</para>
4803- </td>
4804- <td>
4805- <para style="P23">Description</para>
4806- </td>
4807- <td>
4808- <para style="P25">Quantity</para>
4809- </td>
4810- <td>
4811- <para style="P25">UM</para>
4812- </td>
4813- <td>
4814- <para style="P25">Package</para>
4815- </td>
4816- <td>
4817- <para style="P25">LOT</para>
4818- </td>
4819- <td>
4820- <para style="P25">Unit Price</para>
4821- </td>
4822- <td>
4823- <para style="P25">Disc.</para>
4824- </td>
4825- <td>
4826- <para style="P24">Taxes (%)</para>
4827- </td>
4828- <td>
4829- <para style="P25">Price (€)</para>
4830- </td>
4831- </tr>
4832- </blockTable>
4833- <section>
4834- <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
4835- <blockTable colWidths="56.0,207.0,37.0,22.0,33.0,32.0,33.0,32.0,28.0,55.0" style="Table5">
4836- <tr>
4837- <td>
4838- <para style="P10">[[ line.product_id.default_code ]]</para>
4839- </td>
4840- <td>
4841- <para style="P9">[[ line.name ]] </para>
4842- </td>
4843- <td>
4844- <para style="P19">[[ line.product_uom_qty ]] </para>
4845- </td>
4846- <td>
4847- <para style="P19">[[ line.product_uom.name ]]</para>
4848- </td>
4849- <td>
4850- <para style="P22">[[ get_packets(line) ]] </para>
4851- </td>
4852- <td>
4853- <para style="P19">
4854- <font color="white"> </font>
4855- </para>
4856- </td>
4857- <td>
4858- <para style="P19">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
4859- </td>
4860- <td>
4861- <para style="P20">[[ formatLang(line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
4862- </td>
4863- <td>
4864- <para style="P26">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
4865- </td>
4866- <td>
4867- <para style="P19">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
4868- </td>
4869- </tr>
4870- </blockTable>
4871- </section>
4872- <blockTable colWidths="270.0,270.0" style="Table_tax">
4873- <tr>
4874- <td>
4875- <para style="P6">Net Total:</para>
4876- </td>
4877- <td>
4878- <para style="P21">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
4879- </td>
4880- </tr>
4881- <tr>
4882- <td>
4883- <para style="P6">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
4884- </td>
4885- <td>
4886- <para style="P21">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
4887- </td>
4888- </tr>
4889- <tr>
4890- <td>
4891- <para style="P6">Taxes :</para>
4892- </td>
4893- <td>
4894- <para style="P21">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
4895- </td>
4896- </tr>
4897- <tr>
4898- <td>
4899- <para style="P17">Total :</para>
4900- </td>
4901- <td>
4902- <para style="P27">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
4903- </td>
4904- </tr>
4905- </blockTable>
4906- <para style="P13">-</para>
4907- <blockTable colWidths="539.0" style="Table_dobava">
4908- <tr>
4909- <td>
4910- <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
4911- <para style="P14">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
4912- </td>
4913- </tr>
4914- </blockTable>
4915- <para style="P13">-</para>
4916- <para style="P13">-</para>
4917- <blockTable colWidths="539.0" style="Table_prosti_opis">
4918- <tr>
4919- <td>
4920- <para style="P12">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Inovatim d.o.o. TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>
4921- <para style="P13">-</para>
4922- <para style="P12">Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.</para>
4923- <para style="P13">-</para>
4924- <para style="P12">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
4925- <para style="P13">-</para>
4926- </td>
4927- </tr>
4928- </blockTable>
4929- <blockTable colWidths="539.0" style="Table_bold">
4930- <tr>
4931- <td>
4932- <para style="P4">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
4933- </td>
4934- </tr>
4935- </blockTable>
4936- <para style="terp_default_9">
4937- <font color="white"> </font>
4938- </para>
4939- </story>
4940-</document>
4941
4942=== removed file 'inovatim_reports/report/sale_order.sxw'
4943Binary files inovatim_reports/report/sale_order.sxw 2014-02-25 12:29:43 +0000 and inovatim_reports/report/sale_order.sxw 1970-01-01 00:00:00 +0000 differ
4944=== removed file 'inovatim_reports/report/stock_picking.py'
4945--- inovatim_reports/report/stock_picking.py 2014-02-25 12:29:43 +0000
4946+++ inovatim_reports/report/stock_picking.py 1970-01-01 00:00:00 +0000
4947@@ -1,99 +0,0 @@
4948-# -*- coding: utf-8 -*-
4949-##############################################################################
4950-#
4951-# OpenERP, Open Source Management Solution
4952-# Copyright (C) 2013 Mentis d.o.o.
4953-#
4954-# This program is free software: you can redistribute it and/or modify
4955-# it under the terms of the GNU Affero General Public License as
4956-# published by the Free Software Foundation, either version 3 of the
4957-# License, or (at your option) any later version.
4958-#
4959-# This program is distributed in the hope that it will be useful,
4960-# but WITHOUT ANY WARRANTY; without even the implied warranty of
4961-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4962-# GNU Affero General Public License for more details.
4963-#
4964-# You should have received a copy of the GNU Affero General Public License
4965-# along with this program. If not, see <http://www.gnu.org/licenses/>.
4966-#
4967-##############################################################################
4968-
4969-import time
4970-from openerp.report import report_sxw
4971-from openerp.osv import osv
4972-from openerp import pooler
4973-
4974-class picking(report_sxw.rml_parse):
4975- def __init__(self, cr, uid, name, context):
4976- super(picking, self).__init__(cr, uid, name, context=context)
4977- self.localcontext.update({
4978- 'time': time,
4979- 'get_product_desc':self._get_product_desc,
4980- 'get_product_notes':self._get_product_notes,
4981- 'get_total_weight':self._get_total_weight,
4982- 'get_packets': self._get_packets,
4983- 'get_units': self._get_units,
4984- 'get_price': self._get_price,
4985- })
4986- def _get_product_desc(self,move_line):
4987- if move_line.sale_line_id.name:
4988- desc = move_line.sale_line_id.name
4989- else:
4990- desc = move_line.product_id.name
4991- return desc
4992-
4993- def _get_product_notes(self,move_line):
4994- if move_line.sale_line_id.product_notes:
4995- return move_line.sale_line_id.product_notes
4996- else:
4997- return ''
4998-
4999- def _get_packets(self, move_line):
5000- line_obj = self.pool.get('sale.order.line')
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches