From 7ce97c0827e9915bbf2b359d96a739634e023e09 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 25 Oct 2010 15:07:38 +0530 Subject: [PATCH 01/24] remove print bzr revid: apa@tinyerp.com-20101025093738-i4160t6g3jsvmn0v --- bin/report/render/rml2pdf/trml2pdf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 9a79d64d324..c37aff7aab7 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -618,7 +618,6 @@ class _rml_flowable(object): rowheights = [utils.unit_get(f.strip()) for f in node.get('rowHeights').split(',')] if len(rowheights) == 1: rowheights = rowheights[0] - print "Calling table..!!",data table = platypus.LongTable(data = data, colWidths=colwidths, rowHeights=rowheights, **(utils.attr_get(node, ['splitByRow'] ,{'repeatRows':'int','repeatCols':'int'}))) if node.get('style'): table.setStyle(self.styles.table_styles[node.get('style')]) From e8ec3efe69dca9f3ce200e5b36627db95b96b40a Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Tue, 2 Nov 2010 12:34:55 +0530 Subject: [PATCH 02/24] [ADD] account_* : help added for menus bzr revid: vir@tinyerp.com-20101102070455-obn9kosyhajipnur --- addons/account/account_end_fy.xml | 2 +- addons/account/account_view.xml | 1 + addons/account/wizard/account_fiscalyear_close_state.xml | 1 + addons/account/wizard/account_validate_move_view.xml | 1 + addons/account_budget/account_budget_view.xml | 1 + addons/account_payment/account_payment_view.xml | 1 + addons/sale_margin/report/report_margin_view.xml | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml index c25f6d91ba2..fdc624b36ae 100644 --- a/addons/sale_margin/report/report_margin_view.xml +++ b/addons/sale_margin/report/report_margin_view.xml @@ -88,6 +88,7 @@ tree,graph {"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]} + This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for. From 6800b74fb73a217b92d91b8dc1692ad29396dd07 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 2 Nov 2010 13:30:19 +0530 Subject: [PATCH 03/24] [FIX]account:[trunk] accounting - GL report (and others) - repeat column headers lp bug: https://launchpad.net/bugs/645969 fixed bzr revid: apa@tinyerp.com-20101102080019-vnfo4o8me9pwbtne --- bin/report/render/rml2pdf/trml2pdf.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index c37aff7aab7..dc01437ff04 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -645,7 +645,30 @@ class _rml_flowable(object): def _textual_image(self, node): return base64.decodestring(node.text) + def _pto(self, node): + sub_story = [] + pto_header = None + pto_trailer = None + for node in utils._child_get(node, self): + if node.tag == etree.Comment: + node.text = '' + continue + elif node.tag=='pto_header': + pto_header = self.render(node) + elif node.tag=='pto_trailer': + pto_trailer = self.render(node) + else: + flow = self._flowable(node) + if flow: + if isinstance(flow,list): + sub_story = sub_story + flow + else: + sub_story.append(flow) + return platypus.flowables.PTOContainer(sub_story, trailer=pto_trailer, header=pto_header) + def _flowable(self, node, extra_style=None): + if node.tag=='pto': + return self._pto(node) if node.tag=='para': style = self.styles.para_style_get(node) if extra_style: @@ -790,6 +813,7 @@ class _rml_flowable(object): return process_story(node_story) + class EndFrameFlowable(ActionFlowable): def __init__(self,resume=0): ActionFlowable.__init__(self,('frameEnd',resume)) From a36a5cd576a6a73616d2e9e8b1314c9be8aecfa4 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 2 Nov 2010 10:29:54 +0100 Subject: [PATCH 04/24] [IMP] base, res_lang: very small usability improvement in form view (colspan=4 on a separator) bzr revid: qdp-launchpad@tinyerp.com-20101102092954-hk20xruzgnn8m7q4 --- bin/addons/base/res/res_lang_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml index cbe5fb388ba..839915a56a5 100644 --- a/bin/addons/base/res/res_lang_view.xml +++ b/bin/addons/base/res/res_lang_view.xml @@ -76,7 +76,7 @@ - +