From 75fb06c4a266cef6c40790164497c326538e775d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 6 Sep 2010 19:22:05 +0530 Subject: [PATCH 001/115] Accounting/Reporting/Legal Report/Accounting Reports/ Print Balance Sheet * Both Landscape and Non Landscape * default value for float is not 0.0. but it should be 0.00.(use formatLang) * not all total amount should be bold. it's depends on leval style.(like Account Balance) * Without Landscape * remove company name above the report title * table style is wrong at the last of the page.(page 2 : last line of the table) bzr revid: apa@tinyerp.com-20100906135205-unzoi6ik2r0ceilj --- .../account/report/account_balance_sheet.py | 6 ++--- .../account/report/account_balance_sheet.rml | 24 ++++++++----------- .../account_balance_sheet_horizontal.rml | 8 +++---- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 084a7de8c14..ce02d7938f9 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -63,15 +63,15 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): def sum_dr(self): if self.res_bl['type'] == 'Net Profit': self.result_sum_dr += self.res_bl['balance'] - return self.result_sum_dr or 0.0 + return self.result_sum_dr def sum_cr(self): if self.res_bl['type'] == 'Net Loss': self.result_sum_cr += self.res_bl['balance'] - return self.result_sum_cr or 0.0 + return self.result_sum_cr def get_pl_balance(self): - return self.res_bl or 0.0 + return self.res_bl def get_data(self,data): cr, uid = self.cr, self.uid diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 42e3913a473..2170fb02c85 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -65,7 +65,7 @@ - + @@ -117,7 +117,10 @@ - + + + + @@ -161,13 +164,6 @@ - - - - [[ get_company(data) ]] - - - @@ -245,7 +241,7 @@ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] @@ -255,7 +251,7 @@ Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] @@ -280,10 +276,10 @@ [[ repeatIn(get_lines_another('asset'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] @@ -293,7 +289,7 @@ Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 39ca95412ea..3b4545c4336 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -272,7 +272,7 @@ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] @@ -281,7 +281,7 @@ [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] @@ -291,13 +291,13 @@ Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] Balance:([[ get_currency(data) ]]) - [[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] From 65b4832087ffa2ad82a99c9a0ef58377ee4375a2 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 6 Sep 2010 19:49:37 +0530 Subject: [PATCH 002/115] * Accounting/Reporting/Legal Report/Accounting Reports/ Print Profit And Loss * Both Landscape and Non Landscape * default value for float is not 0.0. but it should be 0.00.(use formatLang) * not all total amount should be bold. it's depends on leval style.(like Account Balance) * Without Landscape * remove space between report title and internal header bzr revid: apa@tinyerp.com-20100906141937-bus41waaytalehty --- .../account/report/account_profit_horizontal.rml | 12 ++++++------ addons/account/report/account_profit_loss.py | 4 ++-- addons/account/report/account_profit_loss.rml | 15 ++++++--------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 6b48ab14014..84e39da1a38 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -274,7 +274,7 @@ - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] @@ -287,7 +287,7 @@ - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] @@ -300,7 +300,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]] @@ -309,7 +309,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] @@ -320,13 +320,13 @@ Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]] ) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index a7c732cf379..28b5cb52aaf 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -63,12 +63,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): def sum_dr(self): if self.res_pl['type'] == 'Net Profit C.F.B.L.': self.result_sum_dr += self.res_pl['balance'] - return self.result_sum_dr or 0.0 + return self.result_sum_dr def sum_cr(self): if self.res_pl['type'] == 'Net Loss C.F.B.L.': self.result_sum_cr += self.res_pl['balance'] - return self.result_sum_cr or 0.0 + return self.result_sum_cr def get_data(self, data): cr, uid = self.cr, self.uid diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 5a9b81a82f6..144cd33fff6 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -185,9 +185,6 @@ - - - @@ -267,7 +264,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]] @@ -280,7 +277,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] @@ -290,7 +287,7 @@ Total:([[ get_currency(data) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]] @@ -322,7 +319,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]] @@ -335,7 +332,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]] @@ -345,7 +342,7 @@ Total:([[ get_currency(data) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]] + [[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]] From fbc2f598d63b088f7bb58c0f6a906d5615193b1f Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 7 Sep 2010 10:52:12 +0530 Subject: [PATCH 003/115] [FIX]:sale:The currency code is missing on the value(Price column) bzr revid: apa@tinyerp.com-20100907052212-6iahi5n8e0v7g8zv --- addons/sale/report/sale_order.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 4dc61188e19..3f44ef2afb3 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -234,7 +234,7 @@ Disc.(%) - Price + Price([[ o.pricelist_id.currency_id.code ]]) @@ -361,4 +361,4 @@ - + \ No newline at end of file From 5593aa4e654da0580a5e968c9bcb1a31a1257196 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 7 Sep 2010 11:33:10 +0530 Subject: [PATCH 004/115] [FIX]:purchase: * The currency code is missing on the value(Net Price column)(Purchase Order) * wrong address format (right)(Request for Quatation) [FIX]:account:bug when print Analytic balance with empty account. bzr revid: apa@tinyerp.com-20100907060310-l6vfq19xz1voogqm --- .../project/report/analytic_balance.py | 4 ++-- addons/purchase/report/order.rml | 2 +- addons/purchase/report/request_quotation.rml | 21 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py index 2de6ada841a..780c519c1d4 100644 --- a/addons/account/project/report/analytic_balance.py +++ b/addons/account/project/report/analytic_balance.py @@ -75,7 +75,7 @@ class account_analytic_balance(report_sxw.rml_parse): sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \ FROM account_analytic_line AS aal, account_account AS aa \ WHERE (aal.general_account_id=aa.id) \ - AND (aal.account_id IN aal.account_id IN %s)\ + AND (aal.account_id IN %s)\ AND (date>=%s) AND (date<=%s) AND aa.active \ GROUP BY aal.general_account_id, aa.name, aa.code, aal.code \ ORDER BY aal.code", (tuple(ids), date1, date2)) @@ -101,7 +101,7 @@ class account_analytic_balance(report_sxw.rml_parse): self.acc_data_dict[account_id] = ids else: ids = self.acc_data_dict[account_id] - + query_params = (tuple(ids), date1, date2) if option == "credit" : self.cr.execute("SELECT -sum(amount) FROM account_analytic_line \ diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index bc34008d6f8..2b6d1f3bbed 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -250,7 +250,7 @@ Unit Price - Net Price + Net Price([[ o.pricelist_id.currency_id.code ]]) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index ed2f1859f79..63e3ca791fc 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -76,11 +76,11 @@ Expected Delivery address: [[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']] - [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.title) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.title) or ' ']] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.name) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']] - [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or '']] - [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]] - [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name]] [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]] + [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]] + [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]][[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]] + [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name or removeParentNode('para') ]] + [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]] @@ -89,10 +89,11 @@ [[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]] - [[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] - [[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]] - [[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]] - [[ order.partner_address_id.state_id.code ]] [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.code) or '' ]] + [[ (order.partner_address_id and order.partner_address_id.street) or '']] + [[ (order.partner_address_id.street2) or removeParentNode('para') ]] + [[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]] + [[ (order.partner_address_id.state_id.name) or removeParentNode('para') ]] + [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.name) or '' ]] @@ -146,7 +147,9 @@ - + + + [[ format(order.notes or '') ]] From 7b3a34712a4323d716a8a36c6944dc496e37a751 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 7 Sep 2010 12:10:43 +0530 Subject: [PATCH 005/115] [REM]:stock:removed Location Overview and Packing report. bzr revid: apa@tinyerp.com-20100907064043-9tbfwk4uykloyllh --- addons/stock/report/lot_overview.py | 56 ---- addons/stock/report/lot_overview.rml | 299 ---------------------- addons/stock/report/lot_overview_all.rml | 4 +- addons/stock/report/packing.rml | 310 ----------------------- addons/stock/report/picking.py | 5 +- addons/stock/stock_report.xml | 3 +- 6 files changed, 5 insertions(+), 672 deletions(-) delete mode 100644 addons/stock/report/lot_overview.py delete mode 100644 addons/stock/report/lot_overview.rml delete mode 100644 addons/stock/report/packing.rml diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py deleted file mode 100644 index 9fb88d01791..00000000000 --- a/addons/stock/report/lot_overview.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -import pooler -import time -from report import report_sxw - -class lot_overview(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(lot_overview, self).__init__(cr, uid, name, context=context) - self.price_total = 0.0 - self.grand_total = 0.0 - self.localcontext.update({ - 'time': time, - 'process':self.process, - 'price_total': self._price_total, - 'grand_total_price':self._grand_total, - }) - - def process(self,location_id): - location_obj = pooler.get_pool(self.cr.dbname).get('stock.location') - data = location_obj._product_get_report(self.cr,self.uid, [location_id]) - data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name'] - self.price_total = 0.0 - self.price_total += data['total_price'] - self.grand_total += data['total_price'] - return [data] - - def _price_total(self): - return str( self.price_total) - - def _grand_total(self): - return str( self.grand_total) - -report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview) - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml deleted file mode 100644 index f0495ba99ee..00000000000 --- a/addons/stock/report/lot_overview.rml +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- [[ repeatIn(objects,'o') ]] -
- [[ repeatIn(process(o.id),'ob') ]] - - - - [[ (not ob['product']) and removeParentNode('blockTable') ]] Location - - - Product - - - Variants - - - Amount - - - UoM - - - Unit Price - - - Value - - - - - - - - - - [[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- [[ repeatIn(ob['product'],'p') ]] - - - - - - - - - [[ p['prod_name'] ]] - - - [[ p['variants'] ]] - - - [[ p['prod_qty'] ]] - - - [[ p['uom'] ]] - - - [[ p['price'] ]] - - - [[ p['price_value'] ]] - - - - - - -
- - - - [[ (not ob['product']) and removeParentNode('blockTable') ]] - - - Total: - - - - - - - - - - - - - - - - - - - - - - - [[ price_total() ]] - - - - - - -
- - - -
- - - - - - - Grand Total: - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ grand_total_price() ]] - - - - - - - - diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index 5fb67ca24c1..824b1e7a57c 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -1,6 +1,6 @@ -