clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00378
lp:~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_order_report into lp:openerp-ccorp-addons
Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_order_report into lp:openerp-ccorp-addons.
Requested reviews:
CLEARCORP drivers (clearcorp-drivers)
For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_order_report/+merge/135007
[FIX] Fix mako style for the report purchase_order_repor
--
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-purchase_order_report/+merge/135007
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== removed directory 'account_account_rename'
=== removed file 'account_account_rename/__init__.py'
--- account_account_rename/__init__.py 2012-06-30 22:41:06 +0000
+++ account_account_rename/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Addons modules by CLEARCORP S.A.
-# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_rename
=== removed file 'account_account_rename/__openerp__.py'
--- account_account_rename/__openerp__.py 2012-06-30 22:41:06 +0000
+++ account_account_rename/__openerp__.py 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Addons modules by CLEARCORP S.A.
-# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
- "name" : 'Account object (account.account) rename',
- "version" : '1.0',
- "author" : 'CLEARCORP S.A',
- 'complexity': 'normal',
- "description": """
-This module simply renames the financial account. It makes uses of the company shortcut (provided by "base_company_prefix" module) and the account shortcut field.
-
-The account will appear as:
-CP-CODE SRT2/SRT3/.../SRTn-1/NAME
-
-CP: Company prefix
-CODE: Account code
-SRT2: Account shortcut for the second parent (being the account without parent the first)
-SRTX: Next account shortcuts for the account hierarchy
-NAME: Account name
- """,
- "category": 'Accounting & Finance',
- "sequence": 4,
- "website" : "http://clearcorp.co.cr";,
- "images" : [],
- "icon" : False,
- "depends" : ["account","base_company_prefix"],
- "init_xml" : [],
- "demo_xml" : [],
- "update_xml" : ["account_rename_view.xml"],
- "test" : [],
- "auto_install": False,
- "application": False,
- "installable": True,
-}
\ No newline at end of file
=== removed file 'account_account_rename/account_rename.py'
--- account_account_rename/account_rename.py 2012-06-30 22:41:06 +0000
+++ account_account_rename/account_rename.py 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# account_rename.py
-# account_rename
-# First author: Mag Guevara <mag.guevara@xxxxxxxxxxxxxxx> (ClearCorp S.A.)
-# Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-# conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-# of conditions and the following disclaimer in the documentation and/or other materials
-# provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation are those of the
-# authors and should not be interpreted as representing official policies, either expressed
-# or implied, of ClearCorp S.A..
-#
-##############################################################################
-from osv import osv, fields
-#from tools import debug
-from tools.translate import _
-
-class account_account(osv.osv):
- _name = "account.account"
- _inherit = "account.account"
-
- def name_get(self, cr, uid, ids, context=None):
- if not ids:
- return []
- res = []
- for obj_account in self.browse(cr,uid,ids):
- obj_company = self.pool.get('res.company').browse(cr,uid,obj_account.company_id.id)
- prefix= obj_company.prefix
- if prefix == False:
- prefix = ''
- data = []
- account = obj_account.parent_id
- if account.parent_id:
- while account.parent_id:
- data.insert(0,(account.shortcut or account.name))
- account = account.parent_id
- data.append(obj_account.name)
- data = '/'.join(data)
- data = obj_account.code + ' ' + data
- data = prefix and prefix + '-' + data or data
- else:
- data.append(obj_account.name)
- data = '/'.join(data)
- data = prefix and prefix + ' ' + data or data
- res.append((obj_account.id, data))
- return res
-
- #def _complete_name(self, cr, uid, ids, name, args, context=None):
- #""" Forms complete name of account from parent account to child account.
- #@return: Dictionary of values
- #"""
- #res = {}
- #name_list = self.name_get(cr,uid,ids,context)
- #for name in name_list:
- #res[name[0]] = name[1]
- #return res
- #_columns = {
- #'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Account Name"),
- #}
-
-class account_fiscalyear(osv.osv):
- '''
- Adds up to 16 chars to a Fiscal year code
- '''
- _name = 'account.fiscalyear'
- _inherit = 'account.fiscalyear'
-
- _columns = {
- 'code': fields.char('Code', size=16, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
- }
-
-class account_period(osv.osv):
- '''
- Adds up to 16 chars to a Fiscal year code
- '''
- _name = 'account.period'
- _inherit = 'account.period'
-
- _columns = {
- 'code': fields.char('Code', size=16),
- }
=== removed file 'account_account_rename/account_rename_view.xml'
--- account_account_rename/account_rename_view.xml 2012-06-30 22:41:06 +0000
+++ account_account_rename/account_rename_view.xml 1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<openerp>
- <data>
-
- <!--
- ======================================
- accounts
- ======================================
- -->
-
- <record model = "ir.ui.view" id = "account_rename_tree_view">
- <field name = "name">account.account.tree</field>
- <field name = "model">account.account</field>
- <field name = "type">tree</field>
- <field name="inherit_id" ref="account.view_account_list"/>
- <field name = "arch" type = "xml">
- <data>
- <field name = "name" position = "after">
- <field name = "shortcut"/>
- </field>
- <field name = "company_currency_id" position = "after">
- <field name = "currency_id"/>
- </field>
- </data>
- </field>
- </record>
-
- <record model = "ir.ui.view" id = "account_rename_form_view">
- <field name = "name">account.account.form</field>
- <field name = "model">account.account</field>
- <field name = "type">form</field>
- <field name="inherit_id" ref="account.view_account_form"/>
- <field name = "arch" type = "xml">
- <data>
- <field name = "user_type" position = "after">
- <field name = "shortcut" />
- </field>
- </data>
- </field>
- </record>
- </data>
-</openerp>
-
=== modified file 'purchase_order_ccorp_report/report/purchase_order_report.mako'
--- purchase_order_ccorp_report/report/purchase_order_report.mako 2012-11-16 22:32:17 +0000
+++ purchase_order_ccorp_report/report/purchase_order_report.mako 2012-11-19 21:15:27 +0000
@@ -23,9 +23,11 @@
<tr>
<td>${_("Order date: ")}${(purchase_order.date_order and formatLang(purchase_order.date_order,date=True)) or '-'|entity} </td>
</tr>
- <tr>
- <td>${_("Validated by: ")}:${purchase_order.validator.name or ''|entity}</td>
- </tr>
+ %if purchase_order.state != 'draft' :
+ <tr>
+ <td>${_("Validated by: ")}:${purchase_order.validator.name or ''|entity}</td>
+ </tr>
+ %endif
<tr>
<td>${_("Ref.")}: ${purchase_order.partner_ref != "" and purchase_order.partner_ref or '-'|entity}</td>
</tr>
@@ -100,8 +102,9 @@
<br>
<br>
<table id="responsibles_table">
- <tr><td style="border-top:1px solid"><b>${_("Validated by")}:</b> ${purchase_order.validator.name}</td><td style="border-style:none"/><td style="border-top:1px solid"><b>${_("Authorized by")}:_________________</b></td></tr>
- <!--<tr><td style="border-style:none"> ${company.sale_order_footer}</td><td style="border-style:none"/></tr>-->
+ %if purchase_order.state != 'draft' :
+ <tr><td style="border-top:1px solid"><b>${_("Validated by")}:</b> ${purchase_order.validator.name}</td><td style="border-style:none"/><td style="border-top:1px solid"><b>${_("Authorized by")}:_________________</b></td></tr>
+ %endif
</table>
</div>
<p style="page-break-after:always"></p>
