odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merging from the trunk 

bzr revid: mga@mga-laptop-20081104062128-7ju0e35r8i8lhwbr
This commit is contained in:
Mantavya Gajjar 2008-11-04 11:51:28 +05:30
parent 4c8838b8ff da8aa7411a
commit b01b84a4d6
911 changed files with 34382 additions and 30924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/account/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

37
addons/account/__terp__.py
View File

@ -1,31 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
###############################################################################
{ {
"name" : "Accounting and financial management", "name" : "Accounting and financial management",
"version" : "1.0", "version" : "1.0",
@ -50,9 +43,9 @@
"account_unit_test.xml", "account_unit_test.xml",
], ],
"update_xml" : [ "update_xml" : [
"account_menuitem.xml",
"security/account_security.xml", "security/account_security.xml",
"security/ir.model.access.csv", "security/ir.model.access.csv",
"account_menuitem.xml",
"account_wizard.xml", "account_wizard.xml",
"account_view.xml", "account_view.xml",
"account_end_fy.xml", "account_end_fy.xml",

65
addons/account/account.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
import time import time
@ -42,7 +34,7 @@ class account_payment_term(osv.osv):
_name = "account.payment.term" _name = "account.payment.term"
_description = "Payment Term" _description = "Payment Term"
_columns = { _columns = {
'name': fields.char('Payment Term', size=32, translate=True), 'name': fields.char('Payment Term', size=32, translate=True, required=True),
'active': fields.boolean('Active'), 'active': fields.boolean('Active'),
'note': fields.text('Description', translate=True), 'note': fields.text('Description', translate=True),
'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'), 'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
@ -86,7 +78,7 @@ class account_payment_term_line(osv.osv):
'value': fields.selection([('procent','Percent'),('balance','Balance'),('fixed','Fixed Amount')], 'Value',required=True), 'value': fields.selection([('procent','Percent'),('balance','Balance'),('fixed','Fixed Amount')], 'Value',required=True),
'value_amount': fields.float('Value Amount'), 'value_amount': fields.float('Value Amount'),
'days': fields.integer('Number of Days',required=True, help="Number of days to add before computation of the day of month."), 'days': fields.integer('Number of Days',required=True, help="Number of days to add before computation of the day of month."),
'days2': fields.integer('Day of the Month',required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month."), 'days2': fields.integer('Day of the Month',required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the end of the month)."),
'payment_id': fields.many2one('account.payment.term','Payment Term', required=True, select=True), 'payment_id': fields.many2one('account.payment.term','Payment Term', required=True, select=True),
} }
_defaults = { _defaults = {
@ -456,7 +448,9 @@ class account_journal(osv.osv):
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want that new account moves pass through the \'draft\' state and goes direclty to the \'posted state\' without any manual validation.'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want that new account moves pass through the \'draft\' state and goes direclty to the \'posted state\' without any manual validation.'),
'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
} }
_defaults = { _defaults = {
'active': lambda *a: 1, 'active': lambda *a: 1,
'user_id': lambda self,cr,uid,context: uid, 'user_id': lambda self,cr,uid,context: uid,
@ -665,6 +659,15 @@ class account_move(osv.osv):
return periods[0] return periods[0]
else: else:
return False return False
def _amount_compute(self, cr, uid, ids, name, args, context, where =''):
if not ids: return {}
cr.execute('select move_id,sum(debit) from account_move_line where move_id in ('+','.join(map(str,ids))+') group by move_id')
result = dict(cr.fetchall())
for id in ids:
result.setdefault(id, 0.0)
return result
_columns = { _columns = {
'name': fields.char('Entry Name', size=64, required=True), 'name': fields.char('Entry Name', size=64, required=True),
'ref': fields.char('Ref', size=64), 'ref': fields.char('Ref', size=64),
@ -673,6 +676,8 @@ class account_move(osv.osv):
'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True), 'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True),
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Be Verified'), 'to_check': fields.boolean('To Be Verified'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,2), store=True),
} }
_defaults = { _defaults = {
'state': lambda *a: 'draft', 'state': lambda *a: 'draft',
@ -1056,7 +1061,7 @@ class account_tax_code(osv.osv):
_rec_name = 'code' _rec_name = 'code'
_columns = { _columns = {
'name': fields.char('Tax Case Name', size=64, required=True), 'name': fields.char('Tax Case Name', size=64, required=True),
'code': fields.char('Case Code', size=16), 'code': fields.char('Case Code', size=64),
'info': fields.text('Description'), 'info': fields.text('Description'),
'sum': fields.function(_sum, method=True, string="Year Sum"), 'sum': fields.function(_sum, method=True, string="Year Sum"),
'sum_period': fields.function(_sum_period, method=True, string="Period Sum"), 'sum_period': fields.function(_sum_period, method=True, string="Period Sum"),
@ -1565,7 +1570,6 @@ class account_config_wizard(osv.osv_memory):
'date1': lambda *a: time.strftime('%Y-01-01'), 'date1': lambda *a: time.strftime('%Y-01-01'),
'date2': lambda *a: time.strftime('%Y-12-31'), 'date2': lambda *a: time.strftime('%Y-12-31'),
'period':lambda *a:'month', 'period':lambda *a:'month',
'charts': lambda *a: -1,
} }
def action_cancel(self,cr,uid,ids,conect=None): def action_cancel(self,cr,uid,ids,conect=None):
return { return {
@ -1706,7 +1710,7 @@ class account_tax_code_template(osv.osv):
_rec_name = 'code' _rec_name = 'code'
_columns = { _columns = {
'name': fields.char('Tax Case Name', size=64, required=True), 'name': fields.char('Tax Case Name', size=64, required=True),
'code': fields.char('Case Code', size=16), 'code': fields.char('Case Code', size=64),
'info': fields.text('Description'), 'info': fields.text('Description'),
'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Childs Codes'), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Childs Codes'),
@ -1861,8 +1865,14 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'code_digits':fields.integer('# of Digits',required=True,help="No. of Digits to use for account code"), 'code_digits':fields.integer('# of Digits',required=True,help="No. of Digits to use for account code"),
} }
def _get_chart(self, cr, uid, context={}):
ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
if ids:
return ids[0]
return False
_defaults = { _defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id, 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
'chart_template_id': _get_chart,
'code_digits': lambda *a:6, 'code_digits': lambda *a:6,
} }
@ -1939,6 +1949,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
self.pool._init = True self.pool._init = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id])]) children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id])])
children_acc_template.sort()
for account_template in obj_acc_template.browse(cr, uid, children_acc_template): for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
tax_ids = [] tax_ids = []
for tax in account_template.tax_ids: for tax in account_template.tax_ids:
@ -1950,7 +1961,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
code_acc = account_template.code code_acc = account_template.code
if code_main<=dig and account_template.type != 'view': if code_main<=dig and account_template.type != 'view':
code_acc=str(code_acc) + (str('0'*(dig-code_main))) code_acc=str(code_acc) + (str('0'*(dig-code_main)))
vals={ vals={
'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name, 'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
#'sign': account_template.sign, #'sign': account_template.sign,
@ -1967,7 +1977,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
} }
new_account = obj_acc.create(cr,uid,vals) new_account = obj_acc.create(cr,uid,vals)
acc_template_ref[account_template.id] = new_account acc_template_ref[account_template.id] = new_account
#reactivate the parent_store functionnality on account_account #reactivate the parent_store functionnality on account_account
self.pool._init = False self.pool._init = False
self.pool.get('account.account')._parent_store_compute(cr) self.pool.get('account.account')._parent_store_compute(cr)

35
addons/account/account_analytic_line.py
View File

@ -1,31 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/account_bank_statement.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
import time import time

8
addons/account/account_invoice_view.xml
View File

@ -150,7 +150,7 @@
<field name="check_total" required="2"/> <field name="check_total" required="2"/>
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/> <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1"> <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
<tree string="Invoice lines"> <tree string="Invoice lines" editable="top">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)"/> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2"/> <field name="invoice_line_tax_id" view_mode="2"/>
@ -239,6 +239,9 @@
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/> <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/> <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
<field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
<field name="period_id"/>
<label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Invoice"> <page string="Invoice">
@ -284,9 +287,6 @@
<field name="origin" select="2"/> <field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/> <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field name="move_id"/> <field name="move_id"/>
<field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
<field name="period_id"/>
<label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
<separator colspan="4" string="Additionnal Information"/> <separator colspan="4" string="Additionnal Information"/>
<field colspan="4" name="comment" nolabel="1"/> <field colspan="4" name="comment" nolabel="1"/>
</page> </page>

7
addons/account/account_menuitem.xml
View File

@ -12,10 +12,13 @@
<menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/> <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
<menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/> <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
<menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/> <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"
groups="group_account_user"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/> <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/> <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance"
sequence="3"
groups="group_account_user"/>
<menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/> <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
</data> </data>

34
addons/account/account_move_line.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

56
addons/account/account_report.xml
View File

@ -5,9 +5,9 @@
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner Ledger"/> <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner Ledger"/>
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/> <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
<report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner Balance"/> <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner Balance"/>
<report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Print Central Journal"/> <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Central Journal"/>
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="Print General Journal"/> <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="General Journal"/>
<report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Print Journal"/> <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal"/>
<report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/> <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
<report auto="False" id="account_invoices" model="account.invoice" name="account.invoice" rml="account/report/invoice.rml" string="Invoices" attachment="print-"/> <report auto="False" id="account_invoices" model="account.invoice" name="account.invoice" rml="account/report/invoice.rml" string="Invoices" attachment="print-"/>
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/> <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
@ -17,23 +17,23 @@
<report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes Report"/> <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes Report"/>
<menuitem <menuitem
id="menu_tax_report" id="menu_tax_report"
name="Taxes Reports" name="Taxes Reports"
parent="account.menu_finance_reporting"/> parent="account.menu_finance_reporting"/>
<wizard <wizard
id="wizard_vat_declaration" id="wizard_vat_declaration"
menu="False" menu="False"
model="account.tax.code" model="account.tax.code"
name="account.vat.declaration" name="account.vat.declaration"
string="Print Taxes Report"/> string="Print Taxes Report"/>
<menuitem <menuitem
icon="STOCK_PRINT" icon="STOCK_PRINT"
action="wizard_vat_declaration" action="wizard_vat_declaration"
id="menu_wizard_vat_declaration" id="menu_wizard_vat_declaration"
parent="menu_tax_report" parent="menu_tax_report"
type="wizard"/> type="wizard"/>
<record id="action_tax_code_tree" model="ir.actions.act_window"> <record id="action_tax_code_tree" model="ir.actions.act_window">
@ -43,20 +43,20 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="view_id" ref="view_tax_code_tree"/> <field name="view_id" ref="view_tax_code_tree"/>
</record> </record>
<menuitem <menuitem
action="action_tax_code_tree" action="action_tax_code_tree"
id="menu_action_tax_code_tree" id="menu_action_tax_code_tree"
parent="menu_tax_report" parent="menu_tax_report"
sequence="12"/> sequence="12"/>
<!-- <!--
<report id="analytic_journal" <report id="analytic_journal"
string="Analytic journal" string="Analytic journal"
model="account.analytic.account" model="account.analytic.account"
name="account.analytic.journal" name="account.analytic.journal"
xml="account/report/analytic_journal.rml" xml="account/report/analytic_journal.rml"
auto="False" /> auto="False" />
--> -->
</data> </data>
</openerp> </openerp>

158
addons/account/account_view.xml
View File

@ -236,6 +236,7 @@
<tree string="Account Journal"> <tree string="Account Journal">
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
<field name="company_id"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -465,6 +466,8 @@
<field name="name"/> <field name="name"/>
<field name="period_id"/> <field name="period_id"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="partner_id"/>
<field name="amount"/>
<field name="state"/> <field name="state"/>
</tree> </tree>
</field> </field>
@ -714,9 +717,9 @@
<field colspan="4" name="analytic_lines" nolabel="1"/> <field colspan="4" name="analytic_lines" nolabel="1"/>
</page> </page>
<page string="Move Lines"> <page string="Move Lines">
<field colspan="4" name="reconcile_implicit"/> <field colspan="4" name="reconcile_implicit"/>
<field colspan="4" name="parent_move_lines" nolabel="0"/> <field colspan="4" name="parent_move_lines" nolabel="0"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -756,7 +759,7 @@
<newline/> <newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/> <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id"/> <field name="analytic_account_id"/>
<field colspan="4" name="reconcile_implicit"/> <field colspan="4" name="reconcile_implicit"/>
<separator colspan="4" string="State"/> <separator colspan="4" string="State"/>
<newline/> <newline/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
@ -807,11 +810,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Entry"> <form string="Account Entry">
<separator colspan="4" string="General Information"/> <separator colspan="4" string="General Information"/>
<group colspan="4" col="6">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="ref" select="1"/>
<field name="period_id" select="2"/> <field name="period_id" select="2"/>
<field name="journal_id" select="1"/> <field name="journal_id" select="1"/>
<field name="to_check" select="2"/> <field name="partner_id" select="2"/>
<field name="amount" select="2"/>
<field name="ref" select="1" groups="base.group_extended"/>
<field name="to_check" select="2" groups="base.group_extended"/>
</group>
<separator colspan="4" string="Entry Lines"/> <separator colspan="4" string="Entry Lines"/>
<field colspan="4" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }"> <field colspan="4" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
@ -871,7 +878,7 @@
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/> <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/>
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/> <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window"> <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
<field name="name">Entries Encoding by Move</field> <field name="name">Entries Encoding by Move</field>
<field name="res_model">account.move</field> <field name="res_model">account.move</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -969,13 +976,31 @@
<field name="view_mode">form,tree</field> <field name="view_mode">form,tree</field>
<field name="view_id" ref="view_bank_statement_reconcile_form"/> <field name="view_id" ref="view_bank_statement_reconcile_form"/>
</record> </record>
<menuitem id="next_id_30" name="Bank Reconciliation" parent="account.menu_finance_periodical_processing"/><menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/> <menuitem
id="next_id_30"
name="Bank Reconciliation"
parent="account.menu_finance_periodical_processing"
groups="group_account_user"/>
<menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
<wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
<menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/> <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
<act_window domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/> <act_window
domain="[('account_id', '=', active_id)]"
id="act_account_acount_move_line_open"
name=""
context="{'account_id': active_id}"
res_model="account.move.line"
src_model="account.account"/>
<act_window domain="[('account_id', '=', active_id),('reconcile_id','=',False)]" id="act_account_acount_move_line_open_unreconciled" name="Unreconciled entries" res_model="account.move.line" src_model="account.account"/> <act_window
domain="[('account_id', '=', active_id),('reconcile_id','=',False)]"
id="act_account_acount_move_line_open_unreconciled"
name="Unreconciled entries"
res_model="account.move.line"
context="{'account_id': active_id}"
src_model="account.account"/>
<act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/> <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
@ -1261,7 +1286,7 @@
</record> </record>
<record id="action_move_line_tree1" model="ir.actions.act_window"> <record id="action_move_line_tree1" model="ir.actions.act_window">
<field name="name">Entries</field> <field name="name" eval="False"/>
<field name="res_model">account.move.line</field> <field name="res_model">account.move.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
@ -1347,13 +1372,13 @@
<field name="code"/> <field name="code"/>
<field name="date1"/> <field name="date1"/>
<field name="date2"/> <field name="date2"/>
<field name="period" colspan="4"/> <field name="period" colspan="4"/>
<separator col="4" colspan="4" string="Select Chart of Accounts"/> <separator col="4" colspan="4" string="Select Chart of Accounts"/>
<field name="charts"/> <field name="charts"/>
<separator string="" colspan="4"/> <separator string="" colspan="4"/>
<label string="" colspan="2"/> <label string="" colspan="2"/>
<group col="2" colspan="2"> <group col="2" colspan="2">
<button icon="gtk-cancel" special="cancel" string="Don't Continue" name="action_cancel" type="object"/> <button icon="gtk-cancel" special="cancel" string="Skip" name="action_cancel" type="object"/>
<button icon="gtk-ok" name="action_create" string="Continue" type="object"/> <button icon="gtk-ok" name="action_create" string="Continue" type="object"/>
</group> </group>
</form> </form>
@ -1414,17 +1439,17 @@
</field> </field>
</record> </record>
<record id="view_account_template_tree" model="ir.ui.view"> <record id="view_account_template_tree" model="ir.ui.view">
<field name="name">account.account.template.tree</field> <field name="name">account.account.template.tree</field>
<field name="model">account.account.template</field> <field name="model">account.account.template</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Account Template"> <tree string="Account Template">
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_account_template_form" model="ir.actions.act_window"> <record id="action_account_template_form" model="ir.actions.act_window">
<field name="name">Account Templates</field> <field name="name">Account Templates</field>
@ -1524,8 +1549,8 @@
<page groups="base.group_extended" string="Special Computation"> <page groups="base.group_extended" string="Special Computation">
<separator colspan="4" string="Compute Code (if type=code)"/> <separator colspan="4" string="Compute Code (if type=code)"/>
<field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/> <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
<separator colspan="4" string="Compute Code for Taxes included prices"/> <separator colspan="4" string="Compute Code for Taxes included prices"/>
<field colspan="4" name="python_compute_inv" nolabel="1"/> <field colspan="4" name="python_compute_inv" nolabel="1"/>
<separator colspan="4" string="Applicable Code (if type=code)"/> <separator colspan="4" string="Applicable Code (if type=code)"/>
<field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/> <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>
</page> </page>
@ -1553,8 +1578,8 @@
<menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="next_id_27" sequence="13"/> <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="next_id_27" sequence="13"/>
<!-- Account Tax Code Templates --> <!-- Account Tax Code Templates -->
<record id="view_tax_code_template_tree" model="ir.ui.view"> <record id="view_tax_code_template_tree" model="ir.ui.view">
<field name="name">account.tax.code.template.tree</field> <field name="name">account.tax.code.template.tree</field>
<field name="model">account.tax.code.template</field> <field name="model">account.tax.code.template</field>
<field name="type">tree</field> <field name="type">tree</field>
@ -1592,50 +1617,51 @@
<menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="next_id_27" sequence="14"/> <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="next_id_27" sequence="14"/>
<!-- Wizard for Multi Charts of Accounts --> <!-- Wizard for Multi Charts of Accounts -->
<record id="view_wizard_multi_chart" model="ir.ui.view"> <record id="view_wizard_multi_chart" model="ir.ui.view">
<field name="name">Generate Chart of Accounts from a Chart Template</field> <field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="model">wizard.multi.charts.accounts</field> <field name="model">wizard.multi.charts.accounts</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Generate Chart of Accounts from a Chart Template"> <form string="Generate Chart of Accounts from a Chart Template">
<separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/> <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
<field name="company_id" /> <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
<field name="company_id" />
<field name ="code_digits" /> <field name ="code_digits" />
<field name="chart_template_id" colspan="4"/> <field name="chart_template_id" colspan="4"/>
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list"> <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
<form string="Bank Information"> <form string="Bank Information">
<field name="acc_no"/> <field name="acc_no"/>
<field name="currency_id"/> <field name="currency_id"/>
</form> </form>
<tree editable="bottom" string="Bank Information"> <tree editable="bottom" string="Bank Information">
<field name="acc_no"/> <field name="acc_no"/>
<field name="currency_id"/> <field name="currency_id"/>
</tree> </tree>
</field> </field>
<separator string="" colspan="4"/> <separator string="" colspan="4"/>
<label string="" colspan="2"/> <label string="" colspan="2"/>
<group col="2" colspan="2"> <group col="2" colspan="2">
<button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
<button icon="gtk-ok" name="action_create" string="Create" type="object"/> <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_wizard_multi_chart" model="ir.actions.act_window"> <record id="action_wizard_multi_chart" model="ir.actions.act_window">
<field name="name">Generate Chart of Accounts from a Chart Template</field> <field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">wizard.multi.charts.accounts</field> <field name="res_model">wizard.multi.charts.accounts</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem parent="account.account_account_menu" action="action_wizard_multi_chart" id="menu_wizard"/> <menuitem parent="account.account_account_menu" action="action_wizard_multi_chart" id="menu_wizard"/>
<record id="account_account_graph" model="ir.ui.view"> <record id="account_account_graph" model="ir.ui.view">
<field name="name">account.account.graph</field> <field name="name">account.account.graph</field>
<field name="model">account.account</field> <field name="model">account.account</field>
<field name="type">graph</field> <field name="type">graph</field>

2
addons/account/account_wizard.xml
View File

@ -76,6 +76,8 @@
<wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/> <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
<menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/> <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
<wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>
<!-- account.invoice --> <!-- account.invoice -->
<wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/> <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>

6
addons/account/demo/account_minimal.xml
View File

@ -162,7 +162,7 @@ your own chart of account.
--> -->
<record id="sales_journal" model="account.journal"> <record id="sales_journal" model="account.journal">
<field name="name">Sales Journal</field> <field name="name">x Sales Journal</field>
<field name="code">SAJ</field> <field name="code">SAJ</field>
<field name="type">sale</field> <field name="type">sale</field>
<field name="view_id" ref="account_journal_view"/> <field name="view_id" ref="account_journal_view"/>
@ -172,7 +172,7 @@ your own chart of account.
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
</record> </record>
<record id="expenses_journal" model="account.journal"> <record id="expenses_journal" model="account.journal">
<field name="name">Expenses Journal</field> <field name="name">x Expenses Journal</field>
<field name="code">EXJ</field> <field name="code">EXJ</field>
<field name="type">purchase</field> <field name="type">purchase</field>
<field name="view_id" ref="account_journal_view"/> <field name="view_id" ref="account_journal_view"/>
@ -183,7 +183,7 @@ your own chart of account.
</record> </record>
<record id="bank_journal" model="account.journal"> <record id="bank_journal" model="account.journal">
<field name="name">Bank Journal</field> <field name="name">x Bank Journal</field>
<field name="code">BNK</field> <field name="code">BNK</field>
<field name="type">cash</field> <field name="type">cash</field>
<field name="view_id" ref="account_journal_bank_view"/> <field name="view_id" ref="account_journal_bank_view"/>

3401
addons/account/i18n/fr_FR.po
View File

File diff suppressed because it is too large Load Diff

44
addons/account/invoice.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -79,8 +71,7 @@ class account_invoice(osv.osv):
def _get_journal_analytic(self, cr, uid, type_inv, context={}): def _get_journal_analytic(self, cr, uid, type_inv, context={}):
type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'} type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
tt = type2journal.get(type_inv, 'sale') tt = type2journal.get(type_inv, 'sale')
cr.execute("select id from account_analytic_journal where type=%s limit 1", (tt,)) result = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=',tt)], context=context)
result = cr.fetchone()
if not result: if not result:
raise osv.except_osv(_('No Analytic Journal !'),("You have to define an analytic journal of type '%s' !") % (tt,)) raise osv.except_osv(_('No Analytic Journal !'),("You have to define an analytic journal of type '%s' !") % (tt,))
return result[0] return result[0]
@ -194,7 +185,7 @@ class account_invoice(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True),
'check_total': fields.float('Total', digits=(16,2), states={'open':[('readonly',True)],'close':[('readonly',True)]}), 'check_total': fields.float('Total', digits=(16,2), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean', help="The account moves of the invoice have been reconciled with account moves of the payment(s)."), 'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean', store=True, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."),
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account', 'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
help='The bank account to pay to or to be paid from'), help='The bank account to pay to or to be paid from'),
'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'), 'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
@ -851,13 +842,12 @@ class account_invoice_line(osv.osv):
return {'domain':{'product_uom':[]}} return {'domain':{'product_uom':[]}}
else: else:
return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}} return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
lang=False part = self.pool.get('res.partner').browse(cr, uid, partner_id)
lang=part.lang
context.update({'lang': lang}) context.update({'lang': lang})
res = self.pool.get('product.product').browse(cr, uid, product, context=context) res = self.pool.get('product.product').browse(cr, uid, product, context=context)
taxep=None taxep=None
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
tax_obj = self.pool.get('account.tax') tax_obj = self.pool.get('account.tax')
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
if type in ('out_invoice', 'out_refund'): if type in ('out_invoice', 'out_refund'):
tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, res.taxes_id) tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, res.taxes_id)
else: else:

34
addons/account/partner.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/product.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

38
addons/account/project/project.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -166,7 +158,9 @@ class account_analytic_account(osv.osv):
'type' : lambda *a : 'normal', 'type' : lambda *a : 'normal',
'company_id': _default_company, 'company_id': _default_company,
'state' : lambda *a : 'draft', 'state' : lambda *a : 'draft',
'user_id' : lambda self,cr,uid,ctx : uid 'user_id' : lambda self,cr,uid,ctx : uid,
'partner_id': lambda self,cr, uid, ctx: ctx.get('partner_id', False),
'contact_id': lambda self,cr, uid, ctx: ctx.get('contact_id', False),
} }
def check_recursion(self, cr, uid, ids, parent=None): def check_recursion(self, cr, uid, ids, parent=None):

3
addons/account/project/project_view.xml
View File

@ -60,7 +60,8 @@
<newline/> <newline/>
<field name="quantity_max"/> <field name="quantity_max"/>
<field name="user_id"/> <field name="user_id"/>
<separator colspan="4" string="Note"/> </page>
<page string="Description">
<field colspan="4" name="description" nolabel="1"/> <field colspan="4" name="description" nolabel="1"/>
</page> </page>
</notebook> </notebook>

34
addons/account/project/report/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/account_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/analytic_balance.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting FROM its eventual inadequacies AND bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/analytic_check.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting FROM its eventual inadequacies AND bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/analytic_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
import time import time

34
addons/account/project/report/cost_ledger.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting FROM its eventual inadequacies AND bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/inverted_analytic_balance.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting FROM its eventual inadequacies AND bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/report/quantity_cost_ledger.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting FROM its eventual inadequacies AND bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_analytic_check.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_balance_report.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_journal_report.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/project/wizard/wizard_account_analytic_line.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/report/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

37
addons/account/report/account_balance.py
View File

@ -1,29 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -162,6 +155,7 @@ class account_balance(report_sxw.rml_parse):
'credit1':'', 'credit1':'',
'balance1' :'', 'balance1' :'',
'id' : account.id, 'id' : account.id,
'type' : account.type,
'code': account.code, 'code': account.code,
'name': account.name, 'name': account.name,
'level': level, 'level': level,
@ -224,6 +218,7 @@ class account_balance(report_sxw.rml_parse):
for r in res: for r in res:
sum = r['debit1'] - r['credit1'] sum = r['debit1'] - r['credit1']
r['balance1'] = sum r['balance1'] = sum
r['type']= ''
r['id'] ='' r['id'] =''
r['code']= '' r['code']= ''
r['name']='' r['name']=''

353
addons/account/report/account_balance.rml
View File

@ -2,7 +2,7 @@
<document filename="test.pdf"> <document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first"> <pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="700"/> <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
<pageGraphics> <pageGraphics>
<setFont name="Helvetica-Bold" size="9"/> <setFont name="Helvetica-Bold" size="9"/>
@ -19,239 +19,157 @@
<lineMode width="0.7"/> <lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines> <lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/> <setFont name="Helvetica" size="8"/>
</pageGraphics> </pageGraphics>
</pageTemplate> </pageTemplate>
</template> </template>
<stylesheet> <stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1"> <blockTableStyle id="Table1">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> <blockAlignment value="LEFT"/>
<blockLeftPadding length="0" start="0,0" stop="1,0"/> <blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<blockBackground colorName="#e6e6e6" start="0,1" stop="0,-1"/>
<blockBackground colorName="#e6e6e6" start="1,1" stop="1,-1"/>
<blockBackground colorName="#e6e6e6" start="2,1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="Table2"> <blockTableStyle id="Table2">
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockValign value="TOP"/> <blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/> <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#FFFFFF" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#FFFFFF" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#FFFFFF" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#FFFFFF" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#FFFFFF" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#FFFFFF" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#FFFFFF" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#FFFFFF" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#FFFFFF" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#FFFFFF" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#FFFFFF" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#FFFFFF" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#FFFFFF" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<initialize> <initialize>
<paraStyle name="all" alignment="justify"/> <paraStyle name="all" alignment="justify"/>
</initialize> </initialize>
<paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/> <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
<paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="12" leftIndent="-5.0"/> <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
<paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
<paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/> <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
<paraStyle name="P12a" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P9b" fontName="Helvetica" fontSize="8" leftIndent="-5.0" alignment="LEFT"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="5" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<blockTableStyle id="TrLevel8"> <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel7">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel6"> <blockTableStyle id="TrLevel6">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel5">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel4">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel3">
<lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="1,0"/>
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel2">
<lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="-1,0"/>
<blockLeftPadding length="0" start="0,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel1">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<blockLeftPadding length="0" start="0,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name8">
<blockLeftPadding length="100" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name7">
<blockLeftPadding length="80" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name6">
<blockLeftPadding length="60" start="1,0" stop="1,0"/> <blockLeftPadding length="60" start="1,0" stop="1,0"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="TrLevel_Name5"> <blockTableStyle id="TrLevel5">
<blockLeftPadding length="40" start="1,0" stop="1,0"/> <blockLeftPadding length="40" start="1,0" stop="1,0"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="TrLevel_Name4"> <blockTableStyle id="TrLevel4">
<blockLeftPadding length="20" start="1,0" stop="1,0"/> <blockLeftPadding length="20" start="1,0" stop="1,0"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="TrLevel_Name3"> <blockTableStyle id="TrLevel3">
<blockLeftPadding length="0" start="1,0" stop="1,0"/> <blockLeftPadding length="0" start="1,0" stop="1,0"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="TrLevel_Name2"> <blockTableStyle id="TrLevel2">
<blockLeftPadding length="0" start="1,0" stop="1,0"/> <blockLeftPadding length="0" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="1,0"/>
<blockTopPadding length="13" start="0,0" stop="-1,0"/>
<blockBottomPadding length="2" start="0,0" stop="-1,0"/>
<blockFont name="Times-Bold" start="0,0" stop="-1,-1"/>
</blockTableStyle> </blockTableStyle>
<blockTableStyle id="TrLevel_Name1"> <blockTableStyle id="TrLevel1">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<blockLeftPadding length="0" start="1,0" stop="1,0"/> <blockLeftPadding length="0" start="1,0" stop="1,0"/>
<blockTopPadding length="26" start="0,0" stop="-1,0"/>
<blockBottomPadding length="2" start="0,0" stop="-1,0"/>
<blockFont name="Times-Bold" start="0,0" stop="-1,-1"/>
</blockTableStyle> </blockTableStyle>
<paraStyle
name="Level8"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Level7"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Level6"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle <paraStyle
name="Level5" name="Level5"
fontName="Helvetica-Bold" fontName="Helvetica"
fontSize="8.0" /> fontSize="8.0" />
<paraStyle <paraStyle
name="Level4" name="Level4"
fontName="Helvetica-Bold" fontName="Helvetica"
fontSize="8.0" /> fontSize="8.0" />
<paraStyle <paraStyle
name="Level3" name="Level3"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Level2"
firstLineIndent="-0.03cm"
fontName="Helvetica-Bold" fontName="Helvetica-Bold"
fontSize="8.0" /> fontSize="8.0" />
<paraStyle name="Level2" <paraStyle name="Level1"
fontSize="8.0" fontSize="8.0"
fontName="Helvetica-Bold" fontName="Helvetica-Bold"
/> />
<paraStyle name="Level1" <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
fontSize="8.0" <paraStyle name="Index" fontName="Helvetica"/>
fontName="Helvetica-Bold"
/>
<paraStyle
name="Amt_Level8"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Amt_Level7"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Amt_Level6"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Amt_Level5"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Amt_Level4"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Amt_Level3"
fontName="Helvetica-Bold"
fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Amt_Level2"
fontSize="8.0"
fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
/>
<paraStyle name="Amt_Level1"
fontSize="8.0"
fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
/>
<paraStyle
name="Det_Level8"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle
name="Det_Level7"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle
name="Det_Level6"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle
name="Det_Level5"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle
name="Det_Level4"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle
name="Det_Level3"
fontName="Times-Italic"
fontSize="8.0" leading="5"/>
<paraStyle name="Det_Level2"
fontSize="8.0" leading="5"
fontName="Times-Italic"
/>
<paraStyle name="Det_Level1"
fontSize="8.0" leading="5"
fontName="Times-Italic"
/>
<paraStyle
name="Det_Amt_Level8"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Det_Amt_Level7"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Det_Amt_Level6"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Det_Amt_Level5"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Det_Amt_Level4"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle
name="Det_Amt_Level3"
fontName="Times-Italic"
fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Det_Amt_Level2"
fontSize="8.0"
fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
/>
<paraStyle name="Det_Amt_Level1"
fontSize="8.0"
fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
/>
</stylesheet> </stylesheet>
<images/> <images/>
<story> <story>
<blockTable colWidths="527.00" style="Table4" repeatRows="1">
<tr>
<td>
<para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('tr') ]]:</para>
<para style="P9b"><i> [[ get_periods(data['form']) or removeParentNode('tr') ]]</i></para>
</td>
</tr>
</blockTable>
<para style="P2"> <para style="P2">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<blockTable colWidths="50.0,248.0,73.0,72.0,87.0" style="Table1" repeatRows="1"> <para style="P2">
<font color="white"> </font>
</para>
<blockTable colWidths="527.00" style="Table4" repeatRows="1">
<tr>
<td>
<para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:</para>
<para style="P9b"><i> [[ get_periods(data['form']) or removeParentNode('para') ]]</i></para>
</td>
</tr>
</blockTable>
<para style="P2">
<font color="white"> </font>
</para>
<blockTable colWidths="46,278.0,73.0,72.0,82.0" style="Table2" repeatRows="1">
<tr> <tr>
<td> <td>
<para style="P12a">Code</para> <para style="P12a">Code</para>
@ -269,36 +187,27 @@
<para style="P10">Balance</para> <para style="P10">Balance</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<i>[[ a['code'] or removeParentNode('tr') ]]</i></para></td>
<blockTable colWidths="50.0,248.0,73.0,72.0,82.0" style="Table3"> <td>
<para style="P2">[[ repeatIn(lines(data['form']), 'a') ]]</para>
<tr> <para style="P14">[[ setTag('tr','tr',{'style':'TrLevel'+str(a['level']), 'paraStyle':('Level'+str(a['level']))}) ]]<font></font>
<td><para style="P14">[[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]]<i>[[ a['code'] or removeParentNode('tr') ]]</i></para></td> [[ a['name'] ]]</para>
<td><para style="P14">[[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]]</para></td> </td>
<td> <td>
<para style="P3"><font><u>[[ a['level']&gt;3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]]</u></font> <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['debit'] and formatLang(a['debit']) or '0.00' ]]</font>
<font>[[ a['level']&lt;4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]]</font></para> <font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['debit'] and formatLang(a['debit']) or '0.00' ]]</u></font></para>
</td> </td>
<td> <td>
<para style="P3"><font><u>[[ a['level']&gt;3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]]</u></font> <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['credit'] and formatLang(a['credit']) or '0.00' ]]</font>
<font>[[ a['level']&lt;4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]]</font></para> <font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['credit'] and formatLang(a['credit']) or '0.00' ]]</u></font></para>
</td> </td>
<td> <td>
<para style="P3"><font><u>[[ a['level']&gt;3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]]</u></font> <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['balance'] and formatLang(a['balance']) or '0.00' ]]</font>
<font>[[ a['level']&lt;4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]]</font></para> <font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['balance'] and formatLang(a['balance']) or '0.00' ]]</u></font></para>
</td> </td>
</tr> </tr>
<tr> </blockTable>
<td><para style="P14">[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]]</para></td> </story>
<td><para style="P14">[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]]<font>[ref: [[ a['ref'] or removeParentNode('font') ]] ]</font> [[ a['lname'] ]]</para></td>
<td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']]</para></td>
<td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']]</para></td>
<td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]]</para></td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
</story>
</document> </document>

34
addons/account/report/account_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

21
addons/account/report/account_tax_code.py
View File

@ -1,3 +1,24 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time import time
import pooler import pooler
import rml_parse import rml_parse

33
addons/account/report/aged_trial_balance.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/report/central_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/report/general_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

8
addons/account/report/general_ledger.rml
View File

@ -123,9 +123,9 @@
<td><para style="P3">[[ line['ref'] or '']]</para></td> <td><para style="P3">[[ line['ref'] or '']]</para></td>
<td><para style="P3">[[ line['move'] or '']]</para></td> <td><para style="P3">[[ line['move'] or '']]</para></td>
<td><para style="P3">[[ line['name'] or '' ]]</para></td> <td><para style="P3">[[ line['name'] or '' ]]</para></td>
<td><para style="P4">[[ line['debit'] and line['debit'] or '0.0' ]]</para></td> <td><para style="P4">[[ line['debit'] or '0.0' ]]</para></td>
<td><para style="P4">[[ line['credit'] and line['credit'] or '0.0' ]]</para></td> <td><para style="P4">[[ line['credit'] or '0.0' ]]</para></td>
<td><para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para></td> <td><para style="P4">[[ line['progress'] or '0.0' ]]</para></td>
</tr> </tr>
</blockTable> </blockTable>
@ -175,4 +175,4 @@
</document> </document>

3
addons/account/report/general_ledger_landscape.py
View File

@ -162,6 +162,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
else : else :
borne_max = date_max borne_max = date_max
elif form['state'] == 'none': elif form['state'] == 'none':
sql = """ sql = """
SELECT min(date) as start_date,max(date) as stop_date FROM account_move_line """ SELECT min(date) as start_date,max(date) as stop_date FROM account_move_line """
self.cr.execute(sql) self.cr.execute(sql)
@ -249,7 +250,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
move.init_credit = 0 move.init_credit = 0
move.init_debit = 0 move.init_debit = 0
print"res",res
return res return res
def lines(self, account, form): def lines(self, account, form):

34
addons/account/report/invoice.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

12
addons/account/report/invoice.rml
View File

@ -203,7 +203,7 @@
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/> <paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<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"/> <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"/>
<paraStyle name="Footer" fontName="Times-Roman"/> <paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
@ -259,7 +259,7 @@
</blockTable> </blockTable>
<para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para> <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para> <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para> <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para> <para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
@ -276,7 +276,7 @@
<para style="terp_tblheader_General_Centre">Invoice Date</para> <para style="terp_tblheader_General_Centre">Invoice Date</para>
</td> </td>
<td> <td>
<para style="terp_tblheader_General_Centre">Partner Ref.</para> <para style="terp_tblheader_General_Centre">Partner Code</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -314,7 +314,7 @@
<para style="terp_tblheader_Details_Right">Disc. (%)</para> <para style="terp_tblheader_Details_Right">Disc. (%)</para>
</td> </td>
<td> <td>
<para style="terp_tblheader_Details_Centre">Price</para> <para style="terp_tblheader_Details_Right">Price</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -411,7 +411,7 @@
<blockTable colWidths="120.0,91.0,29.0" style="Table_eclu_Taxes_Total"> <blockTable colWidths="120.0,91.0,29.0" style="Table_eclu_Taxes_Total">
<tr> <tr>
<td> <td>
<para style="terp_default_Bold_9">Total (excl. taxes):</para> <para style="terp_default_Bold_9">Net Total:</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para> <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
@ -443,7 +443,7 @@
<blockTable colWidths="119.0,93.0,28.0" style="Table_Total_Include_Taxes"> <blockTable colWidths="119.0,93.0,28.0" style="Table_Total_Include_Taxes">
<tr> <tr>
<td> <td>
<para style="terp_default_Bold_9">Total (inclu. taxes):</para> <para style="terp_default_Bold_9">Total:</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para> <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>

34
addons/account/report/overdue.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

208
addons/account/report/partner_balance.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -36,6 +31,7 @@ class partner_balance(report_sxw.rml_parse):
super(partner_balance, self).__init__(cr, uid, name, context) super(partner_balance, self).__init__(cr, uid, name, context)
self.date_lst = [] self.date_lst = []
self.date_lst_string = '' self.date_lst_string = ''
self.account_ids = ''
self.localcontext.update( { self.localcontext.update( {
'time': time, 'time': time,
'lines': self.lines, 'lines': self.lines,
@ -191,14 +187,13 @@ class partner_balance(report_sxw.rml_parse):
else: else:
self.ACCOUNT_TYPE = "('payable','receivable')" self.ACCOUNT_TYPE = "('payable','receivable')"
# #
self.cr.execute('SELECT a.id ' \ self.cr.execute("SELECT a.id " \
'FROM account_account a ' \ "FROM account_account a " \
'LEFT JOIN account_account_type t ' \ "LEFT JOIN account_account_type t " \
'ON (a.type = t.code) ' \ "ON (a.type = t.code) " \
'WHERE t.partner_account = TRUE ' \ "WHERE a.company_id = %d " \
'AND a.company_id = %d ' \ "AND a.type IN " + self.ACCOUNT_TYPE + " " \
'AND a.type IN ' + self.ACCOUNT_TYPE + " " \ "AND a.active", (data['form']['company_id'],))
'AND a.active', (data['form']['company_id'],))
self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()]) self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
super(partner_balance, self).preprocess(objects, data, ids) super(partner_balance, self).preprocess(objects, data, ids)
@ -213,6 +208,7 @@ class partner_balance(report_sxw.rml_parse):
# #
# #
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
"SELECT p.ref, p.name,l.account_id,ac.name as account_name,ac.code as code , sum(debit) as debit, sum(credit) as credit, " \ "SELECT p.ref, p.name,l.account_id,ac.name as account_name,ac.code as code , sum(debit) as debit, sum(credit) as credit, " \
@ -232,20 +228,19 @@ class partner_balance(report_sxw.rml_parse):
") AS enlitige " \ ") AS enlitige " \
"FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \ "FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
"JOIN account_account ac ON (l.account_id = ac.id)" \ "JOIN account_account ac ON (l.account_id = ac.id)" \
"WHERE " \ "WHERE ac.type IN " + self.ACCOUNT_TYPE + " " \
# " account_id IN (" + self.account_ids + ") " \ "AND l.date < %s AND l.reconcile_id IS NULL " \
"l.date < %s AND l.reconcile_id IS NULL " \
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \ "GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name", "ORDER BY l.account_id,p.name",
(self.date_lst[0],self.date_lst[0])) (self.date_lst[0],self.date_lst[0]))
res = self.cr.dictfetchall() res = self.cr.dictfetchall()
for r in res: for r in res:
full_account.append(r) full_account.append(r)
# #
# #
# #
#
self.cr.execute( self.cr.execute(
"SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \ "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \
"CASE WHEN sum(debit) > sum(credit) " \ "CASE WHEN sum(debit) > sum(credit) " \
@ -264,9 +259,8 @@ class partner_balance(report_sxw.rml_parse):
") AS enlitige " \ ") AS enlitige " \
"FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \ "FROM account_move_line l LEFT JOIN res_partner p ON (l.partner_id=p.id) " \
"JOIN account_account ac ON (l.account_id = ac.id)" \ "JOIN account_account ac ON (l.account_id = ac.id)" \
"WHERE " \ "WHERE ac.type IN " + self.ACCOUNT_TYPE + " " \
# " account_id IN (" + self.account_ids + ") " \ "AND l.date IN (" + self.date_lst_string + ") " \
" l.date IN (" + self.date_lst_string + ") " \
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \ "GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name") "ORDER BY l.account_id,p.name")
res = self.cr.dictfetchall() res = self.cr.dictfetchall()
@ -335,6 +329,9 @@ class partner_balance(report_sxw.rml_parse):
# new_tot['type'] = 3 # new_tot['type'] = 3
# ## # ##
# completearray.append(new_tot) # completearray.append(new_tot)
new_header['debit'] = tot_debit new_header['debit'] = tot_debit
new_header['credit'] = tot_credit new_header['credit'] = tot_credit
new_header['scredit'] = tot_scredit new_header['scredit'] = tot_scredit
@ -363,13 +360,16 @@ class partner_balance(report_sxw.rml_parse):
new_header['type'] = 3 new_header['type'] = 3
## ##
## ##
completearray.append(new_header) completearray.append(new_header)
## ##
# #
r['type'] = 1 r['type'] = 1
# #
r['balance'] = float(r['sdebit']) - float(r['scredit']) r['balance'] = float(r['sdebit']) - float(r['scredit'])
# #
completearray.append(r) completearray.append(r)
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']: if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
@ -403,22 +403,20 @@ class partner_balance(report_sxw.rml_parse):
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
'SELECT sum(debit) ' \ "SELECT sum(debit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.reconcile_id IS NULL " \
' l.reconcile_id IS NULL ' \ "AND date < %s ",
'AND date < %s ',
(self.date_lst[0],)) (self.date_lst[0],))
result_tmp = float(self.cr.fetchone()[0] or 0.0) result_tmp = float(self.cr.fetchone()[0] or 0.0)
# #
# #
self.cr.execute( self.cr.execute(
'SELECT sum(debit) ' \ "SELECT sum(debit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date IN (" + self.date_lst_string + ") " )
' l.date IN (' + self.date_lst_string + ') ' )
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
return result_tmp return result_tmp
@ -433,22 +431,20 @@ class partner_balance(report_sxw.rml_parse):
# #
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
'SELECT sum(credit) ' \ "SELECT sum(credit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.reconcile_id IS NULL " \
' l.reconcile_id IS NULL ' \ "AND l.date < %s " ,
'AND date < %s ' ,
(self.date_lst[0],)) (self.date_lst[0],))
result_tmp = float(self.cr.fetchone()[0] or 0.0) result_tmp = float(self.cr.fetchone()[0] or 0.0)
# #
# #
self.cr.execute( self.cr.execute(
'SELECT sum(credit) ' \ "SELECT sum(credit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date IN (" + self.date_lst_string + ") " )
' l.date IN (' + self.date_lst_string + ') ' )
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
@ -464,24 +460,22 @@ class partner_balance(report_sxw.rml_parse):
# #
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
'SELECT sum(debit-credit) ' \ "SELECT sum(debit-credit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.reconcile_id IS NULL " \
' l.reconcile_id IS NULL ' \ "AND l.date < %s " \
'AND date < %s ' \ "AND l.blocked=TRUE " ,
'AND blocked=TRUE ' ,
(self.date_lst[0],)) (self.date_lst[0],))
result_tmp = float(self.cr.fetchone()[0] or 0.0) result_tmp = float(self.cr.fetchone()[0] or 0.0)
# #
# #
self.cr.execute( self.cr.execute(
'SELECT sum(debit-credit) ' \ "SELECT sum(debit-credit) " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date IN (" + self.date_lst_string + ") " \
' l.date IN (' + self.date_lst_string + ') ' \ "AND l.blocked=TRUE " )
'AND blocked=TRUE ' )
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
return result_tmp return result_tmp
@ -496,16 +490,15 @@ class partner_balance(report_sxw.rml_parse):
# #
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
'SELECT CASE WHEN sum(debit) > sum(credit) ' \ "SELECT CASE WHEN sum(debit) > sum(credit) " \
'THEN sum(debit) - sum(credit) ' \ "THEN sum(debit) - sum(credit) " \
'ELSE 0 ' \ "ELSE 0 " \
'END ' \ "END " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date < %s " \
' date < %s ' \ "AND l.reconcile_id IS NULL " \
'AND reconcile_id IS NULL ' \ "GROUP BY l.partner_id",
'GROUP BY partner_id',
(self.date_lst[0],)) (self.date_lst[0],))
if self.cr.fetchone() != None: if self.cr.fetchone() != None:
@ -515,15 +508,14 @@ class partner_balance(report_sxw.rml_parse):
# #
# #
self.cr.execute( self.cr.execute(
'SELECT CASE WHEN sum(debit) > sum(credit) ' \ "SELECT CASE WHEN sum(debit) > sum(credit) " \
'THEN sum(debit) - sum(credit) ' \ "THEN sum(debit) - sum(credit) " \
'ELSE 0 ' \ "ELSE 0 " \
'END ' \ "END " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date IN (" + self.date_lst_string + ") " \
'l.date IN (' + self.date_lst_string + ') ' \ "GROUP BY l.partner_id")
'GROUP BY partner_id')
a = self.cr.fetchone()[0] a = self.cr.fetchone()[0]
if self.cr.fetchone() != None: if self.cr.fetchone() != None:
@ -544,16 +536,15 @@ class partner_balance(report_sxw.rml_parse):
# #
if data['form']['soldeinit'] : if data['form']['soldeinit'] :
self.cr.execute( self.cr.execute(
'SELECT CASE WHEN sum(debit) < sum(credit) ' \ "SELECT CASE WHEN sum(debit) < sum(credit) " \
'THEN sum(credit) - sum(debit) ' \ "THEN sum(credit) - sum(debit) " \
'ELSE 0 ' \ "ELSE 0 " \
'END ' \ "END " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date <= %s " \
' date <= %s ' \ "AND l.reconcile_id IS NULL " \
'AND l.reconcile_id IS NULL ' \ "GROUP BY l.partner_id",
'GROUP BY partner_id',
(self.date_lst[0],)) (self.date_lst[0],))
if self.cr.fetchone() != None: if self.cr.fetchone() != None:
@ -563,16 +554,15 @@ class partner_balance(report_sxw.rml_parse):
# #
# #
self.cr.execute( self.cr.execute(
'SELECT CASE WHEN sum(debit) < sum(credit) ' \ "SELECT CASE WHEN sum(debit) < sum(credit) " \
'THEN sum(credit) - sum(debit) ' \ "THEN sum(credit) - sum(debit) " \
'ELSE 0 ' \ "ELSE 0 " \
'END ' \ "END " \
'FROM account_move_line AS l ' \ "FROM account_move_line AS l " \
'WHERE ' \ "WHERE l.account_id IN (" + self.account_ids + ") " \
# ' account_id IN (' + self.account_ids + ') ' \ "AND l.date IN (" + self.date_lst_string + ") " \
'l.date IN (' + self.date_lst_string + ') ' \ "GROUP BY l.partner_id")
'GROUP BY partner_id') a = self.cr.fetchone()[0] or 0.0
a = self.cr.fetchone()[0]
if self.cr.fetchone() != None: if self.cr.fetchone() != None:
result_tmp = result_tmp + (a or 0.0) result_tmp = result_tmp + (a or 0.0)

8
addons/account/report/partner_balance.rml
View File

@ -17,7 +17,7 @@
<!--COL 1--> <!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString> <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Partnar Balance [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]] [[ company.currency_id.name ]]</drawRightString> <drawRightString x="20cm" y="28.1cm">Partner Balance [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]] [[ company.currency_id.name ]]</drawRightString>
<!-- Header --> <!-- Header -->
@ -327,13 +327,13 @@
<para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para> <para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
</td> </td>
<td> <td>
<para style="P8"><u>[[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]]</u></para> <para style="P8"><u>[[ (solde_debit(data)-solde_credit(data)) or '0.0' ]]</u></para>
</td> </td>
<td> <td>
<para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para> <para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
</td> </td>
</tr> </tr>
<!--<tr> <!-- <tr>
<td> <td>
<para style="P7">Balance</para> <para style="P7">Balance</para>
</td><td> </td><td>
@ -381,4 +381,4 @@
</tr> </tr>
</blockTable> </blockTable>
</story> </story>
</document> </document>

21
addons/account/report/rml_parse.py
View File

@ -1,3 +1,24 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from report import report_sxw from report import report_sxw
import xml.dom.minidom import xml.dom.minidom
import os, time import os, time

33
addons/account/report/tax_report.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

57
addons/account/report/tax_report.rml
View File

@ -102,6 +102,30 @@
<paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/> <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/>
<paraStyle name="Index" fontName="Helvetica"/> <paraStyle name="Index" fontName="Helvetica"/>
<blockTableStyle id="TrLevelaaaaaaaaaaaaaaaaaa">
<blockLeftPadding length="300" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaaaaaaa">
<blockLeftPadding length="280" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaaaaaa">
<blockLeftPadding length="260" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaaaaa">
<blockLeftPadding length="240" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaaaa">
<blockLeftPadding length="220" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaaa">
<blockLeftPadding length="200" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaaa">
<blockLeftPadding length="180" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaaa">
<blockLeftPadding length="160" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevelaaaaaaaaaa"> <blockTableStyle id="TrLevelaaaaaaaaaa">
<blockLeftPadding length="140" start="1,0" stop="1,0"/> <blockLeftPadding length="140" start="1,0" stop="1,0"/>
</blockTableStyle> </blockTableStyle>
@ -135,6 +159,39 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle> </blockTableStyle>
<paraStyle
name="Levelaaaaaaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle
name="Levelaaaaaaaaaaa"
fontName="Helvetica"
fontSize="8.0" />
<paraStyle <paraStyle
name="Levelaaaaaaaaaa" name="Levelaaaaaaaaaa"
fontName="Helvetica" fontName="Helvetica"

75
addons/account/report/third_party_ledger.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -169,22 +164,22 @@ class third_party_ledger(rml_parse.rml_parse):
# #
#new_ids = [id for (id,) in self.cr.fetchall()] #new_ids = [id for (id,) in self.cr.fetchall()]
if data['form']['result_selection'] == 'supplier': if data['form']['result_selection'] == 'supplier':
ACCOUNT_TYPE = "AND a.type='payable' " self.ACCOUNT_TYPE = "('receivable')"
elif data['form']['result_selection'] == 'customer': elif data['form']['result_selection'] == 'customer':
ACCOUNT_TYPE = "AND a.type='receivable' " self.ACCOUNT_TYPE = "('payable')"
elif data['form']['result_selection'] == 'all': elif data['form']['result_selection'] == 'all':
ACCOUNT_TYPE = "AND (a.type='receivable' OR a.type='payable') " self.ACCOUNT_TYPE = "('payable','receivable')"
self.cr.execute( self.cr.execute(
"SELECT a.id " \ "SELECT a.id " \
"FROM account_account a " \ "FROM account_account a " \
"LEFT JOIN account_account_type t " \ "LEFT JOIN account_account_type t " \
"ON (a.type=t.code) " \ "ON (a.type=t.code) " \
"WHERE t.partner_account=TRUE " \ "WHERE a.company_id = %d " \
"AND a.company_id = %d " \ 'AND a.type IN ' + self.ACCOUNT_TYPE + " " \
" " + ACCOUNT_TYPE + " " \
"AND a.active", (data['form']['company_id'],)) "AND a.active", (data['form']['company_id'],))
self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()]) self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
partner_to_use = [] partner_to_use = []
@ -196,7 +191,7 @@ class third_party_ledger(rml_parse.rml_parse):
"AND line.account_id = account.id " \ "AND line.account_id = account.id " \
"AND line.date <= %s " \ "AND line.date <= %s " \
"AND line.reconcile_id IS NULL " \ "AND line.reconcile_id IS NULL " \
# "AND line.account_id IN (" + self.account_ids + ") " \ "AND line.account_id IN (" + self.account_ids + ") " \
" " + PARTNER_REQUEST + " " \ " " + PARTNER_REQUEST + " " \
"AND account.company_id = %d " \ "AND account.company_id = %d " \
"AND account.active " , "AND account.active " ,
@ -208,16 +203,14 @@ class third_party_ledger(rml_parse.rml_parse):
"WHERE line.partner_id IS NOT NULL " \ "WHERE line.partner_id IS NOT NULL " \
"AND line.account_id = account.id " \ "AND line.account_id = account.id " \
"AND line.date IN (" + self.date_lst_string + ") " \ "AND line.date IN (" + self.date_lst_string + ") " \
# "AND line.account_id IN (" + self.account_ids + ") " \ "AND line.account_id IN (" + self.account_ids + ") " \
" " + PARTNER_REQUEST + " " \ " " + PARTNER_REQUEST + " " \
"AND account.company_id = %d " \ "AND account.company_id = %d " \
"AND account.active " , "AND account.active " ,
(data['form']['company_id'])) (data['form']['company_id']))
res = self.cr.dictfetchall() res = self.cr.dictfetchall()
for res_line in res:
partner_to_use.append(res_line['partner_id'])
res = self.cr.dictfetchall()
for res_line in res: for res_line in res:
partner_to_use.append(res_line['partner_id']) partner_to_use.append(res_line['partner_id'])
new_ids = partner_to_use new_ids = partner_to_use
@ -239,7 +232,7 @@ class third_party_ledger(rml_parse.rml_parse):
"LEFT JOIN account_journal j " \ "LEFT JOIN account_journal j " \
"ON (l.journal_id = j.id) " \ "ON (l.journal_id = j.id) " \
"WHERE l.partner_id = %d " \ "WHERE l.partner_id = %d " \
# "AND l.account_id IN (" + self.account_ids + ") " \ "AND l.account_id IN (" + self.account_ids + ") " \
"AND l.date < %s " \ "AND l.date < %s " \
"AND l.reconcile_id IS NULL " "AND l.reconcile_id IS NULL "
"ORDER BY l.id", "ORDER BY l.id",
@ -257,7 +250,7 @@ class third_party_ledger(rml_parse.rml_parse):
"LEFT JOIN account_journal j " \ "LEFT JOIN account_journal j " \
"ON (l.journal_id = j.id) " \ "ON (l.journal_id = j.id) " \
"WHERE l.partner_id = %d " \ "WHERE l.partner_id = %d " \
# "AND l.account_id IN (" + self.account_ids + ") " \ "AND l.account_id IN (" + self.account_ids + ") " \
"AND l.date IN (" + self.date_lst_string + ") " \ "AND l.date IN (" + self.date_lst_string + ") " \
" " + RECONCILE_TAG + " "\ " " + RECONCILE_TAG + " "\
"ORDER BY l.id", "ORDER BY l.id",
@ -284,7 +277,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(debit) " \ "SELECT sum(debit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id = %d " \ "WHERE partner_id = %d " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
"AND reconcile_id IS NULL " \ "AND reconcile_id IS NULL " \
"AND date < %s " , "AND date < %s " ,
(partner.id, self.date_lst[0],)) (partner.id, self.date_lst[0],))
@ -299,7 +292,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(debit) " \ "SELECT sum(debit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id = %d " \ "WHERE partner_id = %d " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
" " + RECONCILE_TAG + " " \ " " + RECONCILE_TAG + " " \
"AND date IN (" + self.date_lst_string + ") " , "AND date IN (" + self.date_lst_string + ") " ,
(partner.id,)) (partner.id,))
@ -323,7 +316,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(credit) " \ "SELECT sum(credit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id=%d " \ "WHERE partner_id=%d " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
"AND reconcile_id IS NULL " \ "AND reconcile_id IS NULL " \
"AND date < %s " , "AND date < %s " ,
(partner.id,self.date_lst[0],)) (partner.id,self.date_lst[0],))
@ -337,7 +330,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(credit) " \ "SELECT sum(credit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id=%d " \ "WHERE partner_id=%d " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
" " + RECONCILE_TAG + " " \ " " + RECONCILE_TAG + " " \
"AND date IN (" + self.date_lst_string + ") " , "AND date IN (" + self.date_lst_string + ") " ,
(partner.id,)) (partner.id,))
@ -363,7 +356,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(debit) " \ "SELECT sum(debit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id IN (" + self.partner_ids + ") " \ "WHERE partner_id IN (" + self.partner_ids + ") " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
"AND reconcile_id IS NULL " \ "AND reconcile_id IS NULL " \
"AND date < %s " , "AND date < %s " ,
(self.date_lst[0],)) (self.date_lst[0],))
@ -377,7 +370,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(debit) " \ "SELECT sum(debit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id IN (" + self.partner_ids + ") " \ "WHERE partner_id IN (" + self.partner_ids + ") " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
" " + RECONCILE_TAG + " " \ " " + RECONCILE_TAG + " " \
"AND date IN (" + self.date_lst_string + ") " "AND date IN (" + self.date_lst_string + ") "
) )
@ -405,7 +398,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(credit) " \ "SELECT sum(credit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id IN (" + self.partner_ids + ") " \ "WHERE partner_id IN (" + self.partner_ids + ") " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
"AND reconcile_id IS NULL " \ "AND reconcile_id IS NULL " \
"AND date < %s " , "AND date < %s " ,
(self.date_lst[0],)) (self.date_lst[0],))
@ -418,7 +411,7 @@ class third_party_ledger(rml_parse.rml_parse):
"SELECT sum(credit) " \ "SELECT sum(credit) " \
"FROM account_move_line " \ "FROM account_move_line " \
"WHERE partner_id IN (" + self.partner_ids + ") " \ "WHERE partner_id IN (" + self.partner_ids + ") " \
# "AND account_id IN (" + self.account_ids + ") " \ "AND account_id IN (" + self.account_ids + ") " \
" " + RECONCILE_TAG + " " \ " " + RECONCILE_TAG + " " \
"AND date IN (" + self.date_lst_string + ") " "AND date IN (" + self.date_lst_string + ") "
) )

2
addons/account/security/ir.model.access.csv
View File

@ -75,6 +75,8 @@
"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
"access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
75 access_account_account_product_manager account.account product manager model_account_account product.group_product_manager 1 0 0 0
76 access_account_journal_product_manager account.journal product manager model_account_journal product.group_product_manager 1 0 0 0
77 access_account_fiscal_position_product_manager account.fiscal.position account.manager model_account_fiscal_position account.group_account_manager 1 1 1 1
78 access_account_fiscal_position_tax_product_manager account.fiscal.position.tax account.manager model_account_fiscal_position_tax account.group_account_manager 1 1 1 1
79 access_account_fiscal_position_account_product_manager account.fiscal.position account.manager model_account_fiscal_position_account account.group_account_manager 1 1 1 1
80 access_account_fiscal_position account.fiscal.position all model_account_fiscal_position base.group_user 1 0 0 0
81 access_account_fiscal_position_tax account.fiscal.position.tax all model_account_fiscal_position_tax base.group_user 1 0 0 0
82 access_account_fiscal_position_account account.fiscal.position all model_account_fiscal_position_account base.group_user 1 0 0 0

34
addons/account/wizard/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

40
addons/account/wizard/wizard_account_balance_report.py
View File

@ -1,28 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -69,8 +63,8 @@ period_fields = {
'help':'Keep empty for all open fiscal year' 'help':'Keep empty for all open fiscal year'
}, },
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'}, 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}, 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With Movements'),('bal_solde','With Balance != 0'),('bal_all','All')]},
'date_from': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')}, 'date_from': {'string':" Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}, 'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
} }
@ -134,11 +128,11 @@ class wizard_report(wizard.interface):
}, },
'account_selection': { 'account_selection': {
'actions': [], 'actions': [],
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]} 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]}
}, },
'checktype': { 'checktype': {
'actions': [_get_defaults], 'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]} 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
}, },
'report': { 'report': {
'actions': [_check_state], 'actions': [_check_state],

34
addons/account/wizard/wizard_account_chart.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_account_duplicate.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_aged_trial_balance.py
View File

@ -1,28 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Fabien Pinckaers <fp@tiny.Be> # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_automatic_reconcile.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_bank_reconcile.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_central_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_fiscalyear_close.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_general_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

42
addons/account/wizard/wizard_general_ledger_report.py
View File

@ -1,26 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# WARNING: This program as such is intended to be used by professional # OpenERP, Open Source Management Solution
# programmers who take the whole responsability of assessing all potential # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# consequences resulting from its eventual inadequacies and bugs # $Id$
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is free software: you can redistribute it and/or modify
# modify it under the terms of the GNU General Public License # it under the terms of the GNU General Public License as published by
# as published by the Free Software Foundation; either version 2 # the Free Software Foundation, either version 3 of the License, or
# of the License, or (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -131,6 +127,7 @@ def _check(self, cr, uid, data, context):
return 'report' return 'report'
def _check_date(self, cr, uid, data, context): def _check_date(self, cr, uid, data, context):
sql = """ sql = """
SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where '%s' between f.date_start and f.date_stop """%(data['form']['date_from']) SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where '%s' between f.date_start and f.date_stop """%(data['form']['date_from'])
cr.execute(sql) cr.execute(sql)
@ -147,10 +144,11 @@ def _check_date(self, cr, uid, data, context):
def _check_state(self, cr, uid, data, context): def _check_state(self, cr, uid, data, context):
if data['form']['state'] == 'bydate': if data['form']['state'] == 'bydate':
data['form']['fiscalyear'] = False _check_date(self, cr, uid, data, context)
data['form']['fiscalyear'] = 0
else : else :
self._check_date(cr, uid, data, context)
data['form']['fiscalyear'] = True data['form']['fiscalyear'] = 1
return data['form'] return data['form']
@ -180,11 +178,11 @@ class wizard_report(wizard.interface):
}, },
'account_selection': { 'account_selection': {
'actions': [], 'actions': [],
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]} 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]}
}, },
'checktype': { 'checktype': {
'actions': [_get_defaults], 'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('checkreport','Print')]} 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
}, },
'checkreport': { 'checkreport': {
'actions': [], 'actions': [],

34
addons/account/wizard/wizard_invoice_state.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_journal_select.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_move_line_select.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

35
addons/account/wizard/wizard_open_closed_fiscalyear.py
View File

@ -1,31 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
###############################################################################
import wizard import wizard
import netsvc import netsvc
import pooler import pooler

35
addons/account/wizard/wizard_partner_balance_report.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -119,7 +114,7 @@ class wizard_report(wizard.interface):
states = { states = {
'init': { 'init': {
'actions': [_get_defaults], 'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]} 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
}, },
'report': { 'report': {

34
addons/account/wizard/wizard_pay_invoice.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_period_close.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_print_journal.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_reconcile.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_reconcile_select.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_refund.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_state_open.py
View File

@ -1,28 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# # # This program is free software: you can redistribute it and/or modify
# WARNING: This program as such is intended to be used by professional # it under the terms of the GNU General Public License as published by
# programmers who take the whole responsability of assessing all potential # the Free Software Foundation, either version 3 of the License, or
# consequences resulting from its eventual inadequacies and bugs # (at your option) any later version.
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_subscription_generate.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

35
addons/account/wizard/wizard_third_party_ledger.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
@ -135,7 +130,7 @@ class wizard_report(wizard.interface):
states = { states = {
'init': { 'init': {
'actions': [_get_defaults], 'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]} 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
}, },
'report': { 'report': {
'actions': [_check_state], 'actions': [_check_state],

34
addons/account/wizard/wizard_unreconcile.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account/wizard/wizard_unreconcile_select.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

24
addons/account/wizard/wizard_use_model.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import wizard import wizard
import time import time
import datetime import datetime
@ -22,7 +42,7 @@ fields = {
} }
def _create_entries(self, cr, uid, data, context): def _create_entries(self, cr, uid, data, context):
pool_obj = pooler.get_pool(cr.dbname) pool_obj = pooler.get_pool(cr.dbname)
if data['model']=='ir.ui.menu': if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
model_ids = data['form']['model'][0][2] model_ids = data['form']['model'][0][2]
data_model = pool_obj.get('account.model').browse(cr,uid,model_ids) data_model = pool_obj.get('account.model').browse(cr,uid,model_ids)
else: else:
@ -95,7 +115,7 @@ class use_model(wizard.interface):
} }
def _check(self, cr, uid, data, context): def _check(self, cr, uid, data, context):
if data['model']=='ir.ui.menu': if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
return 'init_form' return 'init_form'
return 'create' return 'create'

34
addons/account/wizard/wizard_validate_account_move.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

33
addons/account/wizard/wizard_vat.py
View File

@ -1,27 +1,22 @@
# -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

34
addons/account_analytic_analysis/__init__.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

35
addons/account_analytic_analysis/__terp__.py
View File

@ -1,31 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
###############################################################################
{ {
"name" : "report_account_analytic", "name" : "report_account_analytic",
"description": """Modifiy the account analytic view to show "description": """Modifiy the account analytic view to show

111
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -1,31 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
# -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id$ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
import operator import operator
@ -87,21 +78,22 @@ class account_analytic_account(osv.osv):
WHERE account_analytic_account.id IN (%s) \ WHERE account_analytic_account.id IN (%s) \
AND account_analytic_line.invoice_id is null \ AND account_analytic_line.invoice_id is null \
AND account_analytic_line.to_invoice IS NOT NULL \ AND account_analytic_line.to_invoice IS NOT NULL \
and account_analytic_journal.type in ('purchase','general') \
GROUP BY account_analytic_account.id;"""%acc_set) GROUP BY account_analytic_account.id;"""%acc_set)
for account_id, sum in cr.fetchall(): for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2) res[account_id] = round(sum,2)
# Expense amount and purchase invoice # Expense amount and purchase invoice
acc_set = ",".join(map(str, ids2)) #acc_set = ",".join(map(str, ids2))
cr.execute ("select account_analytic_line.account_id, sum(amount) \ #cr.execute ("select account_analytic_line.account_id, sum(amount) \
from account_analytic_line \ # from account_analytic_line \
join account_analytic_journal \ # join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \ # on account_analytic_line.journal_id = account_analytic_journal.id \
where account_analytic_line.account_id IN (%s) \ # where account_analytic_line.account_id IN (%s) \
and account_analytic_journal.type = 'purchase' \ # and account_analytic_journal.type = 'purchase' \
GROUP BY account_analytic_line.account_id;"%acc_set) # GROUP BY account_analytic_line.account_id;"%acc_set)
for account_id, sum in cr.fetchall(): #for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2) # res2[account_id] = round(sum,2)
for obj_id in ids: for obj_id in ids:
res.setdefault(obj_id, 0.0) res.setdefault(obj_id, 0.0)
res2.setdefault(obj_id, 0.0) res2.setdefault(obj_id, 0.0)
@ -194,27 +186,14 @@ class account_analytic_account(osv.osv):
res2 = {} res2 = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
if ids2: if ids2:
acc_set = ",".join(map(str, ids2))
# First part with expense and purchase
cr.execute("""select account_analytic_line.account_id,sum(amount) \
from account_analytic_line \
join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \
where account_analytic_line.account_id IN (%s) \
and account_analytic_journal.type = 'purchase' \
GROUP BY account_analytic_line.account_id"""%acc_set)
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
# Second part with timesheet (with invoice factor)
acc_set = ",".join(map(str, ids2)) acc_set = ",".join(map(str, ids2))
cr.execute("""select account_analytic_line.account_id as account_id, \ cr.execute("""select account_analytic_line.account_id as account_id, \
sum((account_analytic_line.unit_amount * pt.list_price) \ sum((account_analytic_line.unit_amount * pt.list_price) \
- (account_analytic_line.unit_amount * pt.list_price \ - (account_analytic_line.unit_amount * pt.list_price \
* hr.factor)) as somme * hr.factor)) as somme
from account_analytic_line \ from account_analytic_line \
join account_analytic_journal \ left join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \ on (account_analytic_line.journal_id = account_analytic_journal.id) \
join product_product pp \ join product_product pp \
on (account_analytic_line.product_id = pp.id) \ on (account_analytic_line.product_id = pp.id) \
join product_template pt \ join product_template pt \
@ -225,6 +204,7 @@ class account_analytic_account(osv.osv):
on (hr.id=a.to_invoice) \ on (hr.id=a.to_invoice) \
where account_analytic_line.account_id IN (%s) \ where account_analytic_line.account_id IN (%s) \
and a.to_invoice IS NOT NULL \ and a.to_invoice IS NOT NULL \
and account_analytic_journal.type in ('purchase','general')
GROUP BY account_analytic_line.account_id"""%acc_set) GROUP BY account_analytic_line.account_id"""%acc_set)
for account_id, sum in cr.fetchall(): for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2) res2[account_id] = round(sum,2)
@ -350,7 +330,7 @@ class account_analytic_account(osv.osv):
if account.ca_invoiced == 0: if account.ca_invoiced == 0:
res[account.id]=0.0 res[account.id]=0.0
elif account.real_margin <> 0.0: elif account.real_margin <> 0.0:
res[account.id] = (account.ca_invoiced / account.real_margin) * 100 res[account.id] = -(account.real_margin / account.total_cost) * 100
else: else:
res[account.id] = 0.0 res[account.id] = 0.0
for id in ids: for id in ids:
@ -407,22 +387,22 @@ class account_analytic_account(osv.osv):
return res return res
_columns ={ _columns ={
'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced amount'), 'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account."),
'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total cost'), 'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."),
'ca_to_invoice': fields.function(_ca_to_invoice_calc, method=True, type='float', string='Uninvoiced amount'), 'ca_to_invoice': fields.function(_ca_to_invoice_calc, method=True, type='float', string='Uninvoiced Amount', help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."),
'ca_theorical': fields.function(_ca_theorical_calc, method=True, type='float', string='Theorical revenue'), 'ca_theorical': fields.function(_ca_theorical_calc, method=True, type='float', string='Theorical Revenue', help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."),
'hours_quantity': fields.function(_hours_quantity_calc, method=True, type='float', string='Hours tot'), 'hours_quantity': fields.function(_hours_quantity_calc, method=True, type='float', string='Hours Tot', help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
'last_invoice_date': fields.function(_last_invoice_date_calc, method=True, type='date', string='Last invoice date'), 'last_invoice_date': fields.function(_last_invoice_date_calc, method=True, type='date', string='Last Invoice Date', help="Date of the last invoice created for this analytic account."),
'last_worked_invoiced_date': fields.function(_last_worked_invoiced_date_calc, method=True, type='date', string='Last invoiced worked date'), 'last_worked_invoiced_date': fields.function(_last_worked_invoiced_date_calc, method=True, type='date', string='Date of Last Invoiced Cost', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
'last_worked_date': fields.function(_last_worked_date_calc, method=True, type='date', string='Last worked date'), 'last_worked_date': fields.function(_last_worked_date_calc, method=True, type='date', string='Date of Last Cost/Work', help="Date of the latest work done on this account."),
'hours_qtt_non_invoiced': fields.function(_hours_qtt_non_invoiced_calc, method=True, type='float', string='Uninvoiced hours'), 'hours_qtt_non_invoiced': fields.function(_hours_qtt_non_invoiced_calc, method=True, type='float', string='Uninvoiced Hours', help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced hours'), 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', help="Number of hours that can be invoiced plus those that already have been invoiced."),
'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining hours'), 'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', help="Computed using the formula: Maximum Quantity - Hours Tot."),
'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining revenue'), 'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', help="Computed using the formula: Max Invoice Price - Invoiced Amount."),
'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per hours (real)'), 'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', help="Computed using the formula: Invoiced Amount / Hours Tot."),
'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real margin'), 'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', help="Computed using the formula: Invoiced Amount - Total Costs."),
'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical margin'), 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', help="Computed using the formula: Theorial Revenue - Total Costs"),
'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real margin rate (%)'), 'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100."),
'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), 'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'), 'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
} }
@ -449,8 +429,7 @@ class account_analytic_account_summary_user(osv.osv):
cr.execute('SELECT id, unit_amount ' \ cr.execute('SELECT id, unit_amount ' \
'FROM account_analytic_analysis_summary_user ' \ 'FROM account_analytic_analysis_summary_user ' \
'WHERE account_id in (%s) ' \ 'WHERE account_id in (%s) ' \
'AND "user" in (%s) ' % \ 'AND "user" in (%s) ' % (acc_set, user_set))
(acc_set, user_set))
for sum_id, unit_amount in cr.fetchall(): for sum_id, unit_amount in cr.fetchall():
res[sum_id] = unit_amount res[sum_id] = unit_amount
for obj_id in ids: for obj_id in ids:

99
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -1,113 +1,118 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-project" id="menu_main" name="Project Management"/>
<record id="action_account_analytic_managed" model="ir.actions.act_window"> <record id="action_account_analytic_managed" model="ir.actions.act_window">
<field name="name">My managed accounts</field> <field name="name">My Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid)]</field> <field name="domain">[('user_id','=',uid)]</field>
</record> </record>
<menuitem
id="next_id_71"
name="Financial Project Management"
parent="project.menu_main"
groups="account.group_account_invoice"
sequence="20"/>
<menuitem id="menu_account" name="Analytic Accounts" parent="next_id_71" sequence="10"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
<menuitem id="next_id_71" name="Analytic Accounts" parent="account_analytic_analysis.menu_main"/><menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="next_id_71"/> <menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="menu_account"/>
<record id="action_hr_tree_invoiced_my" model="ir.actions.act_window"> <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">Uninvoiced entries of my accounts</field> <field name="name">All Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field> <field name="res_model">account.analytic.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
<record id="action_hr_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field> <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
</record> </record>
<menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="menu_invoicing"/>
<menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="account_analytic_analysis.next_id_71"/>
<record id="action_account_analytic_managed_open" model="ir.actions.act_window"> <record id="action_account_analytic_managed_open" model="ir.actions.act_window">
<field name="name">My Open Managed Accounts</field> <field name="name">My Current Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field> <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
</record> </record>
<menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed"/> <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed"/>
<record id="action_account_analytic_managed_pending" model="ir.actions.act_window"> <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
<field name="name">My Pending Managed Accounts</field> <field name="name">My Pending Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','pending')]</field> <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
</record> </record>
<menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed"/> <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed"/>
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window"> <record id="action_account_analytic_new" model="ir.actions.act_window">
<field name="name">Overpassed accounts</field> <field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">form,tree,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record> </record>
<menuitem
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" parent="account_analytic_analysis.next_id_71"/> action="action_account_analytic_new"
id="menu_action_account_analytic_new"
sequence="50"
parent="account_analytic_analysis.menu_account"/>
<record id="action_account_analytic_all" model="ir.actions.act_window"> <record id="action_account_analytic_all" model="ir.actions.act_window">
<field name="name">All Analytic Accounts</field> <field name="name">All Analytic Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/> <field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[]</field> <field name="domain">[]</field>
</record> </record>
<menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.next_id_71"/> <menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.menu_account"/>
<record id="action_account_analytic_all_draft" model="ir.actions.act_window"> <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Draft Analytic Accounts</field> <field name="name">Overpassed Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/> <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
<field name="domain">[('state','=','draft')]</field>
</record> </record>
<menuitem
action="action_account_analytic_managed_overpassed"
id="menu_action_account_analytic_managed_overpassed"
sequence="50"
parent="menu_invoicing"/>
<menuitem id="next_id_72" name="All Analytic Accounts" parent="account_analytic_analysis.next_id_71"/><menuitem action="action_account_analytic_all_draft" id="menu_action_account_analytic_all_draft" parent="next_id_72"/>
<record id="action_account_analytic_all_open" model="ir.actions.act_window"> <record id="action_account_analytic_all_open" model="ir.actions.act_window">
<field name="name">Open Analytic Accounts</field> <field name="name">Current Analytic Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/> <field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','open')]</field> <field name="domain">[('state','=','open')]</field>
</record> </record>
<menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all"/>
<menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="account_analytic_analysis.next_id_72"/>
<record id="action_account_analytic_all_pending" model="ir.actions.act_window"> <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field> <field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/> <field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','pending')]</field> <field name="domain">[('state','=','pending')]</field>
</record> </record>
<menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all"/>
<menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="account_analytic_analysis.next_id_72"/>
<record id="action_account_analytic_all_simplified" model="ir.actions.act_window">
<field name="name">Simplified View Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="view_id" ref="view_account_analytic_simplified"/>
<field name="domain">[]</field>
</record>
<menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="account_analytic_analysis.next_id_72"/>
</data> </data>
</openerp> </openerp>

4
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -33,8 +33,8 @@
<field name="revenue_per_hour"/> <field name="revenue_per_hour"/>
<field name="real_margin"/> <field name="real_margin"/>
<field name="theorical_margin"/>
<field name="real_margin_rate"/> <field name="real_margin_rate"/>
<field name="theorical_margin"/>
<separator colspan="4" string="Key dates"/> <separator colspan="4" string="Key dates"/>
<field name="last_invoice_date"/> <field name="last_invoice_date"/>
@ -46,7 +46,7 @@
<field name="ca_to_invoice" select="2"/> <field name="ca_to_invoice" select="2"/>
</page> </page>
<page string="Stats by month"> <page string="Stats by month">
<field colspan="4" name="month_ids" nolabel="1"> <field colspan="4" name="month_ids" nolabel="1">
<tree string="Month"> <tree string="Month">
<field name="month"/> <field name="month"/>

21
addons/account_analytic_default/__init__.py
View File

@ -1 +1,22 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import account_analytic_default import account_analytic_default

20
addons/account_analytic_default/__terp__.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{ {
"name" : "Account Analytic Default", "name" : "Account Analytic Default",
"version" : "1.0", "version" : "1.0",

20
addons/account_analytic_default/account_analytic_default.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
############################################################################## ##############################################################################
# #

33
addons/account_analytic_plans/__init__.py
View File

@ -1,29 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Fabien Pinckaers <fp@tiny.Be> # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting from its eventual inadequacies and bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

20
addons/account_analytic_plans/__terp__.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{ {
"name" : "Multiple-plans management in analytic accounting", "name" : "Multiple-plans management in analytic accounting",
"version" : "1.0", "version" : "1.0",

34
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -1,30 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $ # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# #
# WARNING: This program as such is intended to be used by professional # This program is distributed in the hope that it will be useful,
# programmers who take the whole responsability of assessing all potential # but WITHOUT ANY WARRANTY; without even the implied warranty of
# consequences resulting from its eventual inadequacies and bugs # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# End users who are looking for a ready-to-use solution with commercial # GNU General Public License for more details.
# garantees and support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it and/or # You should have received a copy of the GNU General Public License
# modify it under the terms of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>.
# as published by the Free Software Foundation; either version 2
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
from xml import dom from xml import dom

20
addons/account_analytic_plans/report/__init__.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import crossovered_analytic import crossovered_analytic
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

33
addons/account_analytic_plans/report/crossovered_analytic.py
View File

@ -1,29 +1,22 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. # OpenERP, Open Source Management Solution
# Fabien Pinckaers <fp@tiny.Be> # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
# #
# WARNING: This program as such is intended to be used by professional # This program is free software: you can redistribute it and/or modify
# programmers who take the whole responsability of assessing all potential # it under the terms of the GNU General Public License as published by
# consequences resulting FROM its eventual inadequacies AND bugs # the Free Software Foundation, either version 3 of the License, or
# End users who are looking for a ready-to-use solution with commercial # (at your option) any later version.
# garantees AND support are strongly adviced to contract a Free Software
# Service Company
# #
# This program is Free Software; you can redistribute it AND/or # This program is distributed in the hope that it will be useful,
# modify it under the terms of the GNU General Public License # but WITHOUT ANY WARRANTY; without even the implied warranty of
# as published by the Free Software Foundation; either version 2 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# of the License, or (at your option) any later version. # GNU General Public License for more details.
# #
# This program is distributed in the hope that it will be useful, # You should have received a copy of the GNU General Public License
# but WITHOUT ANY WARRANTY; without even the implied warranty of # along with this program. If not, see <http://www.gnu.org/licenses/>.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################

20
addons/account_analytic_plans/wizard/__init__.py
View File

@ -1,4 +1,24 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import create_model import create_model
import wizard_crossovered_analytic import wizard_crossovered_analytic
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Some files were not shown because too many files have changed in this diff Show More