pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: nch@tinyerp.com-20081015051827-tfmjjbfkraxr58qo
bzr revid: nch@tinyerp.com-20081020060859-r201bb8npb8ykx2u
bzr revid: nch@tinyerp.com-20081021063959-35cp2w8a27zidn3a
This commit is contained in:
Naresh Choksy
2008-10-21 12:09:59 +05:30
parent b0a5381dd8 a24d14b8a0
commit 56b3612f2b
224 changed files with 14663 additions and 7368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/.pydevproject
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
<pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
</pydev_project>
addons/account/__terp__.py
+1 -1
View File
@@ -50,9 +50,9 @@
"account_unit_test.xml",
],
"update_xml" : [
"account_menuitem.xml",
"security/account_security.xml",
"security/ir.model.access.csv",
"account_menuitem.xml",
"account_wizard.xml",
"account_view.xml",
"account_end_fy.xml",
addons/account/account.py
+9 -21
View File
@@ -844,7 +844,7 @@ class account_move(osv.osv):
if line.account_id.currency_id:
if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
raise osv.except_osv(_('Error'), _('Couldn\'t create move with currency different than the secondary currency of the account'))
raise osv.except_osv(_('Error'), _('Couldn\'t create move with currency different than the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.' % (line.account_id.code, line.account_id.name)))
if abs(amount) < 0.0001:
if not len(line_draft_ids):
@@ -1687,10 +1687,13 @@ class account_tax_code_template(osv.osv):
'info': fields.text('Description'),
'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Childs Codes'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'sign': fields.float('Sign for parent', required=True),
}
_defaults = {
'sign': lambda *args: 1.0,
}
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
@@ -1700,17 +1703,6 @@ class account_tax_code_template(osv.osv):
return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
for x in reads]
def _default_company(self, cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'company_id': _default_company,
'sign': lambda *args: 1.0,
}
def _check_recursion(self, cr, uid, ids):
level = 100
while len(ids):
@@ -1742,7 +1734,6 @@ class account_chart_template(osv.osv):
'property_account_payable': fields.many2one('account.account.template','Payable Account'),
'property_account_expense_categ': fields.many2one('account.account.template','Expense Category Account'),
'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
'property_account_tax': fields.many2one('account.account.template','Default Tax on Partner'),
'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
}
@@ -1859,9 +1850,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_journal = self.pool.get('account.journal')
obj_acc_template = self.pool.get('account.account.template')
if obj_multi.code_digits<=5:
raise osv.except_osv(_('User Error'), _('Account code should be of more than 5 digits.'))
# Creating Account
obj_acc_root = obj_multi.chart_template_id.account_root_id
tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -1926,6 +1914,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#deactivate the parent_store functionnality on account_account for rapidity purpose
self.pool._init = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id])])
for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
tax_ids = []
@@ -1943,7 +1932,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': code_acc[:dig],
'code': code_acc,
'type': account_template.type,
'user_type': account_template.user_type and account_template.user_type.id or False,
'reconcile': account_template.reconcile,
@@ -1963,8 +1952,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
for key,value in todo_dict.items():
if value['account_collected_id'] or value['account_paid_id']:
obj_acc_tax.write(cr, uid, [key], vals={
'account_collected_id': value['account_collected_id'],
'account_paid_id': value['account_paid_id'],
'account_collected_id': acc_template_ref[value['account_collected_id']],
'account_paid_id': acc_template_ref[value['account_paid_id']],
})
# Creating Journals
@@ -2045,7 +2034,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
('property_account_payable','res.partner','account.account'),
('property_account_expense_categ','product.category','account.account'),
('property_account_income_categ','product.category','account.account'),
('property_account_tax','res.partner','account.tax'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account')
]
addons/account/account_invoice_view.xml
+26 -25
View File
@@ -124,6 +124,7 @@
<field name="date_due" select="1"/>
<field name="residual"/>
<field name="state"/>
<field name="origin"/>
</tree>
</field>
</record>
@@ -149,7 +150,7 @@
<field name="check_total" required="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">
<tree editable="bottom" string="Invoice lines">
<tree string="Invoice lines">
<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 name="invoice_line_tax_id" view_mode="2"/>
@@ -198,7 +199,7 @@
<field name="name" select="2"/>
<newline/>
<field name="number" select="2"/>
<field name="origin"/>
<field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field name="move_id"/>
<field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
@@ -208,17 +209,17 @@
<field colspan="4" name="comment" nolabel="1"/>
</page>
<page string="Payments">
<field name="payment_ids" colspan="4" nolabel="1">
<tree string="Payments">
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="journal_id"/>
<field name="debit"/>
<field name="credit"/>
</tree>
</field>
</page>
<field name="payment_ids" colspan="4" nolabel="1">
<tree string="Payments">
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="journal_id"/>
<field name="debit"/>
<field name="credit"/>
</tree>
</field>
</page>
</notebook>
</form>
</field>
@@ -280,7 +281,7 @@
<field name="date_due" select="1"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
<field name="origin"/>
<field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field name="move_id"/>
<field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
@@ -290,17 +291,17 @@
<field colspan="4" name="comment" nolabel="1"/>
</page>
<page string="Payments">
<field name="payment_ids" colspan="4" nolabel="1">
<tree string="Payments">
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="journal_id"/>
<field name="debit"/>
<field name="credit"/>
</tree>
</field>
</page>
<field name="payment_ids" colspan="4" nolabel="1">
<tree string="Payments">
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="journal_id"/>
<field name="debit"/>
<field name="credit"/>
</tree>
</field>
</page>
</notebook>
</form>
</field>
addons/account/account_menuitem.xml
+2 -1
View File
@@ -10,12 +10,13 @@
<menuitem id="menu_finance_reporting" name="Reporting" 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_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/>
<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_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
<menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance" sequence="8"/>
</data>
</openerp>
addons/account/account_view.xml
-1
View File
@@ -1568,7 +1568,6 @@
<field name="arch" type="xml">
<form string="Account Tax Code Template">
<field name="name" select="1"/>
<field name="company_id"/>
<field name="code" select="1"/>
<field name="parent_id" select="1"/>
<field name="sign"/>
addons/account/account_wizard.xml
+5 -5
View File
@@ -48,19 +48,19 @@
<menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
<!-- Aged partner balance -->
<wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged partner balance"/>
<wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_reporting"/>
<menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
<!-- report-related wizards -->
<wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner balance"/>
<wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
<menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/>
<wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner ledger"/>
<wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner Ledger"/>
<menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/>
<wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account balance"/>
<wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General ledger"/>
<wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account Balance"/>
<wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
<wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices"/>
<wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices"/>
addons/account/demo/account_minimal.xml
+3 -18
View File
@@ -149,15 +149,9 @@ your own chart of account.
<field eval="'account.account,'+str(a_pay)" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record forcecreate="True" id="property_account_supplier_tax" model="ir.property">
<field name="name">property_account_supplier_tax</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_supplier_tax')]"/>
<field eval="False" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record forcecreate="True" id="property_account_tax" model="ir.property">
<field name="name">property_account_tax</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_tax')]"/>
<record forcecreate="True" id="property_account_position" model="ir.property">
<field name="name">property_account_position</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_position')]"/>
<field eval="False" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
@@ -199,15 +193,6 @@ your own chart of account.
<field name="user_id" ref="base.user_root"/>
</record>
<record forcecreate="1" id="stock_journal" model="account.journal">
<field name="name">Stock Journal</field>
<field name="code">STJ</field>
<field name="type">general</field>
<field name="view_id" ref="account_journal_view"/>
<field name="sequence_id" ref="sequence_journal"/>
<field name="user_id" ref="base.user_root"/>
</record>
<!--
Product income and expense accounts, default parameters
-->
addons/account/i18n/fr_FR.po
+23 -27
View File
@@ -1,4 +1,4 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * account
#
@@ -6,18 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"Date: 2008-09-10 15:05:34+0000Last-Translator: <>Language-Team: MIME-"
"Version: 1.0Content-Type: text/plain; charset=UTF-8Content-Transfer-"
"Encoding: Plural-Forms:\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-09-05 16:27+0000\n"
"PO-Revision-Date: 2008-10-10 06:55+0000\n"
"PO-Revision-Date: 2008-10-14 11:13+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-10 06:56+0000\n"
"X-Launchpad-Export-Date: 2008-10-14 11:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -28,7 +24,7 @@ msgstr "% réalisation"
#. module: account
#: view:account.move:0
msgid "Account entry"
msgstr "Pièce comptable"
msgstr "Entrée de compte"
#. module: account
#: field:account.tax,description:0
@@ -39,7 +35,7 @@ msgstr "Nom interne"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Compte de Taxe"
msgstr "Code du compte taxe"
#. module: account
#: model:ir.model,name:account.model_account_budget_post
@@ -59,7 +55,7 @@ msgstr ""
#. module: account
#: selection:account.subscription,period_type:0
msgid "month"
msgstr "mois"
msgstr "Mois"
#. module: account
#: view:account.payment.term:0
@@ -143,7 +139,7 @@ msgstr "Entrées non-réconciliées"
#: model:ir.ui.menu,name:account.menu_action_move_line_form
#: view:account.bank.statement.reconcile:0
msgid "Entries"
msgstr "Ecritures"
msgstr "Écritures"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -171,12 +167,12 @@ msgstr "Quantité"
#. module: account
#: field:account.analytic.line,product_uom_id:0
msgid "UoM"
msgstr "Unité Principale"
msgstr "UdM"
#. module: account
#: view:account.tax:0
msgid "Keep empty to use the expense account"
msgstr "Ne pas remplir pour utiliser le compte de dépense"
msgstr "Laisser vide pour utiliser le compte de dépense"
#. module: account
#: rml:account.third_party_ledger:0
@@ -194,7 +190,7 @@ msgstr "Modèle d'écriture comptable"
#. module: account
#: field:account.tax.code,sum_period:0
msgid "Period Sum"
msgstr "Somme de la période"
msgstr "Montant total de la période"
#. module: account
#: view:account.tax:0
@@ -261,7 +257,7 @@ msgstr "Fixe"
#: wizard_view:account.partner.balance.report,init:0
#: wizard_view:account.third_party_ledger.report,init:0
msgid "Select period"
msgstr "Sélectionner une période"
msgstr "Sélectionnez une période"
#. module: account
#: field:account.invoice,origin:0
@@ -623,7 +619,7 @@ msgstr "Note de Crédit Client"
#: field:account.tax,ref_tax_sign:0
#: field:account.tax,tax_sign:0
msgid "Tax Code Sign"
msgstr "Facteur multiplicateur"l
msgstr "Facteur multiplicateur"
#. module: account
#: view:account.move.line:0
@@ -913,7 +909,7 @@ msgstr "Montant payé"
#. module: account
#: model:account.account.type,name:account.account_type_view
msgid "Total Account"
msgstr ""
msgstr "Compte Total"
#. module: account
#: selection:account.account,sign:0
@@ -1130,7 +1126,7 @@ msgstr "Résultats budgétaires"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
msgstr ""
msgstr "Crédit Client"
#. module: account
#: field:account.invoice,tax_line:0
@@ -1160,7 +1156,7 @@ msgstr "Date de Facture :"
#. module: account
#: field:account.chart.template,property_receivable_id:0
msgid "Receivable Account"
msgstr ""
msgstr "Compte Recevable"
#. module: account
#: rml:account.central.journal:0
@@ -1187,12 +1183,12 @@ msgstr "Date de fin"
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
msgstr ""
msgstr "Montant à payer"
#. module: account
#: wizard_view:account_use_models,create:0
msgid "Use Model"
msgstr ""
msgstr "Utiliser un Modèle"
#. module: account
#: model:account.account.type,name:account.account_type_income
@@ -2383,7 +2379,7 @@ msgstr "Êtes-vous sûr de vouloir rembourser cette facture ?"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_paid_open
msgid "Open State"
msgstr ""
msgstr "État Ouvert"
#. module: account
#: field:account.journal,entry_posted:0
@@ -2739,7 +2735,7 @@ msgstr "Créer"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
msgstr ""
msgstr "Nouvelle Déclaration"
#. module: account
#: model:ir.model,name:account.model_account_invoice_line
@@ -2953,7 +2949,7 @@ msgstr "Écriture d'abonnement"
#. module: account
#: rml:account.invoice:0
msgid "Tel. :"
msgstr ""
msgstr "Tél. :"
#. module: account
#: wizard_button:account.wizard_paid_open,init,yes:0
@@ -3126,7 +3122,7 @@ msgstr "Nom de la taxe"
#. module: account
#: rml:account.invoice:0
msgid "VAT :"
msgstr ""
msgstr "TVA :"
#. module: account
#: field:account.chart.template,property_payable_id:0
@@ -3142,7 +3138,7 @@ msgstr "Devise"
#. module: account
#: view:account.config.fiscalyear:0
msgid "Don't Create"
msgstr ""
msgstr "Ne pas créer"
#. module: account
#: rml:account.partner.balance:0
@@ -4122,7 +4118,7 @@ msgstr "Toutes les entrées de compte"
#: wizard_button:account.wizard.account.duplicate,init,duplicate:0
#: model:ir.actions.wizard,name:account.wizard_account_duplicate
msgid "Duplicate"
msgstr ""
msgstr "Dupliquer"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
addons/account/invoice.py
+21 -14
View File
@@ -171,7 +171,7 @@ class account_invoice(osv.osv):
('cancel','Canceled')
],'State', select=True, readonly=True),
'date_invoice': fields.date('Date Invoiced', required=True, states={'open':[('readonly',True)],'close':[('readonly',True)]}),
'date_invoice': fields.date('Date Invoiced', states={'open':[('readonly',True)],'close':[('readonly',True)]}),
'date_due': fields.date('Due Date', states={'open':[('readonly',True)],'close':[('readonly',True)]}),
'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -203,7 +203,7 @@ class account_invoice(osv.osv):
}
_defaults = {
'type': _get_type,
'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
#'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
'state': lambda *a: 'draft',
'journal_id': _get_journal,
'currency_id': _get_currency,
@@ -332,9 +332,9 @@ class account_invoice(osv.osv):
if default is None:
default = {}
default = default.copy()
default.update({'state':'draft', 'number':False, 'move_id':False,})
default.update({'state':'draft', 'number':False, 'move_id':False})
if 'date_invoice' not in default:
default['date_invoice'] = time.strftime('%Y-%m-%d')
default['date_invoice'] = False
if 'date_due' not in default:
default['date_due'] = False
return super(account_invoice, self).copy(cr, uid, id, default, context)
@@ -428,6 +428,8 @@ class account_invoice(osv.osv):
continue
if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
if not inv.date_invoice:
self.write(cr, uid, [inv.id], {'date_invoice':time.strftime('%Y-%m-%d')})
company_currency = inv.company_id.currency_id.id
# create the analytical lines
line_ids = self.read(cr, uid, [inv.id], ['invoice_line'])[0]['invoice_line']
@@ -473,7 +475,7 @@ class account_invoice(osv.osv):
i['amount_currency'] = i['price']
i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
company_currency, i['price'],
context={'date': inv.date_invoice})
context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
else:
i['amount_currency'] = False
i['currency_id'] = False
@@ -534,7 +536,7 @@ class account_invoice(osv.osv):
'ref': ref
})
date = inv.date_invoice
date = inv.date_invoice or time.strftime('%Y-%m-%d')
part = inv.partner_id.id
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})) ,iml)
@@ -549,7 +551,7 @@ class account_invoice(osv.osv):
move = {'name': name, 'line_id': line, 'journal_id': journal_id}
period_id=inv.period_id and inv.period_id.id or False
if not period_id:
period_ids= self.pool.get('account.period').search(cr,uid,[('date_start','<=',inv.date_invoice),('date_stop','>=',inv.date_invoice)])
period_ids= self.pool.get('account.period').search(cr,uid,[('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
if len(period_ids):
period_id=period_ids[0]
if period_id:
@@ -856,7 +858,8 @@ class account_invoice_line(osv.osv):
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
tax_obj = self.pool.get('account.tax')
if type in ('out_invoice', 'out_refund'):
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
taxep = part.property_account_position and part.property_account_position.account_tax
if not taxep or not taxep.id:
tax_id = map(lambda x: x.id, res.taxes_id)
else:
@@ -865,7 +868,8 @@ class account_invoice_line(osv.osv):
if not t.tax_group==taxep.tax_group:
tax_id.append(t.id)
else:
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_supplier_tax
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
taxep = part.property_account_position and part.property_account_position.account_supplier_tax
if not taxep or not taxep.id:
tax_id = map(lambda x: x.id, res.supplier_taxes_id)
else:
@@ -889,6 +893,8 @@ class account_invoice_line(osv.osv):
a = res.product_tmpl_id.property_account_expense.id
if not a:
a = res.categ_id.property_account_expense_categ.id
a = self.pool.get('account.fiscal.position').map_account(cr, uid, part, a)
if a:
result['account_id'] = a
@@ -961,7 +967,8 @@ class account_invoice_line(osv.osv):
if not (partner_id and account_id):
return {}
taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
taxep = partner.property_account_position and partner.property_account_position.account_tax
if not taxep.id:
return {'value': {'invoice_line_tax_id': map(lambda x: x.id, taxes or []) }}
res = [taxep.id]
@@ -1020,14 +1027,14 @@ class account_invoice_tax(osv.osv):
if inv.type in ('out_invoice','in_invoice'):
val['base_code_id'] = tax['base_code_id']
val['tax_code_id'] = tax['tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice})
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice})
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
val['account_id'] = tax['account_collected_id'] or line.account_id.id
else:
val['base_code_id'] = tax['ref_base_code_id']
val['tax_code_id'] = tax['ref_tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice})
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice})
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
val['account_id'] = tax['account_paid_id'] or line.account_id.id
key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
addons/account/partner.py
+44 -15
View File
@@ -31,6 +31,44 @@
from osv import fields, osv
import ir
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
_columns = {
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
'company_id': fields.many2one('res.company', 'Company'),
'account_tax': fields.many2one(
'account.tax', 'Customer Tax',
help="This account will be used as the receivable account for partners in this position",
),
'account_supplier_tax': fields.many2one(
'account.tax', 'Supplier Tax',
help="This account will be used as the payable account for partners in this position",
),
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Accounts Mapping')
}
def map_account(self, cr, uid, partner, account_id, context={}):
if (not partner) or (not partner.property_account_position) :
return account_id
for pos in partner.property_account_position.account_ids:
if pos.account_src_id.id==account_id:
account_id = pos.account_dest_id.id
break
return account_id
account_fiscal_position()
class account_fiscal_position_account(osv.osv):
_name = 'account.fiscal.position.account'
_description = 'Fiscal Position Accounts Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'account_src_id': fields.many2one('account.account', 'Account Source', required=True),
'account_dest_id': fields.many2one('account.account', 'Account Destination', required=True)
}
account_fiscal_position_account()
class res_partner(osv.osv):
_name = 'res.partner'
_inherit = 'res.partner'
@@ -109,24 +147,15 @@ class res_partner(osv.osv):
domain="[('type', '=', 'receivable')]",
help="This account will be used, instead of the default one, as the receivable account for the current partner",
required=True),
'property_account_supplier_tax': fields.property(
'account.tax',
'property_account_position': fields.property(
'account.fiscal.position',
type='many2one',
relation='account.tax',
string="Default Supplier Tax",
relation='account.fiscal.position',
string="Fiscal Position",
method=True,
view_load=True,
domain=[('parent_id','=',False)],
help="This tax will be used, instead of the default one for supplier invoices."),
'property_account_tax': fields.property(
'account.tax',
type='many2one',
relation='account.tax',
string="Default Tax",
method=True,
view_load=True,
domain=[('parent_id','=',False)],
help="This tax will be used, instead of the default one for customers."),
help="The fiscal position will determine taxes and the accounts used for the the partner.",
),
'property_payment_term': fields.property(
'account.payment.term',
type='many2one',
addons/account/partner_view.xml
+52 -2
View File
@@ -1,6 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_account_position_form" model="ir.ui.view">
<field name="name">account.fiscal.position.form</field>
<field name="model">account.fiscal.position</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Position">
<field name="name" select="1"/>
<field name="company_id"/>
<newline/>
<field name="account_tax" select="2"/>
<field name="account_supplier_tax" select="2"/>
<field name="account_ids" colspan="4">
<tree string="Accounts Mapping" editable="bottom">
<field name="account_src_id"/>
<field name="account_dest_id"/>
</tree>
<form string="Accounts Mapping">
<field name="account_src_id"/>
<field name="account_dest_id"/>
</form>
</field>
</form>
</field>
</record>
<record id="view_account_position_tree" model="ir.ui.view">
<field name="name">account.fiscal.position.tree</field>
<field name="model">account.fiscal.position</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Position">
<field name="name"/>
<field name="company_id"/>
<field name="account_tax"/>
<field name="account_supplier_tax"/>
</tree>
</field>
</record>
<record id="action_account_fiscal_position_form" model="ir.actions.act_window">
<field name="name">Fiscal Positions</field>
<field name="res_model">account.fiscal.position</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
action="action_account_fiscal_position_form"
id="menu_action_account_fiscal_position_form"
parent="account.menu_finance_accounting" sequence="20"/>
<!--
Partners Extension
-->
@@ -17,13 +68,12 @@
<group col="2" colspan="2">
<separator string="Customer Accounting Properties" colspan="2"/>
<field name="property_account_receivable"/>
<field name="property_account_tax"/>
<field name="property_account_position"/>
<field name="property_payment_term"/>
</group>
<group col="2" colspan="2">
<separator string="Supplier Accounting Properties" colspan="2"/>
<field name="property_account_payable"/>
<field name="property_account_supplier_tax"/>
</group>
<group col="2" colspan="2">
<separator string="Customer Credit" colspan="2"/>
addons/account/project/project_view.xml
+1 -1
View File
@@ -91,7 +91,7 @@
<menuitem
action="action_account_analytic_account_tree2"
id="account_analytic_def_chart"
parent="account.account_analytic_def_account"/>
parent="account_analytic_def_account"/>
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
<record id="analytic_account_form" model="ir.actions.act_window">
addons/account/project/report/analytic_check.rml
+1 -1
View File
@@ -17,7 +17,7 @@
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Analytic Check</drawRightString>
<drawRightString x="20cm" y="28.1cm">Analytic Check - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
addons/account/project/report/analytic_journal.py
+1 -1
View File
@@ -65,7 +65,7 @@ class account_analytic_journal(report_sxw.rml_parse):
res = self.cr.dictfetchone()
return res['sum'] or 0
report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal)
report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/project/report/analytic_journal.rml
+113 -206
View File
@@ -3,229 +3,136 @@
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Analytic Journal - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockTableStyle id="tbl_header">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Tableau1">
<blockTableStyle id="tbl_code_name">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Tableau2">
<blockTableStyle id="tbl_content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Tableau3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Tableau4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
<paraStyle name="P7" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="6.0" leading="8"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P16" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P17" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P18" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P19" fontName="Times-Bold" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P20" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P21" fontName="Times-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P22" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/>
<paraStyle name="Heading_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/>
<paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.5" alignment="LEFT"/>
<paraStyle name="total_right" fontName="Helvetica-Bold" fontSize="8.5" alignment="RIGHT"/>
<paraStyle name="tbl_content" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/>
<paraStyle name="tbl_content_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/>
</stylesheet>
<story>
<para style="P1">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="152.0,176.0,154.0" repeatRows="1" style="Tableau1">
<tr>
<td>
<para style="Table Contents">[[ company.name ]]</para>
</td>
<td>
<para style="P2">Analytic journal</para>
</td>
<td>
<para style="P3">Period from [[ data['form']['date1'] ]]</para>
<para style="P3">to [[ data['form']['date2'] ]]</para>
</td>
<para style="Heading">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_header" repeatRows="1">
<tr>
<td><para style="Heading">Date</para></td>
<td><para style="Heading">Code</para></td>
<td><para style="Heading">Move name</para></td>
<td><para style="Heading">Account n°</para></td>
<td><para style="Heading_right">General</para></td>
<td><para style="Heading_right">Analytic</para></td>
</tr>
</blockTable>
<blockTable colWidths="152.0,176.0,154.0" repeatRows="1" style="Tableau2">
<tr>
<td>
<para style="P4">[[ o.code ]]</para>
</td>
<td>
<para style="P4">[[ o.name ]]</para>
</td>
<td>
<para style="P5">Currency: [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P6">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="P7">
<font color="white"> </font>
</para>
<blockTable colWidths="57.0,51.0,190.0,85.0,99.0" style="Tableau3">
<tr>
<td>
<para style="P8">Date</para>
</td>
<td>
<para style="P8">Code</para>
</td>
<td>
<para style="P8">Move name</para>
</td>
<td>
<para style="P8">Account n°</para>
</td>
<td>
<para style="P8">Accounting moves</para>
<para style="P9">General</para>
<para style="P10">Analytic</para>
</td>
</tr>
</blockTable>
<para style="P11">
<font color="white"> </font>
</para>
<section>
<para style="P12">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para>
<blockTable colWidths="57.0,51.0,190.0,85.0,99.0" repeatRows="1" style="Tableau4">
<tr>
<td>
<para style="P13">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P13">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P14">[[ move.name ]]</para>
</td>
<td>
<para style="P14">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para>
</td>
<td>
<para style="P14">[[ '%.2f' % (move.debit-move.credit) ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="57.0,51.0,190.0,85.0,99.0" style="Tableau6">
<tr>
<td>
<para style="P15">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="P16">[[ move_a.date ]]</para>
</td>
<td>
<para style="P16">[[ move_a.code ]]</para>
</td>
<td>
<para style="P17">[[ move_a.name ]]</para>
</td>
<td>
<para style="P17">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
</td>
<td>
<para style="P17">[[ '%.2f' % move_a.amount ]]</para>
</td>
</tr>
</blockTable>
<para style="P18">
<font color="white"> </font>
</para>
</section>
<blockTable colWidths="57.0,51.0,190.0,85.0,99.0" style="Tableau7">
<tr>
<td>
<para style="P15">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="P16">[[ move_a.date ]]</para>
</td>
<td>
<para style="P16">[[ move_a.code ]]</para>
</td>
<td>
<para style="P17">[[ move_a.name ]]</para>
</td>
<td>
<para style="P17">[[move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
</td>
<td>
<para style="P17">[[ '%.2f' % move_a.amount ]]</para>
</td>
</tr>
</blockTable>
<para style="P19">
<font color="white"> </font>
</para>
<blockTable colWidths="383.0,99.0" repeatRows="1" style="Tableau5">
<tr>
<td>
<para style="P20">Sums of the journal</para>
</td>
<td>
<para style="P21">[[ '%.2f' % sum_general(o.id,data['form']['date1'],data['form']['date2']) ]]</para>
<para style="P20">[[ '%.2f' % sum_analytic(o.id,data['form']['date1'],data['form']['date2']) ]]</para>
</td>
</tr>
</blockTable>
<para style="P22">
<font color="white"> </font>
</para>
</story>
</document>
<blockTable colWidths="450.0,48.0,48.0" style="tbl_code_name">
<tr>
<td><para style="total">[[ o.code ]] - [[ o.name ]]</para></td>
<td><para style="total_right"><u>[[ '%.2f' % sum_general(o.id,data['form']['date1'],data['form']['date2']) ]]</u></para></td>
<td><para style="total_right"><u>[[ '%.2f' % sum_analytic(o.id,data['form']['date1'],data['form']['date2']) ]]</u></para></td>
</tr>
</blockTable>
<section>
<para style="tbl_content">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" repeatRows="1" style="tbl_content">
<tr>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content">[[ move.name ]]</para></td>
<td><para style="tbl_content">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content_right">[[ '%.2f' % (move.debit-move.credit) ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content">
<tr>
<td>
<para style="tbl_content">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="tbl_content">[[ move_a.date ]]</para>
</td>
<td><para style="tbl_content">[[ move_a.code ]]</para></td>
<td><para style="tbl_content">[[ move_a.name ]]</para></td>
<td><para style="tbl_content">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content_right">[[ '%.2f' % move_a.amount ]]</para></td>
</tr>
</blockTable>
</section>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content">
<tr>
<para style="tbl_content">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<td><para style="tbl_content">[[ move_a.date ]]</para></td>
<td><para style="tbl_content">[[ move_a.code ]]</para></td>
<td><para style="tbl_content">[[ move_a.name ]]</para></td>
<td><para style="tbl_content">[[move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content_right">[[ '%.2f' % move_a.amount ]]</para></td>
</tr>
</blockTable>
</story>
</document>
addons/account/project/report/cost_ledger.rml
+35 -36
View File
@@ -72,18 +72,20 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Grant_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockLeftPadding length="13.0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Account_Detail">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="-1,0"/>
<blockLeftPadding length="13.0" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Move_Line_Detail">
<blockAlignment value="LEFT"/>
@@ -94,7 +96,6 @@
<blockTableStyle id="Table_Move_Line_Content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="white" start="0,0" stop="1,1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -125,15 +126,18 @@
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Bold_Right_9_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Bold_Right_9_U" fontName="Helvetica-Bold" fontSize="9.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Right_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_italic_Rignt" fontName="Times-Italic" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Times-Italic" fontSize="8.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic_Center" fontName="Times-Italic" fontSize="8.0" leading="5" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_italic_Rignt" fontName="Times-Italic" fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
@@ -161,7 +165,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail">
<blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Sub_detail">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Period from </para>
@@ -174,7 +178,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
<blockTable colWidths="178.0,178.0,178.0" style="Table_Sub_Content">
<tr>
<td>
<para style="terp_tblheader_General_Centre">[[ data['form']['date1'] ]]</para>
@@ -191,10 +195,10 @@
<font color="white"> </font>
</para>
<section>
<blockTable colWidths="67.0,245.0,59.0,59.0,58.0" style="Table_Header_Title" repeatRows="1">
<blockTable colWidths="67.0,296.0,59.0,59.0,58.0" style="Table_Header_Title" repeatRows="1">
<tr>
<td>
<para style="terp_tblheader_Details">Code / Date</para>
<para style="terp_tblheader_Details_Centre">Code / Date</para>
</td>
<td>
<para style="terp_tblheader_Details">J.C. / Move name</para>
@@ -211,15 +215,13 @@
</tr>
<tr>
<td>
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Grant_Total">
<blockTable colWidths="62.0,300.0,57.0,57.0,57.0" style="Table_Grant_Total">
<tr>
<td>
<para style="terp_Default_Bold_Right_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
<para style="terp_default_Bold_9">Total:</para>
<para style="terp_default_Bold_9"><font color="white"> </font></para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U"><u>[[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]</u></para>
@@ -237,7 +239,7 @@
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
<blockTable colWidths="55.0,306.0,58.0,57.0,57.0" style="Table_Account_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o.code ]]</para>
@@ -259,46 +261,43 @@
<tr>
<td>
<para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="55.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
<blockTable colWidths="55.0,300.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
<tr>
<td>
<para style="terp_default_9">[[ move_g['code'] ]]</para>
<para style="terp_default_Bold_9">[[ move_g['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_g['name'] ]]</para>
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_Default_Right_9_U"><u>[[ '%.2f' % move_g['debit'] ]]</u></para>
<para style="terp_Default_Bold_Right_9_U"><u>[[ '%.2f' % move_g['debit'] ]]</u></para>
</td>
<td>
<para style="terp_Default_Right_9_U"><u>[[ '%.2f' % move_g['credit'] ]]</u></para>
<para style="terp_Default_Bold_Right_9_U"><u>[[ '%.2f' % move_g['credit'] ]]</u></para>
</td>
<td>
<para style="terp_Default_Right_9_U"><u>[[ '%.2f' % move_g['balance'] ]]</u></para>
<para style="terp_Default_Bold_Right_9_U"><u>[[ '%.2f' % move_g['balance'] ]]</u></para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="47.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
<blockTable colWidths="48.0,299.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
<tr>
<td>
<para style="terp_default_9_Italic">[[ move_a['date'] ]]</para>
<para style="terp_default_8_Italic_Center">[[ move_a['date'] ]]</para>
</td>
<td>
<para style="terp_default_9_Italic">[[ move_a['cj'] ]]</para>
<para style="terp_default_8_Italic">[[ move_a['cj'] ]] / [[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
<para style="terp_default_8_italic_Rignt">[[ '%.2f' % move_a['debit'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ '%.2f' % move_a['debit'] ]]</para>
<para style="terp_default_8_italic_Rignt">[[ '%.2f' % move_a['credit'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ '%.2f' % move_a['credit'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ '%.2f' % move_a['balance'] ]]</para>
<para style="terp_default_8_italic_Rignt">[[ '%.2f' % move_a['balance'] ]]</para>
</td>
</tr>
</blockTable>
@@ -319,4 +318,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/project/report/inverted_analytic_balance.rml
+1 -1
View File
@@ -17,7 +17,7 @@
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Inverted Analytic Balance</drawRightString>
<drawRightString x="20cm" y="28.1cm">Inverted Analytic Balance - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
addons/account/project/report/quantity_cost_ledger.rml
+14 -17
View File
@@ -132,8 +132,10 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Center" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="8.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
@@ -217,12 +219,10 @@
<blockTable colWidths="69.0,298.0,115.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9_Center">Total:</para>
</td>
<td>
<para style="terp_default_Bold_9">Total:</para>
<para style="terp_default_Bold_9"><font color="white"> </font></para>
</td>
<td>
<para style="terp_default_Bold_9_Right_U">[[ '%.2f' % (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0) ]]</para>
@@ -238,7 +238,7 @@
<blockTable colWidths="67.0,291.0,55.0,70.0" style="Table_Account_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o.code ]]</para>
<para style="terp_default_Bold_9_Center">[[ o.code ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
@@ -257,33 +257,30 @@
<blockTable colWidths="61.0,284.0,70.0,64.0" style="Table_Analytical_Detail">
<tr>
<td>
<para style="terp_default_9">[[ move_g['code'] ]] </para>
<para style="terp_default_Bold_9_Center">[[ move_g['code'] ]] </para>
</td>
<td>
<para style="terp_default_9">[[ move_g['name'] ]]</para>
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Rignt_9_U">[[ '%.2f' % (move_g['quantity'] or 0.0) ]]</para>
<para style="terp_default_Bold_9_Right_U">[[ '%.2f' % (move_g['quantity'] or 0.0) ]]</para>
</td>
</tr>
<tr>
<td>
<blockTable colWidths="57.0,45.0,280.0,89.0" style="Table_Move_Line_Content">
<blockTable colWidths="55.0,327.0,89.0" style="Table_Move_Line_Content">
<tr>
<td>
<para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]<font>[[ move_a['date'] ]]</font></para>
<para style="terp_default_9_Italic_Center">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]<font>[[ move_a['date'] ]]</font></para>
</td>
<td>
<para style="terp_default_9_Italic"> [[ move_a['cj'] ]]</para>
</td>
<td>
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
<para style="terp_default_9_Italic">[[ move_a['cj'] ]] / [[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_Italic_Right">[[ '%.2f' % (move_a['quantity'] or 0.0 )]]</para>
addons/account/report/__init__.py
+1
View File
@@ -40,6 +40,7 @@ import overdue
import aged_trial_balance
import tax_report
import general_ledger_landscape
import account_tax_code
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/report/account_balance.rml
+28 -4
View File
@@ -42,7 +42,7 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" 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="P3" fontName="Helvetica" fontSize="8.0" leading="5" alignment="RIGHT" 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="P10" fontName="Helvetica" fontSize="9.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
<paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="12" leftIndent="-5.0"/>
@@ -50,7 +50,7 @@
<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="P12a" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="5" spaceBefore="0.0" spaceAfter="6.0"/>
<blockTableStyle id="TrLevel8">
<blockLeftPadding length="0" start="0,0" stop="-1,0"/>
@@ -80,6 +80,31 @@
<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"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name5">
<blockLeftPadding length="40" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name4">
<blockLeftPadding length="20" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name3">
<blockLeftPadding length="0" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name2">
<blockLeftPadding length="0" start="1,0" stop="1,0"/>
</blockTableStyle>
<blockTableStyle id="TrLevel_Name1">
<blockLeftPadding length="0" start="1,0" stop="1,0"/>
</blockTableStyle>
<paraStyle
name="Level8"
fontName="Helvetica-Bold"
@@ -266,7 +291,7 @@
</tr>
<tr>
<td><para style="P14">[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]]</para></td>
<td><para style="P14"><font color="white">[[ a['level']&lt;4 and removeParentNode('font') or '...'*(2) ]]</font>[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]]<font>[ref: [[ a['ref'] or removeParentNode('font') ]] ]</font> [[ a['lname'] ]]</para></td>
<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>
@@ -277,4 +302,3 @@
</blockTable>
</story>
</document>
addons/account/report/account_journal.py
+1 -1
View File
@@ -59,7 +59,7 @@ class journal_print(report_sxw.rml_parse):
def _sum_credit(self, period_id, journal_id):
self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id))
return self.cr.fetchone()[0] or 0.0
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print)
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/report/account_journal.rml
+128 -101
View File
@@ -3,6 +3,37 @@
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Print Journal - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -13,24 +44,25 @@
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -38,14 +70,18 @@
<paraStyle name="P2" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10a" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10b" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -53,111 +89,102 @@
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<para style="Table Contents">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
<blockTable colWidths="65.0,62.0,58.0,62.0,174.0,57.0,61.0" style="Table1" repeatRows="1">
<tr>
<td>
<para style="Table Contents">
<font color="white"> </font>
</para>
<para style="P10a">Date</para>
</td>
<td>
<para style="P1">Journal</para>
<para style="P10">Voucher No</para>
</td>
<td>
<para style="P2">[[o.period_id.name ]]</para>
<para style="P10">A/c No.</para>
</td>
<td>
<para style="P10a">Third party</para>
</td>
<td>
<para style="P10a">Entry label</para>
</td>
<td>
<para style="P10b">Debit</para>
</td>
<td>
<para style="P10b">Credit</para>
</td>
</tr>
<tr>
<tr>
<td>
<para style="Table Contents">[[ company.name ]]</para>
<para style="P11">[[o.period_id.name ]]</para>
</td>
<td>
<para style="P3">[[ o.journal_id.code ]] [[ o.journal_id.name ]]</para>
<para style="P11a">[[ o.journal_id.code ]]</para></td>
<td></td>
<td></td>
<td></td>
<td>
<para style="P12"><u>[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) or '0.00' ]]</u></para>
</td>
<td>
<para style="P4">Currency: [[ company.currency_id.name ]]</para>
<para style="P12"><u>[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) or '0.00' ]]</u></para>
</td>
</tr>
</blockTable>
<para style="Standard">
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para>
<para style="terp_default_8">[[ line.date ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ line.ref ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para>
</td>
<td>
<para style="terp_default_8">[[ line.name ]]</para>
</td>
<td>
<para style="P8">[[ line.debit and '%.2f' % line.debit or '0.00' ]]</para>
</td>
<td>
<para style="P8">[[ line.credit and '%.2f' % line.credit or '0.00' ]]</para>
</td>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P5">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="P6">
<font color="white"> </font>
</para>
<blockTable colWidths="49.0,48.0,61.0,98.0,108.0,58.0,60.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="P7">Date</para>
</td>
<td>
<para style="P7">Voucher Nb</para>
</td>
<td>
<para style="P7">Account Number</para>
</td>
<td>
<para style="P7">Third party</para>
</td>
<td>
<para style="P7">Entry label</para>
</td>
<td>
<para style="P7">Debit</para>
</td>
<td>
<para style="P7">Credit</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="49.0,48.0,61.0,98.0,108.0,58.0,60.0" style="Table3">
<tr>
<td>
<para style="Table Contents">
<font face="Times-Roman" size="8.0">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]] </font>
<font face="Times-Roman" size="8.0">[[ line.date ]]</font>
</para>
</td>
<td>
<para style="P8">[[ line.ref ]]</para>
</td>
<td>
<para style="P8">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="P8">[[ line.partner_id and line.partner_id.name ]]</para>
</td>
<td>
<para style="P9">[[ line.name ]]</para>
</td>
<td>
<para style="P10">[[ line.debit and '%.2f' % line.debit or '' ]]</para>
</td>
<td>
<para style="P10">[[ line.credit and '%.2f' % line.credit or '' ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="364.0,58.0,60.0" style="Table4">
<tr>
<td>
<para style="P11">TOTAL:</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/report/account_tax_code.py
+19
View File
@@ -0,0 +1,19 @@
import time
import pooler
import rml_parse
import copy
from report import report_sxw
import re
class account_tax_code_report(rml_parse.rml_parse):
_name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
})
report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
addons/account/report/account_tax_code.rml
+113 -105
View File
@@ -2,7 +2,31 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="57.0" y1="57.0" width="481" height="700"/>
<header>
<pageGraphics>
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Accounting Entries-[[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -10,42 +34,29 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockTableStyle id="Table_Title_Table">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table_Line_Title">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Line_Content_Detail">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -53,113 +64,110 @@
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<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="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<para style="P1">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="145.0,192.0,145.0" repeatRows="1" style="Table1">
<!--blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
<tr>
<td>
<para style="Table Contents">
<font color="white"> </font>
<para style="terp_header">[[ company.name ]]</para>
</td>
<td>
<para style="terp_header">
<font face="Times-Roman" size="11.0"/>
</para>
</td>
<td>
<para style="P2">Accounting Entries</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
<para style="terp_header">Accounting Entries-[[ company.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="Table Contents">[[ company.name ]]</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">Currency: [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="P6">
</blockTable-->
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="49.0,39.0,54.0,117.0,105.0,58.0,60.0" repeatRows="1" style="Table2">
<section>
<blockTable colWidths="55.0,43.0,57.0,125.0,127.0,65.0,67.0" repeatRows="1" style="Table_Line_Title">
<tr>
<td>
<para style="P7">Date</para>
<para style="terp_tblheader_Details_Centre">Date</para>
</td>
<td>
<para style="P7">Voucher Nb</para>
<para style="terp_tblheader_Details">Voucher Nb</para>
</td>
<td>
<para style="P7">Account Number</para>
<para style="terp_tblheader_Details">Account Number</para>
</td>
<td>
<para style="P7">Third party (Country)</para>
<para style="terp_tblheader_Details">Third party (Country)</para>
</td>
<td>
<para style="P7">Entry label</para>
<para style="terp_tblheader_Details">Entry label</para>
</td>
<td>
<para style="P7">Debit</para>
<para style="terp_tblheader_Details_Right">Debit</para>
</td>
<td>
<para style="P7">Credit</para>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="49.0,38.0,55.0,118.0,104.0,58.0,60.0" style="Table3">
<tr>
<td>
<para style="Table Contents">
<font face="Times-Roman" size="8.0">[[ repeatIn(o.line_ids, 'line') ]] </font>
<font face="Times-Roman" size="8.0">[[ line.date ]]</font>
</para>
</td>
<td>
<para style="P8">[[ line.ref ]]</para>
</td>
<td>
<para style="P8">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="P8">[[ line.partner_id and line.partner_id.name ]] ([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or '' ]] )</para>
</td>
<td>
<para style="P9">[[ line.name ]]</para>
</td>
<td>
<para style="P10">[[ '%.2f' % line.debit ]]</para>
</td>
<td>
<para style="P10">[[ '%.2f' % line.credit ]]</para>
</td>
<td>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<para style="terp_default_8">[[ repeatIn(o.line_ids, 'line') ]]</para>
<blockTable colWidths="48.0,43.0,58.0,128.0,127.0,64.0,65.0" style="Table_Line_Content_Detail">
<tr>
<td>
<para style="terp_default_9">[[ line.date ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.ref ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.partner_id and line.partner_id.name ]]<font>([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or removeParentNode('font') ]] )</font></para>
</td>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.debit) or '%.2f' % line.debit ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.credit) or '%.2f' % line.credit ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
<blockTable colWidths="364.0,58.0,60.0" style="Table4">
<tr>
<td>
<para style="P11">TOTAL:</para>
</td>
<td>
<para style="P12">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P12">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="Standard">
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
addons/account/report/central_journal.py
+1 -1
View File
@@ -55,7 +55,7 @@ class journal_print(report_sxw.rml_parse):
def _sum_credit(self, period_id, journal_id):
self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id))
return self.cr.fetchone()[0] or 0.0
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml',parser=journal_print)
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml',parser=journal_print, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/report/central_journal.rml
+180 -92
View File
@@ -3,6 +3,30 @@
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Central Journal-[[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -10,44 +34,62 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockTableStyle id="Table_header_Content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table_Sub_Header_Content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Subheader_Content_detail">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Account_detail_Title">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Final_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Journal_Line_Content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -55,104 +97,150 @@
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<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="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<para style="Table Contents">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="147.0,184.0,151.0" repeatRows="1" style="Table1">
<!--blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
<tr>
<td>
<para style="P1">
<para style="terp_header">[[ company.name ]]</para>
</td>
<td>
<para style="terp_header">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">Central Journal</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
<para style="terp_header">Central Journal-[[ company.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="P4">[[ company.name ]]</para>
</td>
<td>
<para style="P3">[[ o.journal_id.code ]] [[ o.journal_id.name ]]</para>
</td>
<td>
<para style="P5">Currency: [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
</blockTable-->
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P6">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="P7">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="158.0,103.0,103.0,58.0,60.0" repeatRows="1" style="Table2">
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
<tr>
<td>
<para style="P8">Account number</para>
<para style="terp_tblheader_General_Centre">Journal Code</para>
</td>
<td>
<para style="P8">Account name</para>
<para style="terp_tblheader_General_Centre">Journal Name</para>
</td>
<td>
<para style="P8">Currency</para>
</td>
<td>
<para style="P8">Debit</para>
</td>
<td>
<para style="P8">Credit</para>
<para style="terp_tblheader_General_Centre">Printing Date</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="158.0,104.0,103.0,58.0,60.0" style="Table3">
<blockTable colWidths="180.0,180.0,180.0" style="Table_Subheader_Content_detail">
<tr>
<td>
<para style="P9"><font face="Times-Roman">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</font>[[ line['code'] ]]</para>
<para style="terp_tblheader_General_Centre">[[ o.journal_id.code or '' ]]</para>
</td>
<td>
<para style="P10">[[ line['name'] ]]</para>
<para style="terp_tblheader_General_Centre">[[ o.journal_id.name ]]</para>
</td>
<td>
<para style="P10">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P11">[[ line['debit'] and '%.2f' % line['debit'] or '' ]]</para>
</td>
<td>
<para style="P11">[[ line['credit'] and '%.2f' % line['credit'] or '' ]]</para>
<para style="terp_tblheader_General_Centre">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="364.0,58.0,60.0" style="Table4">
<tr>
<td>
<para style="P12">TOTAL:</para>
</td>
<td>
<para style="P13">[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
<td>
<para style="P13">[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<pageBreak/>
<para style="P14">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="83.0,272.0,95.0,89.0" style="Table_Account_detail_Title" repeatRows="1">
<tr>
<td>
<para style="terp_tblheader_Details_Centre">Account Num.</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
</tr>
<tr>
<td>
<blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
<blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Journal_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ line['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['debit']) and '%.2f' % line['debit'] or '0.00' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['credit']) and '%.2f' % line['credit'] or '0.00' ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/report/general_journal.py
+1 -1
View File
@@ -96,7 +96,7 @@ class journal_print(report_sxw.rml_parse):
return 0.0
self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'')
return self.cr.fetchone()[0] or 0.0
report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print)
report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/report/general_journal.rml
+188 -123
View File
@@ -1,8 +1,32 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(596.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">General Journal - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -10,174 +34,215 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<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="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockTableStyle id="Table_Header_Title">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table_Print_Current_datetime">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockTableStyle id="Table_Journal_Title">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Final_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Sub_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="2,2"/>
<lineStyle kind="LINEBELOW" colorName="white" start="0,1" stop="-1,1"/>
</blockTableStyle>
<blockTableStyle id="Table_Journal_Detail">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<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="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<!--blockTable colWidths="180.0,180.0,180.0" style="Table_Header_Title">
<tr>
<td>
<para style="Table Contents">
<para style="terp_header">[[ company.name ]]</para>
</td>
<td>
<para style="terp_header">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">General Journal </para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
<para style="terp_header">General Journal - [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable-->
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="75.0,465.0" style="Table_Print_Current_datetime">
<tr>
<td>
<para style="Table Contents">[[ company.name ]]</para>
<para style="terp_default_Bold_9">Printing Date :</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P4">Currency: <font face="Times-Roman">[[ company.currency_id.name ]]</font></para>
<para style="terp_default_Bold_9">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P5">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="95.0,135.0,61.0,101.0,90.0" repeatRows="1" style="Table5">
<tr>
<td>
<para style="P6">Journal code</para>
</td>
<td>
<para style="P6">Journal name</para>
</td>
<td>
<para style="P6">Period</para>
</td>
<td>
<para style="P6">Debit trans.</para>
</td>
<td>
<para style="P6">Credit trans.</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<section>
<para style="P7">[[ repeatIn( periods(objects), 'o') ]]</para>
<blockTable colWidths="95.0,134.0,62.0,101.0,90.0" style="Table3">
<tr>
<td>
<para style="P8">
<font face="Times-Roman">[[ repeatIn(lines(o.id), 'line') ]]</font>
<font face="Times-Roman">[[ line['code'] ]]</font>
</para>
</td>
<td>
<para style="P9">[[ line['name'] ]]</para>
</td>
<td>
<para style="P9">[[ o.name ]]</para>
</td>
<td>
<para style="P10">[[ line['debit'] and ('%.2f' % line['debit']) or '' ]]</para>
</td>
<td>
<para style="P10">[[ line['credit'] and ('%.2f' % line['credit']) or '' ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="292.0,101.0,89.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="P11">Total [[ o.name ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_debit_period(o.id) ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_credit_period(o.id) ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
</section>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="292.0,101.0,89.0" repeatRows="1" style="Table2">
<blockTable colWidths="61.0,228.0,95.0,80.0,73.0" style="Table_Journal_Title" repeatRows="1">
<tr>
<td>
<para style="P11">TOTAL:</para>
<para style="terp_tblheader_Details">Jrl Code</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_debit() ]]</para>
<para style="terp_tblheader_Details">Journal Name</para>
</td>
<td>
<para style="P12">[[ '%.2f' % sum_credit() ]]</para>
<para style="terp_tblheader_Details">Period</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit Trans.</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit Trans.</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<tr>
<td>
<blockTable colWidths="64.0,226.0,82.0,82.0,76.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit() ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit() ]]</u></para>
</td>
</tr>
</blockTable>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
<blockTable colWidths="175.0,115.0,82.0,82.0,75.0" style="Table_Sub_Total">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o.name ]] :</para>
</td>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit_period(o.id) ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit_period(o.id) ]]</u></para>
</td>
</tr>
<tr>
<td>
<blockTable colWidths="60.0,219.0,88.0,80.0,76.0" style="Table_Journal_Detail">
<tr>
<td>
<para style="terp_default_9"><font>[[ repeatIn(lines(o.id),'line')]]</font>[[ line['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line['debit'] and ('%.2f' % line['debit']) or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line['credit'] and ('%.2f' % line['credit']) or '' ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/report/general_ledger.rml
+34 -34
View File
@@ -16,14 +16,14 @@
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawString x="17.7cm" y="28.1cm">General Ledger</drawString>
<drawString x="16.7cm" y="28.1cm">General Ledger - [[ company.currency_id.name ]]</drawString>
<!--COL 2-->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
@@ -32,29 +32,29 @@
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="tbl_header">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="tbl_content">
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -91,7 +91,7 @@
<paraStyle name="Index" fontName="Helvetica"/>
</stylesheet>
<story>
<blockTable colWidths="54.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="54.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3_centre">Date</para>
@@ -122,7 +122,7 @@
<para>[[ repeatIn(objects, 'a') ]]</para>
<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
<td>
<blockTable colWidths="48.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_content">
<blockTable colWidths="48.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">
<tr>
<td>
<blockTable colWidths="273.00,100.0,52.5,52.5,52.5" style="Table5">
@@ -139,7 +139,7 @@
<para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
<tr>
@@ -147,7 +147,7 @@
<td>
<para style="P16"></para>
</td>
<td>
<para style="P3">Balance Initial</para>
</td>
@@ -169,13 +169,13 @@
<td>
<para style="P4">[[ (o.init_debit - o.init_credit) or '0.0' ]]</para>
</td>
</tr>
<tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
<td>
<para style="P3">[[ line['date'] ]]</para>
</td>
<td>
<para style="P3">[[ line['partner'] ]]</para>
</td>
@@ -197,14 +197,14 @@
<td>
<para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
<blockTable colWidths="59.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="59.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3_centre">Date</para>
@@ -229,17 +229,17 @@
</td>
<td>
<para style="P4">Balance</para>
</td>
</td>
<td>
<para style="P4">Currency</para>
</td>
</td>
</tr>
<tr>
<para>[[ repeatIn(objects, 'a') ]]</para>
<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
<td>
<blockTable colWidths="54.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
<blockTable colWidths="54.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
<tr>
<td>
<blockTable colWidths="259.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
@@ -256,18 +256,18 @@
<para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
</td>
<td>
<para style="P9b"><u> [[ sum_currency_amount_account(a, data['form']) or '0.0' ]]</u></para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
<td>
<para style="P16"></para>
</td>
<td>
<para style="P3">Balance Initial</para>
</td>
@@ -292,7 +292,7 @@
<td>
<para style="P4"> </para>
</td>
</tr>
<tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
<td>
@@ -323,15 +323,15 @@
<para style="P4">[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]</para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
</blockTable>
</story>
</document>
</document>
addons/account/report/general_ledger_landscape.rml
+44 -44
View File
@@ -16,7 +16,7 @@
<!--COL 1-->
<drawString x="1.3cm" y="25.50cm">[[ company.name ]]</drawString>
<drawString x="36.00cm" y="25.50cm">General Ledger</drawString>
<drawString x="35.00cm" y="25.50cm">General Ledger - [[ company.currency_id.name ]]</drawString>
<!--COL 2-->
<setFont name="Helvetica" size="9"/>
@@ -24,39 +24,39 @@
<drawString x="37.20cm" y="0.90cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1.3cm 24.9cm 38.3cm 24.9cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="tbl_header">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="tbl_content">
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -92,10 +92,10 @@
<paraStyle name="Index" fontName="Helvetica"/>
</stylesheet>
<story>
<blockTable colWidths="55.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<blockTable colWidths="55.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P12"><font color="white"> </font></para>
@@ -145,10 +145,10 @@
<tr>
<para>[[ repeatIn(objects, 'a') ]]</para>
<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
<td>
<blockTable colWidths="50.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
<blockTable colWidths="50.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
<tr>
<td>
<blockTable colWidths="400.0,374.0,69.0,72.0,64.0,59.00" style="Table5">
@@ -165,18 +165,18 @@
<para style="P9b"><u>[[ sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
</td>
<td>
<para style="P9b"><u> [[ sum_currency_amount_account(o, data['form']) or '0.0' ]]</u></para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
<td>
<para style="P3_content">Balance Initial</para>
</td>
<td>
<para style="P3_content"></para>
</td>
@@ -207,13 +207,13 @@
<td>
<para style="P4_content"> </para>
</td>
</tr>
</tr>
<tr>
[[ repeatIn(lines(o, data['form']), 'line') ]]
<td>
<para style="P2_content">[[ line['date'] ]]</para>
</td>
<td>
@@ -247,17 +247,17 @@
<para style="P4_content">[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]</para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
</blockTable>
<blockTable colWidths="55.0,35.0,196.0,90.0,30.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<blockTable colWidths="55.0,35.0,166.0,90.0,60.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P12">
@@ -320,7 +320,7 @@
<para style="P4">Balance</para>
</td>
</tr>
<tr>
<td>
<para>[[ repeatIn(objects, 'a') ]]</para>
@@ -342,14 +342,14 @@
<para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
<td>
<para style="P3_content"></para>
</td>
<td>
<para style="P3_content">Solde Initial</para>
</td>
@@ -368,7 +368,7 @@
<td>
<para style="P3_content"></para>
</td>
<td>
<para style="P4_content">[[ o.init_debit or '0.0' ]]</para>
</td>
@@ -378,7 +378,7 @@
<td>
<para style="P4_content">[[ o.init_debit - o.init_credit or '0.0' ]]</para>
</td>
</tr>
<tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
<td>
@@ -412,15 +412,15 @@
<para style="P4_content">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
</td>
</tr>
</blockTable>
</blockTable>
</td>
</tr>
</blockTable>
</blockTable>
<para style="P12">
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/report/overdue.rml
+162 -139
View File
@@ -14,195 +14,193 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<!-- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,-1"/> -->
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
</blockTableStyle>
<blockTableStyle id="Tableau3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
<blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
<blockBackground colorName="#e6e6e6" start="6,0" stop="6,0"/>
<blockBackground colorName="#e6e6e6" start="7,0" stop="7,0"/>
</blockTableStyle>
<blockTableStyle id="Tableau6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,2" stop="7,2"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P14" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
<paraStyle name="P15" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P16" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
<paraStyle name="P17" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/>
<paraStyle name="P18" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
<paraStyle name="P19" fontName="Times-Roman" alignment="LEFT"/>
<paraStyle name="P20" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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="P1" fontName="Helvetica"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="11.0" leading="14"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
<paraStyle name="P4" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="CENTER"/>
<paraStyle name="P5" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT"/>
<paraStyle name="P6" fontName="Helvetica" alignment="LEFT"/>
<paraStyle name="P7" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8a" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P15" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
<paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P20a" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P21" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P22" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P23" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P24" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P25" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
</stylesheet>
<images/>
<story>
<para style="P1">[[ repeatIn(objects,'o') ]]</para>
<para style="P1">[[ setLang(o.lang) ]]</para>
<para style="P7">[[ repeatIn(objects,'o') ]]</para>
<para style="P7">[[ setLang(o.lang) ]]</para>
<blockTable colWidths="286.0,224.0" style="Tableau2">
<tr>
<td>
<para style="P2">
<para style="P11">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P12">[[ o.name ]]</para>
<para style="P13">[[ adr_get(o, 'invoice')['name'] ]]</para>
<para style="P13">[[ adr_get(o, 'invoice')['street'] ]]</para>
<para style="P13">[[ adr_get(o, 'invoice')['zip'] ]] [[ adr_get(o, 'invoice')['city'] ]]</para>
<para style="P13">[[ adr_get(o, 'invoice')['country_id'] and adr_get(o, 'invoice')['country_id'][1] ]]</para>
<para style="P13">
<para style="P16">[[ o.name ]]</para>
<para style="P17">[[ adr_get(o, 'invoice')['name'] ]]</para>
<para style="P17">[[ adr_get(o, 'invoice')['street'] ]]</para>
<para style="P17">[[ adr_get(o, 'invoice')['zip'] ]] [[ adr_get(o, 'invoice')['city'] ]]</para>
<para style="P17">[[ adr_get(o, 'invoice')['country_id'] and adr_get(o, 'invoice')['country_id'][1] ]]</para>
<para style="P17">
<font color="white"> </font>
</para>
<para style="P13">VAT: [[ o.vat or removeParentNode('para') ]]</para>
<para style="P17">VAT: [[ o.vat or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
<para style="P4">
<font color="white"> </font>
</para>
<para style="P5">
<font color="white"> </font>
</para>
<para style="P17"><font face="Helvetica">Document</font><font face="Helvetica">:</font> Customer account statement</para>
<para style="P17">
<font color="white"> </font>
<font face="Helvetica">Date: </font>
<font face="Helvetica">[[ time.strftime('%d/%m/%Y') ]]</font>
</para>
<para style="P18">
<font color="white"> </font>
</para>
<para style="P13"><font face="Times-Roman">Document</font><font face="Times-Roman">:</font> Customer account statement</para>
<para style="P13">
<font face="Times-Roman">Date: </font>
<font face="Times-Roman">[[ time.strftime('%d/%m/%Y') ]]</font>
</para>
<para style="P15"><font face="Times-Roman">Customer Ref:</font> [[ o.id ]]</para>
<para style="P16">
<font color="white"> </font>
</para>
<para style="P16">Dear Sir/Madam,</para>
<para style="P16">
<font color="white"> </font>
</para>
<para style="P16">Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.</para>
<para style="P16">
<font color="white"> </font>
</para>
<para style="P16">Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at [[ tel_get(company.partner_id) ]].</para>
<para style="P16">
<font color="white"> </font>
</para>
<para style="P16">Best regards.</para>
<para style="P18"><font face="Helvetica">Customer Ref:</font> [[ o.id ]]</para>
<para style="P19">
<font color="white"> </font>
</para>
<blockTable colWidths="59.0,137.0,65.0,58.0,60.0,57.0,56.0,19.0" style="Tableau3">
<para style="P19">Dear Sir/Madam,</para>
<para style="P19">
<font color="white"> </font>
</para>
<para style="P19">Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.</para>
<para style="P19">
<font color="white"> </font>
</para>
<para style="P19">Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at +32 81 81 37 00.</para>
<para style="P19">
<font color="white"> </font>
</para>
<para style="P19">Best regards.</para>
<para style="P6">
<font color="white"> </font>
</para>
<blockTable colWidths="59.0,130.0,65.0,65.0,60.0,57.0,56.0,19.0" style="Tableau3">
<tr>
<td>
<para style="P3">Date</para>
<para style="P20">Date</para>
</td>
<td>
<para style="P3">Description</para>
<para style="P20">Description</para>
</td>
<td>
<para style="P3">Ref</para>
<para style="P20">Ref</para>
</td>
<td>
<para style="P3">Maturity date</para>
<para style="P20">Maturity date</para>
</td>
<td>
<para style="P4">Due</para>
<para style="P20a">Due</para>
</td>
<td>
<para style="P4">Paid</para>
<para style="P20a">Paid</para>
</td>
<td>
<para style="P4">Maturity</para>
<para style="P20a">Maturity</para>
</td>
<td>
<para style="P4">Li.</para>
<para style="P20a">Li.</para>
</td>
</tr>
<tr>
<tr>
<td>
<para style="P5">
<font face="Times-Roman">[[repeatIn(getLines(o), 'line') ]]</font>
<font face="Times-Roman"> [[ line['date'] ]]</font>
</para>
<para style="P8">Sub-Total: </para>
</td>
<td></td>
<td></td>
<td></td>
<td>
<para style="P9">[[ '%.2f' % (reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]</para>
</td>
<td>
<para style="P6">[[ line['name'] ]]</para>
<para style="P9">[[ '%.2f' % (reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]] </para>
</td>
<td>
<para style="P7">[[ line['ref'] ]]</para>
<para style="P9">[[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]</para>
</td>
<td>
<para style="P7">[[ line['date_maturity'] ]]</para>
</td>
<td>
<para style="P10">[[ line['debit'] and '%.2f' % (line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P8">[[ line['credit'] and '%.2f' % (line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P8">[[ (line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and '%.2f' % ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P8">[[ line['blocked'] and 'X' or '' ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="318.0,61.0,56.0,56.0,19.0" style="Tableau6">
<tr>
<td>
<para style="P11">Sub-Total: </para>
</td>
<td>
<para style="P11">[[ '%.2f' % (reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]</para>
</td>
<td>
<para style="P8">
<font face="Times-Bold">[[ '%.2f' % (reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]</font>
</para>
</td>
<td>
<para style="P10">[[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]</para>
</td>
<td>
<para style="P20">
<para style="P15">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P11">Balance: </para>
<para style="P8">Balance: </para>
</td>
<td></td>
<td></td>
<td></td>
<td>
<para style="P9">[[ '%.2f' % (reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]</para>
</td>
<td>
<para style="P11">[[ '%.2f' % (reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]]</para>
<para style="P12">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P9">
@@ -210,27 +208,52 @@
</para>
</td>
<td>
<para style="P11">
<para style="P15">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P8a">
<font face="Helvetica">[[repeatIn(getLines(o), 'line') ]]</font>
<font face="Helvetica"> [[ line['date'] ]]</font>
</para>
</td>
<td>
<para style="P20">
<font color="white"> </font>
</para>
<para style="P10">[[ line['name'] ]]</para>
</td>
<td>
<para style="P11">[[ line['ref'] ]]</para>
</td>
<td>
<para style="P11">[[ line['date_maturity'] ]]</para>
</td>
<td>
<para style="P14">[[ line['debit'] and '%.2f' % (line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P12">[[ line['credit'] and '%.2f' % (line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P12">[[ (line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and '%.2f' % ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</para>
</td>
<td>
<para style="P12">[[ line['blocked'] and 'X' or '' ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="P1">
<font color="white"> </font>
</para>
<para style="P14">
<font face="Times-Roman">Total amount due: </font>
<font face="Times-Roman">[[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]] [[ company.currency_id.name ]].</font>
<para style="P3">
<font face="Helvetica" size="9.0">Total amount due: </font>
<font face="Helvetica" size="9.0">[[ '%.2f' % (reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0)) ]] [[ company.currency_id.name ]]</font>
<font face="Helvetica">.</font>
</para>
<para style="P13">
<para style="P2">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/report/partner_balance.py
+125 -38
View File
@@ -67,10 +67,13 @@ class partner_balance(report_sxw.rml_parse):
return full_str_date
#
def transform_period_into_date_array(self,data):
## Get All Period Date
#
# If we have no period we will take all perdio in the FiscalYear.
print"data['form']['periods'][0][2]",data['form']['periods'][0][2]
if not data['form']['periods'][0][2] :
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
@@ -79,7 +82,6 @@ class partner_balance(report_sxw.rml_parse):
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
self.date_lst = date_array
self.date_lst.sort()
@@ -89,7 +91,54 @@ class partner_balance(report_sxw.rml_parse):
self.date_lst = return_array
self.date_lst.sort()
def transform_both_into_date_array(self,data):
if not data['form']['periods'][0][2] :
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
periods_id = data['form']['periods'][0][2]
date_array = []
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
period_start_date = date_array[0]
date_start_date = data['form']['date1']
period_stop_date = date_array[-1]
date_stop_date = data['form']['date2']
if period_start_date<date_start_date:
start_date = period_start_date
else :
start_date = date_start_date
if date_stop_date<period_stop_date:
stop_date = period_stop_date
else :
stop_date = date_stop_date
print"===start_date===",start_date
print"===stop_date===",stop_date
final_date_array = []
final_date_array = final_date_array + self.date_range(start_date,stop_date)
self.date_lst = final_date_array
self.date_lst.sort()
def transform_none_into_date_array(self,data):
print"======transform_none_into_date_array====="
sql = "SELECT min(date) as start_date from account_move_line"
self.cr.execute(sql)
start_date = self.cr.fetchone()[0]
sql = "SELECT max(date) as start_date from account_move_line"
self.cr.execute(sql)
stop_date = self.cr.fetchone()[0]
print"stop_date",stop_date
array = []
array = array + self.date_range(start_date,stop_date)
self.date_lst = array
self.date_lst.sort()
def comma_me(self,amount):
if type(amount) is float :
@@ -109,10 +158,27 @@ class partner_balance(report_sxw.rml_parse):
# Transformation des date
#
#
if data['form'].has_key('fiscalyear'):
self.transform_period_into_date_array(data)
else:
if data['form']['state'] == 'none':
print"========none=========="
self.transform_none_into_date_array(data)
elif data['form']['state'] == 'bydate':
print"========bydate=========="
self.transform_date_into_date_array(data)
elif data['form']['state'] == 'byperiod':
print"========byperiod=========="
self.transform_period_into_date_array(data)
elif data['form']['state'] == 'all':
print"========both=========="
self.transform_both_into_date_array(data)
# if data['form']['fiscalyear']:
# print"data['form']['fiscalyear']=True"
# self.transform_period_into_date_array(data)
# else:
# print"data['form']['fiscalyear']=False"
# self.transform_date_into_date_array(data)
##
self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
## Compute Code
@@ -147,6 +213,7 @@ class partner_balance(report_sxw.rml_parse):
#
#
if data['form']['soldeinit'] :
print"=====self.date_lst[0]=====",self.date_lst[0]
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, " \
"CASE WHEN sum(debit) > sum(credit) " \
@@ -178,6 +245,7 @@ class partner_balance(report_sxw.rml_parse):
#
#
#
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, " \
"CASE WHEN sum(debit) > sum(credit) " \
@@ -202,7 +270,7 @@ class partner_balance(report_sxw.rml_parse):
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name")
res = self.cr.dictfetchall()
print"=====res=====",res
for r in res:
full_account.append(r)
@@ -229,18 +297,19 @@ class partner_balance(report_sxw.rml_parse):
new_header['ref'] = ''
new_header['name'] = r['account_name']
new_header['code'] = r['code']
new_header['debit'] = 0
new_header['credit'] = 0
new_header['scredit'] = 0
new_header['sdebit'] = 0
new_header['enlitige'] = 0
new_header['balance'] = 0
new_header['debit'] = tot_debit
new_header['credit'] = tot_credit
new_header['scredit'] = tot_scredit
new_header['sdebit'] = tot_sdebit
new_header['enlitige'] = tot_enlitige
new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
new_header['type'] = 3
##
completearray.append(new_header)
#
r['type'] = 1
r['balance'] = float(r['sdebit']) - float(r['scredit'])
completearray.append(r)
#
tot_debit = r['debit']
@@ -252,21 +321,27 @@ class partner_balance(report_sxw.rml_parse):
else:
if cleanarray[i]['account_id'] <> cleanarray[i-1]['account_id']:
##
new_tot = {}
new_tot['ref'] = 'Total'
new_tot['name'] = cleanarray[i-1]['account_name']
new_tot['code'] = cleanarray[i-1]['code']
new_tot['debit'] = tot_debit
new_tot['credit'] = tot_credit
new_tot['scredit'] = tot_scredit
new_tot['sdebit'] = tot_sdebit
new_tot['enlitige'] = tot_enlitige
new_tot['balance'] = float(tot_sdebit) - float(tot_scredit)
new_tot['type'] = 3
##
completearray.append(new_tot)
# new_tot = {}
# new_tot['ref'] = 'Total'
# new_tot['name'] = cleanarray[i-1]['account_name']
# new_tot['code'] = cleanarray[i-1]['code']
#
# new_tot['debit'] = tot_debit
# new_tot['credit'] = tot_credit
# new_tot['scredit'] = tot_scredit
# new_tot['sdebit'] = tot_sdebit
# new_tot['enlitige'] = tot_enlitige
# new_tot['balance'] = float(tot_sdebit) - float(tot_scredit)
# new_tot['type'] = 3
# ##
# completearray.append(new_tot)
new_header['debit'] = tot_debit
new_header['credit'] = tot_credit
new_header['scredit'] = tot_scredit
new_header['sdebit'] = tot_sdebit
new_header['enlitige'] = tot_enlitige
new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
new_header['type'] = 3
# we reset the counter
tot_debit = r['debit']
tot_credit = r['credit']
@@ -279,12 +354,12 @@ class partner_balance(report_sxw.rml_parse):
new_header['ref'] = ''
new_header['name'] = r['account_name']
new_header['code'] = r['code']
new_header['debit'] = 0
new_header['credit'] = 0
new_header['scredit'] = 0
new_header['sdebit'] = 0
new_header['enlitige'] = 0
new_header['balance'] = 0
new_header['debit'] = tot_debit
new_header['credit'] = tot_credit
new_header['scredit'] = tot_scredit
new_header['sdebit'] = tot_sdebit
new_header['enlitige'] = tot_enlitige
new_header['balance'] = float(tot_sdebit) - float(tot_scredit)
new_header['type'] = 3
##
##
@@ -296,8 +371,10 @@ class partner_balance(report_sxw.rml_parse):
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
completearray.append(r)
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
# we reset the counter
tot_debit = tot_debit + r['debit']
tot_credit = tot_credit + r['credit']
tot_scredit = tot_scredit + r['scredit']
@@ -308,8 +385,11 @@ class partner_balance(report_sxw.rml_parse):
#
r['balance'] = float(r['sdebit']) - float(r['scredit'])
#
completearray.append(r)
i = i + 1
return completearray
@@ -320,6 +400,7 @@ class partner_balance(report_sxw.rml_parse):
result_tmp = 0.0
#
#
if data['form']['soldeinit'] :
self.cr.execute(
'SELECT sum(debit) ' \
@@ -443,17 +524,21 @@ class partner_balance(report_sxw.rml_parse):
# ' account_id IN (' + self.account_ids + ') ' \
'l.date IN (' + self.date_lst_string + ') ' \
'GROUP BY partner_id')
a = self.cr.fetchone()[0]
print"====self.cr.fetchone()====",a
if self.cr.fetchone() != None:
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
result_tmp = result_tmp + (a or 0.0)
else:
result_tmp = 0.0
return result_tmp
def _sum_scredit(self,data):
if not self.ids:
return 0.0
account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
result_tmp = 0.0
#
#
@@ -470,8 +555,9 @@ class partner_balance(report_sxw.rml_parse):
'AND l.reconcile_id IS NULL ' \
'GROUP BY partner_id',
(self.date_lst[0],))
print"self.cr.fetchone()[0]",self.cr.fetchone()
if self.cr.fetchone() != None:
result_tmp = float(self.cr.fetchone()[0])
result_tmp = float(self.cr.fetchone()[0]) or 0.0
else:
result_tmp = 0.0
#
@@ -486,9 +572,10 @@ class partner_balance(report_sxw.rml_parse):
# ' account_id IN (' + self.account_ids + ') ' \
'l.date IN (' + self.date_lst_string + ') ' \
'GROUP BY partner_id')
a = self.cr.fetchone()[0]
if self.cr.fetchone() != None:
result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0)
result_tmp = result_tmp + (a or 0.0)
else:
result_tmp = 0.0
addons/account/report/partner_balance.rml
+268 -92
View File
@@ -3,6 +3,7 @@
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
@@ -16,22 +17,23 @@
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawString x="12.7cm" y="28.1cm">Third Party 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' ]] - [[ get_currency(data['form']) ]]</drawString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></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>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -55,11 +57,13 @@
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<!--<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/> -->
<blockValign value="TOP"/>
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
@@ -76,24 +80,29 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" />
<lineStyle kind="OUTLINE" colorName="#e6e6e6" />
<blockBackground colorName="white" start="0,0" stop="-1,0"/>
</blockTableStyle>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.5" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9b" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12a" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12b" fontName="Helvetica" fontSize="9.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
@@ -103,106 +112,273 @@
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<blockTableStyle id="TrLevel8">
<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">
<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,3" stop="1,3"/>
</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="TrLevel0">
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,2" stop="1,2"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,2" stop="-1,2"/>
</blockTableStyle>
<blockTableStyle id="LineLevel1">
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Line1">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Line2">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
</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
name="Level5"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Level4"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Level3"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle name="Level2"
fontSize="8.0"
fontName="Helvetica-Bold"
/>
<paraStyle name="Level1"
fontSize="8.0"
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>
<story>
<blockTable colWidths="247.0,60.0,58.0,55.0,54.0,57.0" style="Tableau3">
<blockTable colWidths="61.0,206.0,69.0,68.0,69.0,68.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="P7">Grand total</para>
</td>
<td>
<para style="P8">[[ comma_me(sum_debit(data)) ]]</para>
</td>
<td>
<para style="P8">[[ comma_me(sum_credit(data)) ]]</para>
</td>
<td>
<para style="P8">[[ comma_me(sum_sdebit(data)) ]]</para>
</td>
<td>
<para style="P8">[[ comma_me(sum_scredit(data)) ]]</para>
</td>
<td>
<para style="P8">[[ comma_me(sum_litige(data)) ]]</para>
</td>
</tr>
<tr>
<td>
<para style="P7">Balance</para>
</td>
<td>
<para style="P8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P8">[[ comma_me(solde_debit(data)) ]]</para>
</td>
<td>
<para style="P8">[[ comma_me(solde_credit(data)) ]]</para>
</td>
<td>
<para style="P8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="61.0,196.0,60.0,58.0,109.0,57.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="P12a">Code</para>
<para style="P12a">[[ setTag('tr','tr',{'style':'Line1'}) ]] Code </para>
</td>
<td>
<para style="P12a">Partner name</para>
</td>
<td>
<para style="P12">Débit</para>
<para style="P12b">Débit</para>
</td>
<td>
<para style="P12">Crédit</para>
<para style="P12b">Crédit</para>
</td>
<td>
<para style="P12">Balance</para>
<para style="P12b">Balance</para>
</td>
<td>
<para style="P12">In dispute</para>
<para style="P12b">In dispute</para>
</td>
</tr>
<tr>
<td>
<para style="P3">[[ repeatIn(lines(data), 'a') ]]<font face="Helvetica">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]]</font></para>
<para style="P7">[[ setTag('tr','tr',{'style':'Line2'}) ]] Grand total</para>
</td>
<td>
<para style="P3">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==3 and a['code'] ]] [[ a['name'] ]] </para>
<para style="P8"></para>
</td>
<td>
<para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['debit']) ]]</para>
<para style="P8"><u>[[ sum_debit(data) or '0.0' ]]</u></para>
</td>
<td>
<para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['credit']) ]]</para>
<para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
</td>
<td>
<para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['balance']) ]]</para>
<para style="P8"><u>[[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]]</u></para>
</td>
<td>
<para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['enlitige']) ]]</para>
<para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
</td>
</tr>
<!--<tr>
<td>
<para style="P7">Balance</para>
</td><td>
</td> <td>
</td><td>
<para style="P8">[[ solde_debit(data) or '0.0' ]]</para>
</td>
<td>
<para style="P8">[[ solde_credit(data) or '0.0' ]]</para>
</td>
<td>
</td>
</tr> -->
<tr>
<td>
<para style="P3">[[ repeatIn(lines(data), 'a') ]]<font face="Helvetica">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para>
</td>
<td>
<para style="P3">[[ a['type']==3 and ( setTag('tr','tr',{'style':'TrLevel0'})) ]] [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==1 and ( setTag('blockTable','blockTable',{'style':'LineLevel1'})) ]] [[ a['name'] ]]</para>
</td>
<td>
<para style="P4">
<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['debit'] or '0.0' ]]</u></font>
<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['debit'] or '0.0' ]]</font>
</para>
</td>
<td>
<para style="P4">
<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['credit'] or '0.0' ]]</u></font>
<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['credit'] or '0.0' ]]</font>
</para>
</td>
<td>
<para style="P4">
<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['balance'] or '0.0' ]]</u></font>
<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['balance'] or '0.0' ]]</font>
</para>
</td>
<td>
<para style="P4">
<font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ a['enlitige'] or '0.0' ]]</u></font>
<font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ a['enlitige'] or '0.0' ]]</font>
</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P11"/>
<para style="P9">
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/account/report/tax_report.py
+3 -2
View File
@@ -87,7 +87,7 @@ class tax_report(rml_parse.rml_parse):
while ind_general < len(res_general) :
res_general[ind_general]['type'] = 2
res_general[ind_general]['pos'] = 0
res_general[ind_general]['level'] = res_dict['level'] + ' '
res_general[ind_general]['level'] = res_dict['level']
top_result.append(res_general[ind_general])
ind_general+=1
i+=1
@@ -143,6 +143,7 @@ class tax_report(rml_parse.rml_parse):
GROUP BY account.id,account.name,account.code', ('draft',tax_code_id,
company_id))
res = self.cr.dictfetchall()
#AND line.period_id IN ('+ period_sql_list +') \
i = 0
@@ -158,7 +159,7 @@ class tax_report(rml_parse.rml_parse):
res = []
for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
res.append(('a'*2*level,code))
print"=====res=====",res
res += self._get_codes(based_on, code.id, level+1)
return res
addons/account/report/tax_report.rml
+17 -16
View File
@@ -128,19 +128,11 @@
</blockTableStyle>
<blockTableStyle id="TrLevelaa">
<blockLeftPadding length="0" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,0" stop="-1,-1"/>
<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 id="TrLevel">
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,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>
<paraStyle
@@ -171,15 +163,14 @@
fontSize="8.0" />
<paraStyle
name="Levelaaaa"
fontName="Helvetica"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Levelaaa"
fontName="Helvetica"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle
name="Levelaa"
firstLineIndent="-0.03cm"
fontName="Helvetica-Bold"
fontSize="8.0" />
<paraStyle name="Level"
@@ -215,19 +206,29 @@
<para style="Caption">[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</para>
<td>
<para style="P5"><font color="white">[[ o['level'] ]]</font>
[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]<font></font>
<font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]</font>
[[ setTag('tr','tr',{'style':'TrLevel'+str(o['level']), 'paraStyle':('Level'+str(o['level']))}) ]]<font></font>
[[ o['code'] ]] [[ o['name'] ]]<font></font>
</para>
</td>
<td>
<para style="P6">[[o['type']==2 and (o['debit']) ]]</para>
<para style="P6"> <font><u>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]</u></font>
<font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]</font>
</para>
</td>
<td>
<para style="P6"> [[o['type']==2 and (o['credit']) ]] </para>
<para style="P6"> <font><u>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]</u></font>
<font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]</font>
</para>
</td>
<td>
<para style="P6">[[ o['tax_amount'] ]]</para>
<para style="P6"> <font><u>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</u></font>
<font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</font>
</para>
</td>
</tr>
addons/account/report/third_party_ledger.py
+67 -5
View File
@@ -79,6 +79,54 @@ class third_party_ledger(rml_parse.rml_parse):
self.date_lst = return_array
self.date_lst.sort()
def transform_both_into_date_array(self,data):
if not data['form']['periods'][0][2] :
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
periods_id = data['form']['periods'][0][2]
date_array = []
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
period_start_date = date_array[0]
date_start_date = data['form']['date1']
period_stop_date = date_array[-1]
date_stop_date = data['form']['date2']
if period_start_date<date_start_date:
start_date = period_start_date
else :
start_date = date_start_date
if date_stop_date<period_stop_date:
stop_date = period_stop_date
else :
stop_date = date_stop_date
print"start_date",start_date
print"stop_date",stop_date
final_date_array = []
final_date_array = final_date_array + self.date_range(start_date, stop_date)
self.date_lst = final_date_array
self.date_lst.sort()
def transform_none_into_date_array(self,data):
sql = "SELECT min(date) as start_date from account_move_line"
self.cr.execute(sql)
start_date = self.cr.fetchone()[0]
print"start_date",start_date
sql = "SELECT max(date) as start_date from account_move_line"
self.cr.execute(sql)
stop_date = self.cr.fetchone()[0]
print"stop_date",stop_date
array= []
array = array + self.date_range(start_date, stop_date)
self.date_lst = array
self.date_lst.sort()
def comma_me(self,amount):
if type(amount) is float :
amount = str('%.2f'%amount)
@@ -108,11 +156,25 @@ class third_party_ledger(rml_parse.rml_parse):
# Transformation des date
#
#
if data['form'].has_key('fiscalyear'):
self.transform_period_into_date_array(data)
else:
self.transform_date_into_date_array(data)
# if data['form']['fiscalyear']:
# self.transform_period_into_date_array(data)
# else:
# self.transform_date_into_date_array(data)
##
if data['form']['state'] == 'none':
print"-----none-----"
self.transform_none_into_date_array(data)
elif data['form']['state'] == 'bydate':
print"-----bydate-------"
self.transform_date_into_date_array(data)
elif data['form']['state'] == 'byperiod':
print"-----byperiod-------"
self.transform_period_into_date_array(data)
elif data['form']['state'] == 'all':
print"-----all-------"
self.transform_both_into_date_array(data)
self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
#
#new_ids = [id for (id,) in self.cr.fetchall()]
@@ -142,7 +204,7 @@ class third_party_ledger(rml_parse.rml_parse):
"FROM account_move_line AS line, account_account AS account " \
"WHERE line.partner_id IS NOT NULL " \
"AND line.account_id = account.id " \
"AND line.date < %s " \
"AND line.date <= %s " \
"AND line.reconcile_id IS NULL " \
# "AND line.account_id IN (" + self.account_ids + ") " \
" " + PARTNER_REQUEST + " " \
addons/account/report/third_party_ledger.rml
+35 -35
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
@@ -19,24 +19,24 @@
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Third Party Ledger [[ 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' ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</header>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
@@ -53,43 +53,43 @@
<blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
<blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
</blockTableStyle>
<blockTableStyle id="tbl_heading">
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockLeftPadding length="0" start="1,0" stop="1,0"/>
<blockAlignment value="LEFT"/>
<blockValign value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -124,16 +124,16 @@
<paraStyle name="Index" fontName="Helvetica"/>
</stylesheet>
<story>
<para style="P2"><font color="white"></font></para>
<para>
<font color="white">[[ data['form']['page_split'] == True or removeParentNode('para') ]] </font>
<font color="white">[[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]]</font>
</para>
<blockTable colWidths="50.0,37.0,120.0,135.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
<blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
<tr>
<td>
<para style="date">Date</para>
</td>
<td>
@@ -147,7 +147,7 @@
</td>
<td>
<para style="P16">Debit</para>
</td>
</td>
<td>
<para style="P16">Credit</para>
</td>
@@ -183,7 +183,7 @@
<font color="white">[[ data['form']['page_split'] == False or removeParentNode('para') ]] </font>
<font color="white">[[ repeatIn(objects, 'p') ]]</font>
</para>
<blockTable colWidths="200.0,137.0,69.0,72.0,63.0" style="Table5">
<blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
<tr>
<td>
<para style="total">[[ p.ref ]] - [[ p.name ]]</para>
@@ -202,7 +202,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="45.0,37.0,120.0,135.0,69.0,72.0,63.0" style="Table2">
<blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
<tr>
<td>
<para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ line['date'] ]]</para>
@@ -211,10 +211,10 @@
<para style="P3">[[ line['code'] ]]</para>
</td>
<td>
<para style="P3">[[ line['ref'] ]]</para>
<para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para>
</td>
<td>
<para style="P4">[[ line['name'] ]]</para>
<para style="P4"></para>
</td>
<td>
<para style="P5">[[ (line['debit']) or '' ]]</para>
@@ -227,13 +227,13 @@
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
</story>
</document>
</document>
addons/account/security/account_security.xml
+26 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="1">
<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
<record id="group_account_invoice" model="res.groups">
<field name="name">Finance / Invoice</field>
@@ -11,4 +11,29 @@
<record id="group_account_manager" model="res.groups">
<field name="name">Finance / Manager</field>
</record>
<record id="menu_finance_configuration" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_reporting" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_legal_statement" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_finance_invoice" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_automatic_reconcile" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_charts" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
</record>
</data></openerp>
addons/account/security/ir.model.access.csv
+30 -13
View File
@@ -4,15 +4,17 @@
"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_user",1,0,0,0
"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,1,1,1
"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_user",1,0,0,0
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
"access_account_tax_code","account.tax.code","model_account_tax_code",,1,0,0,0
"access_account_tax","account.tax","model_account_tax",,1,0,0,0
"access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
"access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
"access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
@@ -24,25 +26,22 @@
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
"access_wizard_multi_charts_accounts","wizard.multi.charts.accounts","model_wizard_multi_charts_accounts","account.group_account_manager",1,1,1,1
"access_account_bank_accounts_wizard","account.bank.accounts.wizard","model_account_bank_accounts_wizard","account.group_account_manager",1,1,1,1
"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
"access_account_move_line","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
"access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
"access_account_invoice","account.invoice","model_account_invoice","account.group_account_user",1,0,0,0
"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_account_user",1,0,0,0
"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,0,0,0
"access_account_analytic_account","account.analytic.account","model_account_analytic_account","account.group_account_user",1,0,0,0
"access_account_analytic_account","account.analytic.account","model_account_analytic_account","base.group_user",1,0,0,0
"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_user",1,1,1,1
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_user",1,1,1,1
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,1,1,1
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
"access_account_move_uinvoice","account.move","model_account_move","account.group_account_user",1,1,1,1
"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
@@ -51,9 +50,12 @@
"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
"access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
"access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_invoice_manager","account.invoice","model_account_invoice","account.group_account_manager",1,1,1,1
"access_account_invoice_line_manager","account.invoice.line","model_account_invoice_line","account.group_account_manager",1,1,1,1
"access_account_invoice_tax_manager","account.invoice.tax","model_account_invoice_tax","account.group_account_manager",1,1,1,1
@@ -62,3 +64,18 @@
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1
"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1
"access_account_invoice_partner_manager","account.invoice partner manager","model_account_invoice","base.group_partner_manager",1,0,0,0
"access_account_invoice_line_partner_manager","account.invoice.line partner manager","model_account_invoice_line","base.group_partner_manager",1,0,0,0
"access_account_invoice_tax_partner_manager","account.invoice.tax partner manager","model_account_invoice_tax","base.group_partner_manager",1,0,0,0
"access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
"access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",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_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_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","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
4 access_account_account_type account.account.type model_account_account_type account.group_account_user 1 0 0 0
5 access_account_tax account.tax model_account_tax account.group_account_user 1 0 0 0
6 access_account_account account.account model_account_account account.group_account_user 1 0 0 0
7 access_account_account_partner_manager account.account partner manager model_account_account base.group_user 1 0 0 0
8 access_account_journal_view account.journal.view model_account_journal_view account.group_account_user 1 0 0 0
9 access_account_journal_column account.journal.column model_account_journal_column account.group_account_user 1 0 0 0
10 access_account_journal account.journal model_account_journal account.group_account_user 1 0 0 0
11 access_account_period account.period model_account_period account.group_account_user 1 0 0 0
12 access_account_journal_period_manager account.journal.period manager model_account_journal_period account.group_account_manager 1 1 1 1
13 access_account_journal_period account.journal.period model_account_journal_period account.group_account_user 1 1 1 1
14 access_account_move account.move model_account_move account.group_account_user 1 1 1 1
15 access_account_move_reconcile account.move.reconcile model_account_move_reconcile account.group_account_user 1 1 1 1
16 access_account_tax_code account.tax.code model_account_tax_code account.group_account_user 1 0 0 0
17 access_account_tax account.tax model_account_tax account.group_account_user 1 0 0 0
18 access_account_model account.model model_account_model account.group_account_user 1 1 1 1
19 access_account_model_line account.model.line model_account_model_line account.group_account_user 1 1 1 1
20 access_account_subscription account.subscription model_account_subscription account.group_account_user 1 1 1 1
26 access_account_tax_template account.tax.template model_account_tax_template account.group_account_manager 1 1 1 1
27 access_wizard_multi_charts_accounts wizard.multi.charts.accounts model_wizard_multi_charts_accounts account.group_account_manager 1 1 1 1
28 access_account_bank_accounts_wizard account.bank.accounts.wizard model_account_bank_accounts_wizard account.group_account_manager 1 1 1 1
29 access_account_move_line account.move.line account.move.line invoice model_account_move_line account.group_account_user account.group_account_invoice 1 1 1 1
30 access_account_bank_statement account.bank.statement model_account_bank_statement account.group_account_user 1 1 1 1
31 access_account_bank_statement_reconcile account.bank.statement.reconcile model_account_bank_statement_reconcile account.group_account_user 1 1 1 1
32 access_account_bank_statement_reconcile_line account.bank.statement.reconcile.line model_account_bank_statement_reconcile_line account.group_account_user 1 1 1 1
33 access_account_bank_statement_line account.bank.statement.line model_account_bank_statement_line account.group_account_user 1 1 1 1
34 access_account_analytic_line account.analytic.line model_account_analytic_line account.group_account_user 1 1 1 1
35 access_report_hr_timesheet_invoice_journal report.hr.timesheet.invoice.journal model_report_hr_timesheet_invoice_journal account.group_account_manager 1 0 0 0
36 access_account_invoice access_account_analytic_account account.invoice account.analytic.account model_account_invoice model_account_analytic_account account.group_account_user base.group_user 1 0 0 0
access_account_invoice_line account.invoice.line model_account_invoice_line account.group_account_user 1 0 0 0
access_account_invoice_tax account.invoice.tax model_account_invoice_tax account.group_account_user 1 0 0 0
access_account_analytic_account account.analytic.account model_account_analytic_account account.group_account_user 1 0 0 0
37 access_account_analytic_journal account.analytic.journal model_account_analytic_journal account.group_account_user 1 0 0 0
38 access_account_invoice_uinvoice account.invoice model_account_invoice account.group_account_user account.group_account_invoice 1 1 1 1
39 access_account_invoice_line_uinvoice account.invoice.line model_account_invoice_line account.group_account_user account.group_account_invoice 1 1 1 1
40 access_account_invoice_tax_uinvoice account.invoice.tax model_account_invoice_tax account.group_account_user account.group_account_invoice 1 1 1 1
41 access_account_analytic_line_uinvoice account.analytic.line model_account_analytic_line account.group_account_user 1 1 1 1
42 access_account_move_uinvoice account.move model_account_move account.group_account_user account.group_account_invoice 1 1 1 1
43 access_account_move_reconcile_uinvoice account.move.reconcile model_account_move_reconcile account.group_account_user account.group_account_invoice 1 1 1 1
44 access_account_journal_period_uinvoice account.journal.period model_account_journal_period account.group_account_user account.group_account_invoice 1 1 1 1
45 access_account_payment_term_manager account.payment.term model_account_payment_term account.group_account_manager 1 1 1 1
46 access_account_payment_term_line_manager account.payment.term.line model_account_payment_term_line account.group_account_manager 1 1 1 1
47 access_account_account_type_manager account.account.type model_account_account_type account.group_account_manager 1 1 1 1
50 access_account_journal_view_manager account.journal.view model_account_journal_view account.group_account_manager 1 1 1 1
51 access_account_journal_column_manager account.journal.column model_account_journal_column account.group_account_manager 1 1 1 1
52 access_account_journal_manager account.journal model_account_journal account.group_account_manager 1 1 1 1
53 access_account_journal_invoice account.journal invoice model_account_journal account.group_account_invoice 1 0 0 0
54 access_account_period_manager account.period model_account_period account.group_account_manager 1 1 1 1
55 access_account_period_invoice account.period invoice model_account_period account.group_account_invoice 1 0 0 0
56 access_account_tax_code_manager account.tax.code model_account_tax_code account.group_account_manager 1 1 1 1
57 access_account_tax_manager account.tax model_account_tax account.group_account_manager 1 1 1 1
58 access_account_invoice_group_invoice account.invoice group invoice model_account_invoice account.group_account_invoice 1 1 1 1
59 access_account_invoice_manager account.invoice model_account_invoice account.group_account_manager 1 1 1 1
60 access_account_invoice_line_manager account.invoice.line model_account_invoice_line account.group_account_manager 1 1 1 1
61 access_account_invoice_tax_manager account.invoice.tax model_account_invoice_tax account.group_account_manager 1 1 1 1
64 access_account_fiscalyear account.fiscalyear model_account_fiscalyear account.group_account_manager 1 1 1 1
65 access_account_fiscalyear_user account.fiscalyear.user model_account_fiscalyear account.group_account_user 1 0 0 0
66 access_account_fiscalyear_invoice account.fiscalyear.invoice model_account_fiscalyear account.group_account_invoice 1 0 0 0
67 access_res_currency_account_manager res.currency account manager base.model_res_currency group_account_manager 1 1 1 1
68 access_res_currency_rate_account_manager res.currency.rate account manager base.model_res_currency_rate group_account_manager 1 1 1 1
69 access_account_config_wizard_account_manager account.config.wizard account manager model_account_config_wizard group_account_manager 1 1 1 1
70 access_account_config_wizard_system_manager account.config.wizard system manager model_account_config_wizard base.group_system 1 1 1 1
71 access_account_invoice_partner_manager account.invoice partner manager model_account_invoice base.group_partner_manager 1 0 0 0
72 access_account_invoice_line_partner_manager account.invoice.line partner manager model_account_invoice_line base.group_partner_manager 1 0 0 0
73 access_account_invoice_tax_partner_manager account.invoice.tax partner manager model_account_invoice_tax base.group_partner_manager 1 0 0 0
74 access_account_payment_term_partner_manager account.payment.term partner manager model_account_payment_term base.group_user 1 0 0 0
75 access_account_payment_term_line_partner_manager account.payment.term.line partner manager model_account_payment_term_line base.group_user 1 0 0 0
76 access_account_account_product_manager account.account product manager model_account_account product.group_product_manager 1 0 0 0
77 access_account_journal_product_manager account.journal product manager model_account_journal product.group_product_manager 1 0 0 0
78 access_account_fiscal_position_product_manager account.fiscal.position account.manager model_account_fiscal_position 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_account account.fiscal.position all model_account_fiscal_position_account base.group_user 1 0 0 0
addons/account/wizard/wizard_account_balance_report.py
+7 -3
View File
@@ -46,7 +46,7 @@ dates_form = '''<?xml version="1.0"?>
dates_fields = {
'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')},
'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':"Filter on Accounts",'type':'selection','selection':[('bal_mouvement','With Entries'),('bal_all','All Accounts'),('bal_solde','With Balance Different Than 0')]}
}
@@ -61,8 +61,12 @@ period_form = '''<?xml version="1.0"?>
period_fields = {
'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
'help': 'Keep empty for all open fiscal year'},
'fiscalyear': {
'string':'Fiscal year',
'type':'many2one',
'relation':'account.fiscalyear',
'help':'Keep empty for all open fiscal year'
},
'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')]}
}
addons/account/wizard/wizard_aged_trial_balance.py
+72 -64
View File
@@ -35,76 +35,84 @@ from mx.DateTime import *
_aged_trial_form = """<?xml version="1.0"?>
<form string="Aged Trial Balance">
<field name="company_id"/>
<newline/>
<field name="date1"/>
<field name="period_length"/>
<newline/>
<field name="result_selection"/>
<newline/>
<field name="direction_selection"/>
<field name="company_id"/>
<newline/>
<field name="date1"/>
<field name="period_length"/>
<newline/>
<field name="result_selection"/>
<newline/>
<field name="direction_selection"/>
</form>"""
_aged_trial_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
'result_selection':{'string':"Display partner",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
'direction_selection':{'string':"Display aged balance of",'type':'selection','selection':[('past','Due amount'),('future','Not due amount')]},
}
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
'result_selection':{
'string':"Filter on Partners",
'type':'selection',
'selection':[('customer','Customer'),('supplier','Supplier'),('all','All')],
'required':True,
'default': lambda *a: 'customer',
},
'direction_selection':{
'string':"Analysis Direction",
'type':'selection',
'selection':[('past','Past'),('future','Future')],
'required':True,
'default': lambda *a: 'past',
},
}
def _calc_dates(self, cr, uid, data, context):
res = {}
period_length = data['form']['period_length']
if period_length<=0:
raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !')
start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
start = DateTime(int(start.year),int(start.month),int(start.day))
if data['form']['direction_selection'] == 'past':
for i in range(5)[::-1]:
stop = start - RelativeDateTime(days=period_length)
res[str(i)] = {
'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
'stop': start.strftime('%Y-%m-%d'),
'start' : stop.strftime('%Y-%m-%d'),
}
start = stop - RelativeDateTime(days=1)
else:
for i in range(5):
stop = start + RelativeDateTime(days=period_length)
res[str(5-(i+1))] = {
'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
'start': start.strftime('%Y-%m-%d'),
'stop' : stop.strftime('%Y-%m-%d'),
}
start = stop + RelativeDateTime(days=1)
return res
res = {}
period_length = data['form']['period_length']
if period_length<=0:
raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !')
start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
start = DateTime(int(start.year),int(start.month),int(start.day))
if data['form']['direction_selection'] == 'past':
for i in range(5)[::-1]:
stop = start - RelativeDateTime(days=period_length)
res[str(i)] = {
'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
'stop': start.strftime('%Y-%m-%d'),
'start' : stop.strftime('%Y-%m-%d'),
}
start = stop - RelativeDateTime(days=1)
else:
for i in range(5):
stop = start + RelativeDateTime(days=period_length)
res[str(5-(i+1))] = {
'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
'start': start.strftime('%Y-%m-%d'),
'stop' : stop.strftime('%Y-%m-%d'),
}
start = stop + RelativeDateTime(days=1)
return res
class wizard_report(wizard.interface):
def _get_defaults(self, cr, uid, data, context):
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
return data['form']
states = {
'init': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]},
},
'print': {
'actions': [_calc_dates],
'result': {'type':'print', 'report':'account.aged_trial_balance', 'state':'end'},
},
}
def _get_defaults(self, cr, uid, data, context):
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
return data['form']
states = {
'init': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]},
},
'print': {
'actions': [_calc_dates],
'result': {'type':'print', 'report':'account.aged_trial_balance', 'state':'end'},
},
}
wizard_report('account.aged.trial.balance')
addons/account/wizard/wizard_partner_balance_report.py
+58 -69
View File
@@ -29,78 +29,80 @@ import time
import wizard
import pooler
report_type = '''<?xml version="1.0"?>
<form string="Select Report Type">
</form>'''
dates_form = '''<?xml version="1.0"?>
<form string="Select period">
<field name="company_id" colspan="4"/>
<newline/>
<field name="date1"/>
<field name="date2"/>
<newline/>
<field name="result_selection"/>
<field name="soldeinit"/>
</form>'''
dates_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'result_selection':{'string':"Display partner ",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
'date1': {'string':'Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
}
period_form = '''<?xml version="1.0"?>
<form string="Select period">
<field name="company_id" colspan="4"/>
<newline/>
<field name="fiscalyear" colspan="4"/>
<field name="periods" colspan="4"/>
<newline/>
<form string="Select period" colspan="4">
<field name="company_id"/>
<field name="result_selection"/>
<field name="soldeinit"/>
<newline/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<newline/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<newline/>
<group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
<field name="date1"/>
<field name="date2"/>
</group>
<group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="4">
<separator string="Filter on Periods" colspan="4"/>
<field name="periods" colspan="4" nolabel="1"/>
</group>
</form>'''
period_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
'help': 'Keep empty for all open fiscal year'},
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
'result_selection':{'string':"Display partner",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
'state':{
'string':"Date/Period Filter",
'type':'selection',
'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
'default': lambda *a:'bydate'
},
'fiscalyear': {
'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
'help': 'Keep empty for all open fiscal year'
},
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
'result_selection':{
'string':"Partner",
'type':'selection',
'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
'required':True
},
'soldeinit':{'string':" Inclure les soldes initiaux",'type':'boolean'},
'date1': {'string':' Start date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-01-01')},
'date2': {'string':'End date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-%m-%d')},
}
class wizard_report(wizard.interface):
def _get_defaults(self, cr, uid, data, context):
def _get_defaults(self,cr,uid,data,context):
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
periods_obj=pooler.get_pool(cr.dbname).get('account.period')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
data['form']['company_id'] = company_id
data['form']['soldeinit'] = True
data['form']['result_selection'] = 'all'
return data['form']
def _get_defaults_fordate(self, cr, uid, data, context):
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
data['form']['soldeinit'] = True
data['form']['result_selection'] = 'all'
def _check_state(self, cr, uid, data, context):
if data['form']['state'] == 'bydate' :
self._check_date(cr, uid, data, context)
return data['form']
def _check_date(self, cr, uid, data, context):
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']['date1'])
cr.execute(sql)
@@ -114,27 +116,14 @@ class wizard_report(wizard.interface):
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
states = {
'init': {
'actions': [],
'result': {'type':'form', 'arch':report_type,'fields':{}, 'state':[('with_period','Use with Period'),('with_date','Use with Date')]}
},
'with_period': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
'with_date': {
'actions': [_get_defaults_fordate],
'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkdate','Print')]}
},
'checkdate': {
'actions': [],
'result': {'type':'choice','next_state':_check_date}
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
'report': {
'actions': [],
'actions': [_check_state],
'result': {'type':'print', 'report':'account.partner.balance', 'state':'end'}
}
}
addons/account/wizard/wizard_third_party_ledger.py
+57 -71
View File
@@ -30,65 +30,65 @@ import wizard
import pooler
report_type = '''<?xml version="1.0"?>
<form string="Select Report Type">
</form>'''
dates_form = '''<?xml version="1.0"?>
<form string="Select period">
<field name="company_id" colspan="4"/>
<newline/>
<field name="date1"/>
<field name="date2"/>
<newline/>
<field name="result_selection"/>
<field name="soldeinit"/>
<field name="reconcil"/>
<newline/>
<field name="page_split"/>
</form>'''
dates_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'date1': {'string':'Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
'result_selection':{'string':"Display partners",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
'reconcil':{'string':"Inclure les ecritures reconsiliees",'type':'boolean'},
'page_split':{'string':"Un partenaire par page",'type':'boolean'},
}
period_form = '''<?xml version="1.0"?>
<form string="Select period">
<field name="company_id" colspan="4"/>
<newline/>
<field name="fiscalyear" colspan="4"/>
<field name="periods" colspan="4"/>
<newline/>
<field name="result_selection"/>
<field name="soldeinit"/>
<field name="company_id"/>
<field name="result_selection"/>
<newline/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<group colspan = "4" >
<field name="reconcil"/>
<newline/>
<field name="page_split"/>
</group>
<newline/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<newline/>
<group attrs="{'invisible':[('state','=','byperiod'),('state','=','none')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
<field name="date1"/>
<field name="date2"/>
</group>
<group attrs="{'invisible':[('state','=','bydate'),('state','=','none')]}" colspan="4">
<separator string="Filter on Periods" colspan="4"/>
<field name="periods" colspan="4" nolabel="1"/>
</group>
</form>'''
period_fields = {
'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
'help': 'Keep empty for all open fiscal year'},
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
'result_selection':{'string':"Display partners",'type':'selection','selection':[('customer','Debiteur'),('supplier','Creancier'),('all','Tous')]},
'state':{
'string':"Date/Period Filter",
'type':'selection',
'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
'default': lambda *a:'bydate'
},
'fiscalyear': {
'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
'help': 'Keep empty for all open fiscal year'
},
'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
'result_selection':{
'string':"Partner",
'type':'selection',
'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
'required':True
},
'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
'reconcil':{'string':"Inclure les ecritures reconsiliees",'type':'boolean'},
'page_split':{'string':"Un partenaire par page",'type':'boolean'},
'reconcil':{'string':" Include Reconciled Entries",'type':'boolean'},
'page_split':{'string':"One Partner Per Page",'type':'boolean'},
'date1': {'string':' Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
}
class wizard_report(wizard.interface):
def _get_defaults(self, cr, uid, data, context):
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
data['form']['display_account']='bal_all'
@@ -100,26 +100,15 @@ class wizard_report(wizard.interface):
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
periods_obj=pooler.get_pool(cr.dbname).get('account.period')
data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
data['form']['page_split'] = False
data['form']['reconcil'] = False
data['form']['soldeinit'] = True
return data['form']
def _get_defaults_fordate(self, cr, uid, data, context):
data['form']['result_selection'] = 'all'
user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
company_id = user.company_id.id
else:
company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id
data['form']['page_split'] = False
data['form']['reconcil'] = False
data['form']['soldeinit'] = True
return data['form']
def _check_date(self, cr, uid, data, context):
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']['date1'])
cr.execute(sql)
@@ -132,27 +121,24 @@ class wizard_report(wizard.interface):
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
def _check_state(self, cr, uid, data, context):
if data['form']['state'] == 'byperiod':
data['form']['fiscalyear'] = True
else :
self._check_date(cr, uid, data, context)
data['form']['fiscalyear'] = False
return data['form']
states = {
'init': {
'actions': [],
'result': {'type':'form', 'arch':report_type,'fields':{}, 'state':[('with_period','Use with Period'),('with_date','Use with Date')]}
},
'with_period': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
},
'with_date': {
'actions': [_get_defaults_fordate],
'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkdate','Print')]}
},
'checkdate': {
'actions': [],
'result': {'type':'choice','next_state':_check_date}
},
'report': {
'actions': [],
'actions': [_check_state],
'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
}
}
addons/account_analytic_plans/security/ir.model.access.csv
+8 -7
View File
@@ -1,7 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_account_analytic_plan_line,account.analytic.plan.line,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
access_account_analytic_plan_instance,account.analytic.plan.instance,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
access_account_analytic_plan_instance_line,account.analytic.plan.instance.line,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
access_account_analytic_plan_line_invoice,account.analytic.plan.line.invoice,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
access_account_analytic_plan_instance_invoice,account.analytic.plan.instance.invoice,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
access_account_analytic_plan_instance_line_invoice,account.analytic.plan.instance.line.invoice,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_account_analytic_plan","account.analytic.plan","model_account_analytic_plan","account.group_account_user",1,1,1,1
"access_account_analytic_plan_line","account.analytic.plan.line","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
"access_account_analytic_plan_instance","account.analytic.plan.instance","model_account_analytic_plan_instance","account.group_account_user",1,1,1,1
"access_account_analytic_plan_instance_line","account.analytic.plan.instance.line","model_account_analytic_plan_instance_line","account.group_account_user",1,1,1,1
"access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
"access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
"access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_account_analytic_plan_line access_account_analytic_plan account.analytic.plan.line account.analytic.plan model_account_analytic_plan_line model_account_analytic_plan account.group_account_user 1 1 1 1
3 access_account_analytic_plan_instance access_account_analytic_plan_line account.analytic.plan.instance account.analytic.plan.line model_account_analytic_plan_instance model_account_analytic_plan_line account.group_account_user 1 1 1 1
4 access_account_analytic_plan_instance_line access_account_analytic_plan_instance account.analytic.plan.instance.line account.analytic.plan.instance model_account_analytic_plan_instance_line model_account_analytic_plan_instance account.group_account_user 1 1 1 1
5 access_account_analytic_plan_line_invoice access_account_analytic_plan_instance_line account.analytic.plan.line.invoice account.analytic.plan.instance.line model_account_analytic_plan_line model_account_analytic_plan_instance_line account.group_account_user 1 1 1 1
6 access_account_analytic_plan_instance_invoice access_account_analytic_plan_line_invoice account.analytic.plan.instance.invoice account.analytic.plan.line.invoice model_account_analytic_plan_instance model_account_analytic_plan_line account.group_account_user 1 1 1 1
7 access_account_analytic_plan_instance_line_invoice access_account_analytic_plan_instance_manager account.analytic.plan.instance.line.invoice account.analytic.plan.instance manager model_account_analytic_plan_instance_line model_account_analytic_plan_instance account.group_account_user account.group_account_manager 1 1 1 1
8 access_account_analytic_plan_instance_line_manager account.analytic.plan.instance.line manager model_account_analytic_plan_instance_line account.group_account_manager 1 1 1 1
addons/account_budget/i18n/fr_FR.po
+208 -241
View File
@@ -1,346 +1,313 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * account_budget
# * account_budget_crossover
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:26+0000\n"
"PO-Revision-Date: 2008-10-14 10:30+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-14 11:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
#: view:account.budget.post:0
msgid "Dotations"
msgstr "Dotations"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
msgstr ""
msgstr "Utilisateur Responsable"
#. module: account_budget
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Confirmed"
msgstr ""
msgstr "Confirmé"
#. module: account_budget
#. module: account_budget_crossover
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: account_budget
#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
msgid "Print Budgets"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Printed at:"
msgstr "Imprimé à :"
#. module: account_budget
#. module: account_budget_crossover
#: view:crossovered.budget:0
msgid "Confirm"
msgstr ""
msgstr "Confirmer"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
msgstr ""
msgstr "Valider l'utilisateur"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget.lines,analytic_account_id:0
msgid "Analytic Account Ref"
msgstr ""
msgstr "Réf. du Compte Analytique"
#. module: account_budget
#: view:account.budget.post:0
msgid "Master Budget"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Currency:"
msgstr "Devise"
#. module: account_budget
#: field:account.budget.post.dotation,period_id:0
msgid "Period"
msgstr "Période"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Cancelled"
msgstr ""
#. module: account_budget
#: wizard_view:account.budget.spread,init:0
#: wizard_button:account.budget.spread,init,spread:0
#: view:account.budget.post:0
msgid "Spread"
msgstr "Écarts"
#. module: account_budget
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Draft"
msgstr ""
msgstr "Brouillon"
#. module: account_budget
#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
msgid "Spread amount"
msgstr "Ventiler le montant"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "at"
msgstr "à"
#. module: account_budget
#. module: account_budget_crossover
#: model:ir.actions.report.xml,name:account_budget_crossover.account_analytic_account_budget
#: model:ir.actions.report.xml,name:account_budget_crossover.report_crossovered_budget
#: model:ir.actions.wizard,name:account_budget_crossover.account_analytic_account_budget_report
#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu
msgid "Print Budgets"
msgstr "Imprimer les Budgets"
#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,report:0
#: wizard_button:account.budget.report,init,report:0
#: wizard_button:wizard.crossovered.budget,init,report:0
#: wizard_button:wizard.crossovered.budget.summary,init,report:0
msgid "Print"
msgstr "Imprimer"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
msgstr "Pourcentage"
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Validated"
msgstr "Validé"
#. module: account_budget_crossover
#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines
msgid "Crossovered Budget Lines"
msgstr ""
#. module: account_budget
#: field:crossovered.budget,state:0
msgid "Status"
msgstr ""
#. module: account_budget
#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
#: wizard_field:account.budget.report,init,date1:0
#: wizard_field:wizard.crossovered.budget,init,date_from:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
msgid "Start of period"
msgstr "Démarrer période"
#. module: account_budget
#: model:ir.model,name:account_budget.model_account_budget_post_dotation
msgid "Budget item endowment"
msgstr "Répartition des postes budgétaires"
#. module: account_budget
#: field:crossovered.budget.lines,crossovered_budget_id:0
msgid "Budget Ref"
msgstr ""
#. module: account_budget
#: field:crossovered.budget.lines,planned_amount:0
msgid "Planned Amount"
msgstr ""
#. module: account_budget
#: wizard_view:account.budget.report,init:0
msgid "Select period"
msgstr "Sélectionner période"
#. module: account_budget
#: model:ir.ui.menu,name:account_budget.menu_financial_reporting_budget_budget_entries
msgid "Entries"
msgstr "Entrées "
#. module: account_budget
#: field:account.budget.post,account_ids:0
#: view:account.budget.post:0
msgid "Accounts"
msgstr "Comptes"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Validate"
msgstr ""
#. module: account_budget
#: wizard_view:wizard.crossovered.budget,init:0
#: wizard_view:wizard.crossovered.budget.summary,init:0
msgid "Select Options"
msgstr ""
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
msgid "Master Budgets"
msgstr ""
#. module: account_budget
#: field:crossovered.budget.lines,practical_amount:0
msgid "Practical Amount"
msgstr ""
#. module: account_budget
#: field:crossovered.budget,date_to:0
#: field:crossovered.budget.lines,date_to:0
msgid "End Date"
msgstr ""
#. module: account_budget
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_budget
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoritical Amount"
msgstr ""
#. module: account_budget
#: field:account.budget.post.dotation,name:0
#: field:account.budget.post,name:0
#. module: account_budget_crossover
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nom"
#. module: account_budget
#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
msgid "Print Summary of Budgets"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,state:0
msgid "Status"
msgstr "État"
#. module: account_budget
#: selection:crossovered.budget,state:0
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "%"
msgstr "%"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Description"
msgstr "Description"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
msgid "Analytic Account :"
msgstr "Compte Analytique :"
#. module: account_budget_crossover
#: field:crossovered.budget.lines,crossovered_budget_id:0
msgid "Budget Ref"
msgstr "Réf. du Budget"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "to"
msgstr "au"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
#: field:crossovered.budget.lines,planned_amount:0
msgid "Planned Amount"
msgstr "Montant Plannifié"
#. module: account_budget_crossover
#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
msgid "Entries"
msgstr "Écritures"
#. module: account_budget_crossover
#: view:crossovered.budget:0
msgid "Done"
msgstr ""
msgid "Validate"
msgstr "Valider"
#. module: account_budget
#. module: account_budget_crossover
#: wizard_view:wizard.crossovered.budget,init:0
#: wizard_view:wizard.crossovered.budget.summary,init:0
msgid "Select Options"
msgstr "Sélectionnez les Options"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
#: field:crossovered.budget.lines,practical_amount:0
msgid "Practical Amount"
msgstr "Montant en Pratique"
#. module: account_budget_crossover
#: field:crossovered.budget,date_to:0
#: field:crossovered.budget.lines,date_to:0
msgid "End Date"
msgstr "Date de fin"
#. module: account_budget_crossover
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML non valide pour l'architecture de la vue"
#. module: account_budget_crossover
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoritical Amount"
msgstr "Montant Théorique"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Total:"
msgstr "Total:"
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Cancelled"
msgstr "Annulé"
#. module: account_budget_crossover
#: field:crossovered.budget.lines,general_budget_id:0
msgid "Master Budget Ref"
msgstr ""
msgstr "Réf; du Budget Principal"
#. module: account_budget
#. module: account_budget_crossover
#: view:account.analytic.account:0
#: view:account.budget.post:0
msgid "Lines"
msgstr "Lignes"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
#. module: account_budget_crossover
#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_view
#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_view
#: view:crossovered.budget:0
msgid "Budget"
msgstr "Prévisions budgétaires"
msgstr "Budget"
#. module: account_budget
#: view:account.budget.post:0
msgid "Definition"
msgstr "Définition de campagne"
#. module: account_budget
#. module: account_budget_crossover
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
msgstr ""
msgstr "Sélectionnez la Période de Date"
#. module: account_budget
#: wizard_field:account.budget.spread,init,fiscalyear:0
msgid "Fiscal Year"
msgstr "Exercice comptable"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
msgstr ""
msgstr "Date de Paiement"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
#: model:ir.ui.menu,name:account_budget.menu_financial_reporting_budget_budget
#: model:ir.ui.menu,name:account_budget.next_id_31
#. module: account_budget_crossover
#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
msgid "Budgets"
msgstr "Budgets"
#. module: account_budget
#: model:ir.model,name:account_budget.model_account_budget_post
msgid "Budget item"
msgstr "Poste budgétaire"
#. module: account_budget
#. module: account_budget_crossover
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.crossovered.budget,init,date_to:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
msgid "End of period"
msgstr "Fin de la période"
#. module: account_budget
#: model:ir.model,name:account_budget.model_crossovered_budget
#. module: account_budget_crossover
#: model:ir.model,name:account_budget_crossover.model_crossovered_budget
msgid "Crossovered Budget"
msgstr ""
#. module: account_budget
#: model:ir.model,name:account_budget.model_crossovered_budget_lines
msgid "Crossovered Budget Lines"
msgstr ""
#. module: account_budget_crossover
#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
#: wizard_field:wizard.crossovered.budget,init,date_from:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
msgid "Start of period"
msgstr "Début de la période"
#. module: account_budget
#: field:account.budget.post,code:0
#. module: account_budget_crossover
#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
msgid "Print Summary of Budgets"
msgstr "Imprimer le Résumé des Budgets"
#. module: account_budget_crossover
#: field:crossovered.budget,code:0
msgid "Code"
msgstr "Code"
#. module: account_budget
#: view:account.budget.post.dotation:0
msgid "Master Budget Expenses"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Theoretical Amount"
msgstr "Montant Théorique"
#. module: account_budget
#: field:account.budget.post.dotation,post_id:0
msgid "Item"
msgstr "Élément"
#. module: account_budget_crossover
#: rml:crossovered.budget.report:0
msgid "Budget :"
msgstr "Budget :"
#. module: account_budget
#: wizard_field:account.budget.spread,init,amount:0
#: field:account.budget.post.dotation,amount:0
msgid "Amount"
msgstr "Montant"
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
#: view:crossovered.budget:0
msgid "Done"
msgstr "Terminé"
#. module: account_budget
#: field:account.budget.post,dotation_ids:0
msgid "Expenses"
msgstr "Dépense"
#. module: account_budget
#: model:ir.actions.report.xml,name:account_budget.account_budget
msgid "Print Budget"
msgstr "Impression du budget"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
#. module: account_budget_crossover
#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_lines_view
#: field:account.analytic.account,crossovered_budget_line:0
#: field:account.budget.post,crossovered_budget_line:0
#: field:crossovered.budget,crossovered_budget_line:0
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_lines_view
#: view:crossovered.budget:0
#: view:account.analytic.account:0
#: view:account.budget.post:0
#: view:crossovered.budget.lines:0
msgid "Budget Lines"
msgstr ""
msgstr "Lignes de Budget"
#. module: account_budget
#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,end:0
#: wizard_button:account.budget.report,init,end:0
#: wizard_button:account.budget.spread,init,end:0
#: wizard_button:wizard.crossovered.budget,init,end:0
#: wizard_button:wizard.crossovered.budget.summary,init,end:0
#: view:crossovered.budget:0
msgid "Cancel"
msgstr "Annuler"
#. module: account_budget
#. module: account_budget_crossover
#: field:account.budget.post.dotation,tot_planned:0
msgid "Total Planned Amount"
msgstr ""
msgstr "Montant Total Planifié"
#. module: account_budget
#. module: account_budget_crossover
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
msgstr ""
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Validated"
msgstr ""
msgstr "Date de début"
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Analysis from"
msgstr "Analyse de"
addons/account_followup/__terp__.py
+2 -1
View File
@@ -50,8 +50,9 @@
"demo_xml" : ["followup_demo.xml"],
"update_xml" : [
"security/ir.model.access.csv",
"wizard/wizard_view.xml",
"followup_view.xml",
"followup_report_view.xml"
"followup_report_view.xml",
],
"active": False,
"installable": True
addons/account_followup/followup_view.xml
-6
View File
@@ -42,12 +42,6 @@
<report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
<record id="action_account_followup_all_wizard" model="ir.actions.wizard">
<field name="name">Send followups</field>
<field name="wiz_name">account_followup.followup.print.all</field>
</record>
<menuitem action="action_account_followup_all_wizard" id="account_followup_wizard_menu" parent="account.menu_finance_periodical_processing" type="wizard"/>
<record id="account_move_line_partner_tree" model="ir.ui.view">
<field name="name">account.move.line.partner.tree</field>
addons/account_followup/i18n/fr_FR.po
+1 -1
View File
@@ -427,7 +427,7 @@ msgstr "%(partner_name)s: nom du Partenaire"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
msgstr ""
msgstr "Sélectionnez les partenaires à prévenir"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
addons/account_followup/wizard/wizard_view.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
<wizard string="Send followups"
name="account_followup.followup.print.all"
id="action_account_followup_all_wizard"
model="account_followup.followup" />
<menuitem action="action_account_followup_all_wizard"
id="account_followup_wizard_menu"
parent="account.menu_finance_periodical_processing"
type="wizard" />
</data></openerp>
addons/account_payment/security/ir.model.access.csv
+8 -5
View File
@@ -1,5 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_payment_type,payment.type,model_payment_type,group_account_payment,1,1,1,1
access_payment_mode,payment.mode,model_payment_mode,group_account_payment,1,1,1,1
access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,1
access_payment_line,payment.line,model_payment_line,group_account_payment,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_payment_type","payment.type","model_payment_type","group_account_payment",1,1,1,1
"access_payment_mode","payment.mode","model_payment_mode","group_account_payment",1,1,1,1
"access_payment_order","payment.order","model_payment_order","group_account_payment",1,1,1,1
"access_payment_line","payment.line","model_payment_line","group_account_payment",1,1,1,1
"access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
"access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
"access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_payment_type payment.type model_payment_type group_account_payment 1 1 1 1
3 access_payment_mode payment.mode model_payment_mode group_account_payment 1 1 1 1
4 access_payment_order payment.order model_payment_order group_account_payment 1 1 1 1
5 access_payment_line payment.line model_payment_line group_account_payment 1 1 1 1
6 access_account_journal_payement account.journal payment account.model_account_journal group_account_payment 1 0 0 0
7 access_account_invoice_payment account.invoice payment account.model_account_invoice group_account_payment 1 0 0 0
8 access_account_move_line_payment account.move.line payment account.model_account_move_line group_account_payment 1 0 0 0
addons/account_report/account_report.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<data>
<report auto="False" id="fiscal_statements" model="account.report.report" name="accounting.report" rml="account_report/report/accounting_report.rml" string="Fiscal Statements"/>
<report auto="False" id="report_print_indicators" model="account.report.report" name="report.print.indicators" rml="account_report/report/report_print_indicators.rml" string="Indicators"/>
<report auto="False" id="report_print_indicators" model="account.report.history" name="print.indicators" rml="account_report/report/print_indicator.rml" string="Indicators"/>
</data>
</openerp>
addons/account_report/report/__init__.py
+1
View File
@@ -29,6 +29,7 @@
##############################################################################
import accounting_report
import print_indicator
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_report/report/print_indicator.py
+266
View File
@@ -0,0 +1,266 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# 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
# programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# 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
# modify it under the terms of the GNU General Public License
# 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 pooler
import time
from report import report_sxw
#from report.interface import report_int
#from reportlab.graphics.shapes import Drawing
#from reportlab.graphics.charts.barcharts import VerticalBarChart
#import reportlab.lib.colors as colors
#from reportlab.graphics.widgetbase import Widget, TypedPropertyCollection
#from reportlab.graphics.charts.textlabels import BarChartLabel
#from reportlab.graphics import renderPM
#from report.render import render
#from report.interface import report_int
from pychart import *
import StringIO
theme.use_color = 1
theme.default_font_family = "Helvetica-Bold"
theme.default_font_size = 18
theme.default_line_width = 1.0
import tools
parents = {
'tr':1,
'li':1,
'story': 0,
'section': 0
}
class accounting_report_indicator(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(accounting_report_indicator, self).__init__(cr, uid, name, context)
self.ret_list = []
self.localcontext.update({
'time': time,
'test': self.test1,
'lines':self.lines,
'getarray':self.getarray,
})
self.count=0
self.list=[]
self.header_name=self.header_val=[]
def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
self._node.data = ''
node = self._find_parent(self._node, nodes_parent or parents)
ns = node.nextSibling
#start
if not name=='array':
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
value=['Data']
value.extend(self.header_name)
type=['string'].extend(['float']*len(self.header_name))
width=[40]*(len(self.header_name)+1)
if not lst:
lst.append(1)
for ns in node.childNodes :
if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
width_str = ns._attrs['colWidths'].nodeValue
ns.removeAttribute('colWidths')
total_td = td * len(value)
if not width:
for v in value:
width.append(30)
for v in range(len(value)):
width_str +=',%d'%width[v]
ns.setAttribute('colWidths',width_str)
child_list = ns.childNodes
check=0
for child in child_list:
if child.nodeName=='tr':
lc = child.childNodes[1]
# for t in range(td):
i=0
for v in value:
newnode = lc.cloneNode(1)
if check==1:
t1="[[ %s['%s'] ]]"%(name,v)
else:
t1="%s"%(v)
newnode.childNodes[1].lastChild.data = t1
child.appendChild(newnode)
newnode=False
i+=1
check=1
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
def lines(self,data):
res={}
result=[]
ind_ids=self.pool.get('account.report.report').search(self.cr,self.uid,[])
obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,ind_ids)
# def find_child(obj):
# self.list.append(obj)
# if obj.child_ids:
# for child in obj.child_ids:
# find_child(child)
# return True
#
# find_child(obj_inds)
for obj_ind in obj_inds:
res = {
'id':obj_ind.id,
'name':obj_ind.name,
'code':obj_ind.code,
'expression':obj_ind.expression,
'disp_graph':obj_ind.disp_graph,
'note':obj_ind.note,
'type':obj_ind.type,
}
result.append(res)
return result
def getarray(self,data,object):
res={}
result=[]
self.test1(data,object,intercall=True)
self.header_val=[str(x) for x in self.header_val]
temp_dict=zip(self.header_name,self.header_val)
res=dict(temp_dict)
res['Data']='Value'
result.append(res)
return result
def test1(self,data,object,intercall=False):
obj_history=self.pool.get('account.report.history')
if data['select_base']=='year':
tuple_search=('fiscalyear_id','in',data['base_selection'][0][2])
base='year'
else:
tuple_search=('period_id','in',data['base_selection'][0][2])
base='period'
history_ids=obj_history.search(self.cr,self.uid,[('name','=',object['id']),tuple_search])
history_ids.sort()
obj_his=obj_history.browse(self.cr,self.uid,history_ids)
data_val=[]
data_period=[]
if base=='period':
for item in obj_his:
data_val.append(item.val)
data_period.append(item.period_id.name)
else:
for i in data['base_selection'][0][2]:
val_temp=[]
data_period.append(self.pool.get('account.fiscalyear').browse(self.cr,self.uid,i).name)
for item in obj_his:
if item.fiscalyear_id.id==i:
val_temp.append(item.val)
data_val.append(sum(val_temp))
self.header_name=data_period
self.header_val=data_val
if intercall:
return True
self.count +=1
# drawing = Drawing(400, 300)
# data = [
# tuple(data_val),
# ]
# value_min=0.0
# vmin=min(data_val)
# vmax=max(data_val)
#
# val_min=((vmin < 0.00 and vmin-2.00) or 0.00)
# # calculating maximum
# val_max=(vmax/(pow(10,len(str(int(vmax)))-2))+1)*pow(10,len(str(int(vmax)))-2)
# bc = VerticalBarChart()
# bc.x = 50
# bc.y = 50
# bc.height = 245
# bc.width = 300
# bc.data = data
# value_step=(abs(val_max)-abs(val_min))/5
#
# bc.strokeColor = colors.black
# bc.valueAxis.valueMin = val_min
# bc.valueAxis.valueMax = val_max
# bc.valueAxis.valueStep = value_step
#
# bc.categoryAxis.labels.boxAnchor = 'ne'
# bc.categoryAxis.labels.dx = 8
#
# bc.categoryAxis.labels.dy = -2
# bc.categoryAxis.labels.angle = 30
# bc.categoryAxis.categoryNames = data_period
# drawing.add(bc)
# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
import os
dirname ='Temp_images'
path=os.path.join(tools.config['root_path'],dirname,"Image")
if not os.path.isdir(tools.config['root_path']+ "/"+dirname + '/'):
os.mkdir(tools.config['root_path'] +"/"+ dirname + '/')
os.path.join(tools.config['root_path'],dirname,"/")
can = canvas.init('Image'+str(self.count)+".png")
# can.clip(0,0,600,400)
data=zip(self.header_name,self.header_val)
ar = area.T(size = (650,450),x_coord = category_coord.T(data, 0), y_range = (None, None),
x_axis = axis.X(label="Period // Year",format="/a-30{}%s"),
y_axis = axis.Y(label="Value"))
ar.add_plot(bar_plot.T(data = data,width=15, data_label_format="/o/15{}%s",label = "Value",fill_style=fill_style.red))
ar.draw()
can.close()
os.system('cp '+'Image'+str(self.count)+'.png ' +path+str(self.count)+'.png')
os.system('rm '+'Image'+str(self.count)+'.png')
# can.endclip()
return path+str(self.count)+'.png'
report_sxw.report_sxw('report.print.indicators', 'account.report.history',
'addons/account_report/report/print_indicator.rml',
parser=accounting_report_indicator, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_report/report/print_indicator.rml
+178
View File
@@ -0,0 +1,178 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="CENTER"/>
<lineStyle kind="GRID" colorName="black"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<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="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Times-BoldItalic" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Times-Bold" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="13.0" leading="16" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="10.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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"/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="146.0,223.0,158.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="P9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P10">Indicators</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P5">[[ company.name ]]</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font>
</para>
</td>
</tr>
</blockTable>
<para style="P4">
<font color="white"> </font>
</para>
<para style="P3">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<blockTable colWidths="362.0,166.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="P6">Name</para>
</td>
<td>
<para style="P6">Code</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3"><seqReset/></para>
<section>
<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
<blockTable colWidths="362.0,166.0" style="Table3">
<tr>
<td>
<para style="P11"><b>(<seq/>)</b> [[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]]<u>[[ o['name'] ]]</u></para>
</td>
<td>
<para style="P11">[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]]<u>[[ o['code'] ]]</u></para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P1">[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':test(data['form'],o)}) or removeParentNode('para') ]]</para>
<para style="P3">
<font color="white"> </font>
</para>
<section>
<para style="P13">[[ repeatIn(getarray(data['form'],o),'array',td=len(data['form']['base_selection'][0][2])) ]]</para>
<blockTable colWidths="0.0" style="Table5">
<tr>
<td>
<para style="P9"> </para>
</td>
</tr>
<tr>
<td>
<para style="P9"> </para>
</td>
</tr>
</blockTable>
</section>
<para style="P3">
<font color="white"> </font>
</para>
<blockTable colWidths="528.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="P11"><b>Expression :</b> [[ o['expression'] ]]</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<blockTable colWidths="528.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="P11"><b>Notes :</b> [[ o['note'] ]]</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
</section>
</story>
</document>
addons/account_report/security/ir.model.access.csv
+3 -2
View File
@@ -1,2 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_account_report_report,account.report.report,model_account_report_report,base.group_user,1,0,0,0
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_account_report_report","account.report.report","model_account_report_report","account.group_account_manager",1,0,0,0
"access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_account_report_report account.report.report model_account_report_report base.group_user account.group_account_manager 1 0 0 0
3 access_account_report_history account.report.history model_account_report_history account.group_account_manager 1 0 0 0
addons/account_report/wizard/wizard_print_indicators.py
+3 -3
View File
@@ -33,12 +33,12 @@ import pooler
form = '''<?xml version="1.0"?>
<form string="Print Indicators">
<field name="indicator_id"/>
<label string="Select the criteria based on which Indicators will be printed."/>
<newline/>
<field name="select_base"/>
</form>'''
fields = {
'indicator_id': {'string':'Choose Indicator', 'type':'many2one', 'relation': 'account.report.report','required':True,},
'select_base': {'string':'Choose Criteria', 'type':'selection','selection':[('year','Based On Fiscal Years'),('periods','Based on Fiscal Periods')],'required':True,},
}
@@ -73,7 +73,7 @@ class wizard_print_indicators(wizard.interface):
},
'print': {
'actions':[],
'result' :{'type':'print','report':'report.print.indicators', 'state':'end'}
'result' :{'type':'print','report':'print.indicators', 'state':'end'}
}
}
wizard_print_indicators('print.indicators')
addons/account_tax_include/i18n/fr_FR.po
+16 -16
View File
@@ -4,39 +4,39 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:27+0000\n"
"PO-Revision-Date: 2008-10-09 20:00+0000\n"
"Last-Translator: Fabien Pinckaers <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-14 14:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
msgstr ""
msgstr "Tax exclue"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
msgstr ""
msgstr "Code de calcul pour les taxes comprises"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
msgstr ""
msgstr "Tax inclue"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
msgstr ""
msgstr "Méthode de prix"
addons/analytic_journal_billing_rate/__terp__.py
+1
View File
@@ -17,6 +17,7 @@
"demo_xml" : [],
"update_xml" : [
"analytic_journal_billing_rate_view.xml",
"security/ir.model.access.csv",
],
"active": False,
"installable": True
addons/analytic_journal_billing_rate/security/ir.model.access.csv
+4
View File
@@ -0,0 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_analytic_journal_rate_user","analytic journal rate user","model_analytic_journal_rate_grid","project.group_project_user",1,0,0,0
"access_analytic_journal_rate_manager","analytic journal rate manager","model_analytic_journal_rate_grid","project.group_project_manager",1,1,1,1
"access_analytic_journal_rate_account_manager","analytic journal rateaccount manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_analytic_journal_rate_user analytic journal rate user model_analytic_journal_rate_grid project.group_project_user 1 0 0 0
3 access_analytic_journal_rate_manager analytic journal rate manager model_analytic_journal_rate_grid project.group_project_manager 1 1 1 1
4 access_analytic_journal_rate_account_manager analytic journal rateaccount manager model_analytic_journal_rate_grid account.group_account_manager 1 1 1 1
addons/analytic_user_function/__terp__.py
+1
View File
@@ -17,6 +17,7 @@
"demo_xml" : [],
"update_xml" : [
"analytic_user_function_view.xml",
"security/ir.model.access.csv",
],
"active": False,
"installable": True
addons/analytic_user_function/security/ir.model.access.csv
+4
View File
@@ -0,0 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","project.group_project_user",1,0,0,0
"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","project.group_project_manager",1,1,1,1
"access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_analytic_user_funct_user analytic user funct user model_analytic_user_funct_grid project.group_project_user 1 0 0 0
3 access_analytic_user_funct_manager analytic user funct manager model_analytic_user_funct_grid project.group_project_manager 1 1 1 1
4 access_analytic_user_funct_account_manager analytic user funct account manager model_analytic_user_funct_grid account.group_account_manager 1 1 1 1
addons/association_vertical/aso_vertical_view.xml
+7 -7
View File
@@ -6,15 +6,15 @@
<field eval="&quot;terp-calendar&quot;" name="icon"/>
<field eval="False" name="parent_id"/>
</record>
<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
<!--<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
<field eval="&quot;Fund Raising&quot;" name="name"/>
<field eval="&quot;terp-account&quot;" name="icon"/>
<field eval="False" name="parent_id"/>
</record>
</record>-->
<record id="product.menu_main_product" model="ir.ui.menu">
<field model="ir.ui.menu" name="parent_id" search="[('name','=','Configuration'),('parent_id.name','=','Financial Management')]"/>
</record>
<!-- For Shortcuts menu
-->
<!--
@@ -25,8 +25,8 @@
<field name="sequence">4</field>
<field name="res_id" ref="crm_configuration.menu_crm_case_categ_meet_my"/>
</record>
<record model="ir.ui.view_sc" id="ir_ui_view_sc_myopenprojects1">
<field name="name">&quot;My Open Projects&quot;</field>
<field name="user_id" ref="base.user_admin"/>
@@ -34,7 +34,7 @@
<field name="sequence">4</field>
<field name="res_id" ref="project.menu_open_view_my_project_open"/>
</record>
<record id="ir_ui_view_sc_myopenprojects1" model="ir.ui.view_sc">
<field ref="project.menu_open_view_my_project_open" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
@@ -48,7 +48,7 @@
<field eval="&quot;Products&quot;" name="name"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="ir_ui_view_sc_events0" model="ir.ui.view_sc">
<field ref="event.menu_event_event" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
addons/association_vertical/i18n/fr_FR.po
+20 -20
View File
@@ -4,65 +4,65 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
"PO-Revision-Date: 2008-10-14 13:35+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-14 14:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
msgstr "Nouvelle Opportunité de Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
msgstr "Mes Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
msgstr "Mes Fonds à Traiter"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
msgstr "Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
msgstr "Mes Fonds en attente de Validation"
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
msgstr "Levée de Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
msgstr "Tous les Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
msgstr "Tous les Fonds en attente de Validation"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""
msgstr "Tous les Fonds à Traiter"
addons/auction/__terp__.py
+4 -1
View File
@@ -4,8 +4,11 @@
"version" : "1.0",
"depends" : ["base","account","l10n_be","hr_attendance"],
"update_xml" : [
# FIXME: review security rules...
"security/ir.model.access.csv",
"auction_view.xml", "auction_report.xml", "auction_wizard.xml"
"auction_view.xml",
"auction_report.xml",
"auction_wizard.xml",
],
"demo_xml" : [
"auction_demo.xml"
addons/auction/i18n/fr_FR.po
+393 -423
View File
File diff suppressed because it is too large Load Diff
addons/auction/security/ir.model.access.csv
+24 -20
View File
@@ -1,20 +1,24 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_auction_artists,auction.artists,model_auction_artists,base.group_user,1,1,1,1
access_auction_dates,auction.dates,model_auction_dates,base.group_user,1,1,1,1
access_auction_deposit,auction.deposit,model_auction_deposit,base.group_user,1,1,1,1
access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,base.group_user,1,1,1,1
access_auction_lot_category,auction.lot.category,model_auction_lot_category,base.group_user,1,1,1,1
access_auction_lots,auction.lots,model_auction_lots,base.group_user,1,1,1,1
access_auction_bid,auction.bid,model_auction_bid,base.group_user,1,1,1,1
access_auction_lot_history,auction.lot.history,model_auction_lot_history,base.group_user,1,1,1,1
access_report_buyer_auction,report.buyer.auction,model_report_buyer_auction,base.group_user,1,1,1,1
access_report_seller_auction,report.seller.auction,model_report_seller_auction,base.group_user,1,1,1,1
access_report_auction_view,report.auction.view,model_report_auction_view,base.group_user,1,1,1,1
access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,base.group_user,1,1,1,1
access_report_auction_estimation_adj_category,report.auction.estimation.adj.category,model_report_auction_estimation_adj_category,base.group_user,1,1,1,1
access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,base.group_user,1,1,1,1
access_report_attendance,report.attendance,model_report_attendance,base.group_user,1,1,1,1
access_report_deposit_border,report.deposit.border,model_report_deposit_border,base.group_user,1,1,1,1
access_report_object_encoded,report.object.encoded,model_report_object_encoded,base.group_user,1,1,1,1
access_report_object_encoded_manager,report.object.encoded.manager,model_report_object_encoded_manager,base.group_user,1,1,1,1
access_report_unclassified_objects,report.unclassified.objects,model_report_unclassified_objects,base.group_user,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_auction_artists","auction.artists","model_auction_artists","base.group_user",1,1,1,1
"access_auction_dates","auction.dates","model_auction_dates","base.group_user",1,1,1,1
"access_auction_deposit","auction.deposit","model_auction_deposit","base.group_user",1,1,1,1
"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","base.group_user",1,1,1,1
"access_auction_lot_category","auction.lot.category","model_auction_lot_category","base.group_user",1,1,1,1
"access_auction_lots","auction.lots","model_auction_lots","base.group_user",1,1,1,1
"access_auction_bid","auction.bid","model_auction_bid","base.group_user",1,1,1,1
"access_auction_bid_line","auction.bid.line","model_auction_bid_line","base.group_user",1,1,1,1
"access_auction_lot_history","auction.lot.history","model_auction_lot_history","base.group_user",1,1,1,1
"access_report_buyer_auction","report.buyer.auction","model_report_buyer_auction","base.group_user",1,1,1,1
"access_report_buyer_auction2","report.buyer.auction2","model_report_buyer_auction2","base.group_user",1,1,1,1
"access_report_seller_auction","report.seller.auction","model_report_seller_auction","base.group_user",1,1,1,1
"access_report_seller_auction2","report.seller.auction2","model_report_seller_auction2","base.group_user",1,1,1,1
"access_report_auction_view","report.auction.view","model_report_auction_view","base.group_user",1,1,1,1
"access_report_auction_view2","report.auction.view2","model_report_auction_view2","base.group_user",1,1,1,1
"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,1,1,1
"access_report_auction_estimation_adj_category","report.auction.estimation.adj.category","model_report_auction_estimation_adj_category","base.group_user",1,1,1,1
"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,1,1,1
"access_report_attendance","report.attendance","model_report_attendance","base.group_user",1,1,1,1
"access_report_deposit_border","report.deposit.border","model_report_deposit_border","base.group_user",1,1,1,1
"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,1,1,1
"access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,1,1,1
"access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_auction_artists auction.artists model_auction_artists base.group_user 1 1 1 1
3 access_auction_dates auction.dates model_auction_dates base.group_user 1 1 1 1
4 access_auction_deposit auction.deposit model_auction_deposit base.group_user 1 1 1 1
5 access_auction_deposit_cost auction.deposit.cost model_auction_deposit_cost base.group_user 1 1 1 1
6 access_auction_lot_category auction.lot.category model_auction_lot_category base.group_user 1 1 1 1
7 access_auction_lots auction.lots model_auction_lots base.group_user 1 1 1 1
8 access_auction_bid auction.bid model_auction_bid base.group_user 1 1 1 1
9 access_auction_lot_history access_auction_bid_line auction.lot.history auction.bid.line model_auction_lot_history model_auction_bid_line base.group_user 1 1 1 1
10 access_report_buyer_auction access_auction_lot_history report.buyer.auction auction.lot.history model_report_buyer_auction model_auction_lot_history base.group_user 1 1 1 1
11 access_report_seller_auction access_report_buyer_auction report.seller.auction report.buyer.auction model_report_seller_auction model_report_buyer_auction base.group_user 1 1 1 1
12 access_report_auction_view access_report_buyer_auction2 report.auction.view report.buyer.auction2 model_report_auction_view model_report_buyer_auction2 base.group_user 1 1 1 1
13 access_report_auction_object_date access_report_seller_auction report.auction.object.date report.seller.auction model_report_auction_object_date model_report_seller_auction base.group_user 1 1 1 1
14 access_report_auction_estimation_adj_category access_report_seller_auction2 report.auction.estimation.adj.category report.seller.auction2 model_report_auction_estimation_adj_category model_report_seller_auction2 base.group_user 1 1 1 1
15 access_report_auction_adjudication access_report_auction_view report.auction.adjudication report.auction.view model_report_auction_adjudication model_report_auction_view base.group_user 1 1 1 1
16 access_report_attendance access_report_auction_view2 report.attendance report.auction.view2 model_report_attendance model_report_auction_view2 base.group_user 1 1 1 1
17 access_report_deposit_border access_report_auction_object_date report.deposit.border report.auction.object.date model_report_deposit_border model_report_auction_object_date base.group_user 1 1 1 1
18 access_report_object_encoded access_report_auction_estimation_adj_category report.object.encoded report.auction.estimation.adj.category model_report_object_encoded model_report_auction_estimation_adj_category base.group_user 1 1 1 1
19 access_report_object_encoded_manager access_report_auction_adjudication report.object.encoded.manager report.auction.adjudication model_report_object_encoded_manager model_report_auction_adjudication base.group_user 1 1 1 1
20 access_report_unclassified_objects access_report_attendance report.unclassified.objects report.attendance model_report_unclassified_objects model_report_attendance base.group_user 1 1 1 1
21 access_report_deposit_border report.deposit.border model_report_deposit_border base.group_user 1 1 1 1
22 access_report_object_encoded report.object.encoded model_report_object_encoded base.group_user 1 1 1 1
23 access_report_object_encoded_manager report.object.encoded.manager model_report_object_encoded_manager base.group_user 1 1 1 1
24 access_report_unclassified_objects report.unclassified.objects model_report_unclassified_objects base.group_user 1 1 1 1
addons/base_contact/base_contact.py
+4
View File
@@ -133,10 +133,14 @@ class res_partner_job(osv.osv):
'sequence_partner':fields.integer('Sequence (Partner)',help='order of importance of this function in the list of functions of the linked partner'),
'email': fields.char('E-Mail', size=240),
'phone': fields.char('Phone', size=64),
'date_start' : fields.date('Date Start'),
'date_stop' : fields.date('Date Stop'),
'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
}
_defaults = {
'sequence_contact' : lambda *a: 0,
'state' : lambda *a: 'current',
}
res_partner_job()
addons/base_contact/base_contact_view.xml
+10 -6
View File
@@ -23,10 +23,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Contact">
<notebook>
<field name="name" select="1"/>
<field name="first_name" select="1"/>
<notebook colspan="4" >
<page string="General">
<field name="name" select="1"/>
<field name="first_name" select="1"/>
<newline/>
<separator string="General Information" colspan="4"/>
<field name="mobile" select="2"/>
@@ -37,20 +37,24 @@
<separator string="Functions" colspan="4"/>
<field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
<form string="Functions">
<field name="sequence_contact"/>
<field name="function_id"/>
<field name="name"/>
<field name="address_id"/>
<field name="name"/>
<field name="sequence_contact"/>
<field name="phone"/>
<field name="email"/>
<field name="date_start" />
<field name="date_stop" />
<field name="state" />
</form>
<tree string="Functions">
<field name="sequence_contact"/>
<field name="sequence_contact" string="Seq."/>
<field name="function_id"/>
<field name="name"/>
<field name="address_id"/>
<field name="phone"/>
<field name="email"/>
<field name="state" />
</tree>
</field>
</page>
addons/base_contact/security/ir.model.access.csv
+5 -3
View File
@@ -1,3 +1,5 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_res_partner_contact,res.partner.contact,model_res_partner_contact,base.group_user,1,1,1,1
access_res_partner_job,res.partner.job,model_res_partner_job,base.group_user,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
"access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",,1,0,0,0
"access_res_partner_job_all","res.partner.job all","model_res_partner_job",,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_res_partner_contact res.partner.contact model_res_partner_contact base.group_user base.group_partner_manager 1 1 1 1
3 access_res_partner_job res.partner.job model_res_partner_job base.group_user base.group_partner_manager 1 1 1 1
4 access_res_partner_contact_all res.partner.contact all model_res_partner_contact 1 0 0 0
5 access_res_partner_job_all res.partner.job all model_res_partner_job 1 0 0 0
addons/base_iban/i18n/fr_FR.po
+10 -10
View File
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-10 15:05:34+0000"
"PO-Revision-Date: 2008-09-10 15:05:34+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-10 15:05:34+0000\n"
"PO-Revision-Date: 2008-09-10 15:05:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: base_iban
#: constraint:ir.ui.view:0
addons/base_module_publish/i18n/fr_FR.po
+9 -9
View File
@@ -4,15 +4,15 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-10 15:05:35+0000"
"PO-Revision-Date: 2008-09-10 15:05:35+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-10 15:05:35+0000\n"
"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
#. module: base_module_publish
#: wizard_field:base_module_publish.module_publish,step1,category:0
addons/base_module_record/base_module_record.py
+10 -8
View File
@@ -51,7 +51,10 @@ class base_module_record(osv.osv):
def _create_id(self, cr, uid, model, data):
i = 0
while True:
name = filter(lambda x: x in string.letters, (data.get('name','') or '').lower())
try:
name = filter(lambda x: x in string.letters, (data.get('name','') or '').lower())
except:
name=''
val = model.replace('.','_')+'_'+name+ str(i)
i+=1
if val not in self.ids.values():
@@ -79,11 +82,7 @@ class base_module_record(osv.osv):
self.depends[res[0]['module']]=True
record_list = [record]
fields = self.pool.get(model).fields_get(cr, uid)
# print "before>>>>",fields
# fields = self.pool.get(model).fields_view_get(cr, uid, context={})['fields']
# print "after>>>>",fields
for key,val in data.items():
print key,val
if not (val or (fields[key]['type']=='boolean')):
continue
if fields[key]['type'] in ('integer','float'):
@@ -107,7 +106,8 @@ class base_module_record(osv.osv):
if not id:
field.setAttribute("model", fields[key]['relation'])
name = self.pool.get(fields[key]['relation']).browse(cr, uid, val).name
print name
if isinstance(name, basestring):
name = name.decode('utf8')
field.setAttribute("search", "[('name','=','"+name+"')]")
else:
field.setAttribute("ref", id)
@@ -115,7 +115,10 @@ class base_module_record(osv.osv):
elif fields[key]['type'] in ('one2many',):
for valitem in (val or []):
if valitem[0]==0:
fname = self.pool.get(model)._columns[key]._fields_id
if key in self.pool.get(model)._columns:
fname = self.pool.get(model)._columns[key]._fields_id
else:
fname = self.pool.get(model)._inherit_fields[key][2]._fields_id
valitem[2][fname] = record_id
newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
childrecord, update = self._create_record(cr, uid, doc, fields[key]['relation'],valitem[2], newid)
@@ -153,7 +156,6 @@ class base_module_record(osv.osv):
return record_list, noupdate
def _generate_object_xml(self, cr, uid, rec, recv, doc, result=None):
print "_generate_object_xml>>>",rec,recv,doc
record_list = []
noupdate = False
if rec[4]=='write':
addons/base_module_record/i18n/fr_FR.po
+67 -43
View File
@@ -4,26 +4,31 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:34+0000\n"
"PO-Revision-Date: 2008-10-14 13:08+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-14 13:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
msgid "You can continue the recording session by relauching the 'start recording' wizard."
msgid ""
"You can continue the recording session by relauching the 'start recording' "
"wizard."
msgstr ""
"Vous pouvez continuer la session d'enregistrement en relançant l'assisant "
"\"Commencer l'enregistrement\""
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,category:0
msgid "Category"
msgstr ""
msgstr "Catégorie"
#. module: base_module_record
#: model:ir.model,name:base_module_record.model_ir_module_record
@@ -32,50 +37,53 @@ msgstr ""
#. module: base_module_record
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,author:0
msgid "Author"
msgstr ""
msgstr "Auteur"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,directory_name:0
msgid "Directory Name"
msgstr ""
msgstr "Nom du dossier"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,init,info_text:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Information"
msgstr ""
msgstr "Information"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,save,module_filename:0
msgid "Filename"
msgstr ""
msgstr "Nom du fichier"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,version:0
msgid "Version"
msgstr ""
msgstr "Version"
#. module: base_module_record
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
msgid "Record module"
msgstr ""
msgstr "Enregistrer le Module"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
#: wizard_view:base_module_record.module_save,init:0
msgid "Recording Information"
msgstr ""
msgstr "Information sur l'Enregistrement"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,init,info_status:0
msgid "Status"
msgstr ""
msgstr "État"
#. module: base_module_record
#: wizard_view:base_module_record.module_save,info:0
@@ -83,111 +91,127 @@ msgstr ""
#: wizard_view:base_module_record.module_save,save:0
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
msgid "Module Recording"
msgstr ""
msgstr "Module d'Enregistrement"
#. module: base_module_record
#: wizard_view:base_module_record.module_save,save:0
msgid "Thanks in advance for your contribution."
msgstr ""
msgstr "Merci d'avance pour votre contribution"
#. module: base_module_record
#: wizard_button:base_module_record.module_record,start,start_confirm:0
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
msgid "Start Recording"
msgstr ""
msgstr "Démarrer l'enregistrement"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
msgid "Tiny ERP recording is stopped. Don't forget to save the recorded module."
msgid ""
"Tiny ERP recording is stopped. Don't forget to save the recorded module."
msgstr ""
"L'enregistrement est arreté. N'oubliez pas de sauvegarder le module "
"enregistré."
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,description:0
msgid "Full Description"
msgstr ""
msgstr "Description complète"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,name:0
msgid "Module Name"
msgstr ""
msgstr "Nom du Module"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,save,module_file:0
msgid "Module .zip File"
msgstr ""
msgstr "Fichier zip du Module"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
msgid "Recording Stopped"
msgstr ""
msgstr "Enregistrement arreté"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
msgid "Recording information"
msgstr ""
msgstr "Information sur l'Enregistrement"
#. module: base_module_record
#: wizard_view:base_module_record.module_save,save:0
msgid "Module successfully created !"
msgstr ""
msgstr "Module créé avec succès !"
#. module: base_module_record
#: wizard_view:base_module_record.module_save,save:0
msgid "If you think your module could interrest others people, we'd like you to publish it on TinyERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module."
msgid ""
"If you think your module could interrest others people, we'd like you to "
"publish it on TinyERP.com, in the 'Modules' section. You can do it through "
"the website or using features of the 'base_module_publish' module."
msgstr ""
"Si vous pensez que votre module pourrait intéresser d'autres personnes, nous "
"aimerions que vous le publiiez sur OpenERP.com, dans la section 'Modules'. "
"Vous pouvez le faire via le site Web ou en utilisant les focntionalités du "
"module 'base_module_publish'."
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
msgid "The module recorder allows you to record every operation made in the Tiny ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it."
msgid ""
"The module recorder allows you to record every operation made in the Tiny "
"ERP client and save them as a module. You will be able to install this "
"module on any database to reuse and/or publish it."
msgstr ""
"Le module 'recorder' vous permet d'enregistrer chaques opération effectuée "
"dans le client OpenERP et de les sauvegarder en tant que module. Vous serez "
"capable d'installer ce module sur n'importe quelle base de données OpenERP "
"pour le réutiliser et/ou le publier."
#. module: base_module_record
#: wizard_field:base_module_record.module_record,start,continue:0
msgid "Continue Previous Session"
msgstr ""
msgstr "Continuer la Session Précédente"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,website:0
msgid "Documentation URL"
msgstr ""
msgstr "Lien vers la documentation"
#. module: base_module_record
#: wizard_button:base_module_record.module_record,stop,end:0
#: wizard_button:base_module_record.module_save,info,save:0
#: wizard_button:base_module_record.module_save,init,info:0
msgid "Continue"
msgstr ""
msgstr "Continuer"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,info,data_kind:0
msgid "Type of Data"
msgstr ""
msgstr "Type de Donnée"
#. module: base_module_record
#: wizard_view:base_module_record.module_save,info:0
msgid "Module Information"
msgstr ""
msgstr "Information sur le Module"
#. module: base_module_record
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
msgid "Save Recorded Module"
msgstr ""
msgstr "Sauvegarder le Module Enregistré"
#. module: base_module_record
#: wizard_button:base_module_record.module_record,start,end:0
#: wizard_button:base_module_record.module_save,info,end:0
#: wizard_button:base_module_record.module_save,init,end:0
msgid "Cancel"
msgstr ""
msgstr "Annuler"
#. module: base_module_record
#: wizard_button:base_module_record.module_save,save,end:0
msgid "Close"
msgstr ""
msgstr "Fermer"
#. module: base_module_record
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
msgid "Stop Recording"
msgstr ""
msgstr "Arrêter l'enregistrement"
addons/base_report_creator/i18n/fr_FR.po
+83 -80
View File
@@ -4,37 +4,41 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
"PO-Revision-Date: 2008-10-13 17:15+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 18:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action
#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config
msgid "Custom Reports"
msgstr ""
msgstr "Rapports personalisés"
#. module: base_report_creator
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_type:0
msgid "Graph Type"
msgstr ""
msgstr "Type de Graphe"
#. module: base_report_creator
#: wizard_view:base_report_creator.report.menu.create,init:0
msgid "Menu Information"
msgstr ""
msgstr "Menu Information"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
@@ -44,7 +48,7 @@ msgstr ""
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Sum"
msgstr ""
msgstr "Somme"
#. module: base_report_creator
#: field:base_report_creator.report,view_type1:0
@@ -59,37 +63,37 @@ msgstr ""
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Field List"
msgstr ""
msgstr "Liste de Champs"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
msgid "Field Name"
msgstr ""
msgstr "Nom du champ"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Delay"
msgstr ""
msgstr "Délai"
#. module: base_report_creator
#: field:base_report_creator.report.fields,field_id:0
msgid "Field"
msgstr ""
msgstr "Champ"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "State"
msgstr ""
msgstr "État"
#. module: base_report_creator
#: selection:base_report_creator.report,state:0
msgid "Valid"
msgstr ""
msgstr "Valide"
#. module: base_report_creator
#: selection:base_report_creator.report,state:0
msgid "Draft"
msgstr ""
msgstr "Brouillon"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
@@ -105,32 +109,32 @@ msgstr ""
#: field:base_report_creator.report,filter_ids:0
#: view:base_report_creator.report:0
msgid "Filters"
msgstr ""
msgstr "Filtres"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Security"
msgstr ""
msgstr "Sécurité"
#. module: base_report_creator
#: field:base_report_creator.report,state:0
msgid "Status"
msgstr ""
msgstr "État"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Add filter"
msgstr ""
msgstr "Ajouter un filtre"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
msgid "Create Menu for Report"
msgstr ""
msgstr "Créer un Menu pour le Rapport"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Vertical"
msgstr ""
msgstr "Vertical"
#. module: base_report_creator
#: selection:base_report_creator.report,type:0
@@ -140,7 +144,7 @@ msgstr ""
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "General Configuration"
msgstr ""
msgstr "Configuration générale"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
@@ -148,12 +152,12 @@ msgstr ""
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "/"
msgstr ""
msgstr "/"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_type:0
msgid "Pie Chart"
msgstr ""
msgstr "Graphique en Camembert"
#. module: base_report_creator
#: field:base_report_creator.report,view_type3:0
@@ -165,12 +169,12 @@ msgstr ""
#: wizard_button:base_report_creator.report_filter.fields,init,end:0
#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
msgid "Cancel"
msgstr ""
msgstr "Annuler"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Minimum"
msgstr ""
msgstr "Minimum"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,init:0
@@ -182,35 +186,35 @@ msgstr ""
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Graph"
msgstr ""
msgstr "Graphe"
#. module: base_report_creator
#: model:ir.model,name:base_report_creator.model_base_report_creator_report
#: field:base_report_creator.report.fields,report_id:0
#: field:base_report_creator.report.filter,report_id:0
msgid "Report"
msgstr ""
msgstr "Rapport"
#. module: base_report_creator
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Horizontal"
msgstr ""
msgstr "Horizontal"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Starting Date"
msgstr ""
msgstr "Date de début"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
#: field:base_report_creator.report.filter,condition:0
msgid "Condition"
msgstr ""
msgstr "Condition"
#. module: base_report_creator
#: view:base_report_creator.report:0
@@ -220,54 +224,54 @@ msgstr ""
#. module: base_report_creator
#: field:base_report_creator.report,name:0
msgid "Report Name"
msgstr ""
msgstr "Nom du rapport"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,graph_mode:0
msgid "X Axis"
msgstr ""
msgstr "Axe X"
#. module: base_report_creator
#: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
msgid "Parent Menu"
msgstr ""
msgstr "Menu Parent"
#. module: base_report_creator
#: field:base_report_creator.report,type:0
msgid "Report Type"
msgstr ""
msgstr "Type de Rapport"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Tree"
msgstr ""
msgstr "Arbre"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Average"
msgstr ""
msgstr "Moyenne"
#. module: base_report_creator
#: field:base_report_creator.report,group_ids:0
msgid "Authorized Groups"
msgstr ""
msgstr "Groupes Autorisés"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Maximum"
msgstr ""
msgstr "Maximum"
#. module: base_report_creator
#: field:base_report_creator.report.filter,expression:0
msgid "Value"
msgstr ""
msgstr "Valeur"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Graph View"
msgstr ""
msgstr "Vue Graphe"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
@@ -277,37 +281,37 @@ msgstr ""
#. module: base_report_creator
#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
msgid "Confirm Filter"
msgstr ""
msgstr "Confirmer le Filtre"
#. module: base_report_creator
#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
msgid "Continue"
msgstr ""
msgstr "Continuer"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
msgid "Values"
msgstr ""
msgstr "Valeurs"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Reports"
msgstr ""
msgstr "Rapports"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_orientation:0
msgid "Graph Orientation"
msgstr ""
msgstr "Orientation du Graphe"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Fields"
msgstr ""
msgstr "Champs"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Authorized Groups (empty for all)"
msgstr ""
msgstr "Groupes Autorisés (vide pour Tous)"
#. module: base_report_creator
#: field:base_report_creator.report,view_type2:0
@@ -317,63 +321,63 @@ msgstr ""
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_type:0
msgid "Bar Chart"
msgstr ""
msgstr "Graphique en Barres"
#. module: base_report_creator
#: field:base_report_creator.report.fields,graph_mode:0
msgid "Graph Mode"
msgstr ""
msgstr "Mode Graphe"
#. module: base_report_creator
#: field:base_report_creator.report.filter,name:0
msgid "Filter Name"
msgstr ""
msgstr "Nom du Filtre"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
msgid "Open Report"
msgstr ""
msgstr "Ouvrir le Rapport"
#. module: base_report_creator
#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
msgid "Report Filters"
msgstr ""
msgstr "Filtres des Rapports"
#. module: base_report_creator
#: selection:base_report_creator.report.filter,condition:0
msgid "AND"
msgstr ""
msgstr "AND"
#. module: base_report_creator
#: selection:base_report_creator.report.filter,condition:0
msgid "OR"
msgstr ""
msgstr "OR"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Ending Date"
msgstr ""
msgstr "Date de fin"
#. module: base_report_creator
#: wizard_view:base_report_creator.report.menu.create,init:0
msgid "Create Menu For This Report"
msgstr ""
msgstr "Créer un Menu pour ce Rapport"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "View parameters"
msgstr ""
msgstr "Paramètres de la Vue"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Grouped"
msgstr ""
msgstr "Groupé"
#. module: base_report_creator
#: field:base_report_creator.report,sql_query:0
#: view:base_report_creator.report:0
msgid "SQL Query"
msgstr ""
msgstr "Requête SQL"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
@@ -383,23 +387,23 @@ msgstr ""
#. module: base_report_creator
#: field:base_report_creator.report.fields,sequence:0
msgid "Sequence"
msgstr ""
msgstr "Séquence"
#. module: base_report_creator
#: field:base_report_creator.report,field_ids:0
#: view:base_report_creator.report:0
msgid "Fields to Display"
msgstr ""
msgstr "Champs à Afficher"
#. module: base_report_creator
#: field:base_report_creator.report.fields,calendar_mode:0
msgid "Calendar Mode"
msgstr ""
msgstr "Mode Calendrier"
#. module: base_report_creator
#: field:base_report_creator.report.fields,group_method:0
msgid "Grouping Method"
msgstr ""
msgstr "Méthode de Groupement"
#. module: base_report_creator
#: view:base_report_creator.report:0
@@ -409,38 +413,37 @@ msgstr ""
#. module: base_report_creator
#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
msgid "Display Fields"
msgstr ""
msgstr "Champs Affichés"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Uniq Colors"
msgstr ""
msgstr "Couleurs Uniques"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,graph_mode:0
msgid "Y Axis"
msgstr ""
msgstr "Axe Y"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
msgid "Operator"
msgstr ""
msgstr "Opérateur"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Calendar"
msgstr ""
msgstr "Calendrier"
#. module: base_report_creator
#: wizard_button:base_report_creator.report.menu.create,init,create_menu:0
#: view:base_report_creator.report:0
msgid "Create Menu"
msgstr ""
msgstr "Créer le menu"
#. module: base_report_creator
#: field:base_report_creator.report,active:0
msgid "Active"
msgstr ""
msgstr "Actif"
addons/base_report_designer/i18n/fr_FR.po
+78 -76
View File
@@ -4,41 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction"
msgstr "Introduction"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0
msgid "Upload your modified report"
msgstr "Upload le rapport modifié"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,send_form:0
msgid "Upload the modified report"
msgstr "Upload le rapport modifié"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
msgid "The .SXW report"
msgstr "Rapport .SXW"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Report modified"
msgstr "Rapport modifié"
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:24+0000\n"
"PO-Revision-Date: 2008-10-13 17:20+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 18:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,init,get_form:0
@@ -46,28 +22,40 @@ msgid "Modify a report"
msgstr "Modifier un rapport"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Your report has been modified."
msgstr "Votre rapport a été modifié"
#: wizard_view:base_report_designer.modify,init:0
msgid "Report designer"
msgstr "Report Designer"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,get_form_result,report_id:0
#: wizard_field:base_report_designer.modify,get_form,report_id:0
#: wizard_field:base_report_designer.modify,send_form,report_id:0
msgid "Report"
msgstr "Rapport "
#: wizard_field:base_report_designer.modify,send_form,file_sxw:0
msgid "Your .SXW file"
msgstr "Votre fichier .sxw"
#. module: base_report_designer
#, python-format
#: code:addons/base_report_designer/wizard/base_report_designer_modify.py:0
msgid "Report does not contain the sxw content!"
msgstr ""
#: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction"
msgstr "Introduction"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,send_form,send_form_result:0
msgid "Update the report"
msgstr "Mettre à jour le rapport"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0
msgid "Upload your modified report"
msgstr "Upload le rapport modifié"
#. module: base_report_designer
#: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
msgid "Report Designer"
msgstr ""
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,send_form:0
msgid "Upload the modified report"
msgstr "Upload le rapport modifié"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
#: wizard_view:base_report_designer.modify,get_form:0
@@ -75,41 +63,45 @@ msgstr ""
msgid "Get a report"
msgstr "Recevoir un rapport"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Your report has been modified."
msgstr "Votre rapport a été modifié"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
msgid "This is the template of your requested report. Save it as a .SXW file and open it with OpenOffice. Don't forget to install the Tiny OpenOffice package to modify it. Once it is modified, re-upload it in Tiny ERP using this wizard."
msgid ""
"This is the template of your requested report. Save it as a .SXW file and "
"open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
"to modify it. Once it is modified, re-upload it in Tiny ERP using this "
"wizard."
msgstr ""
"Ceci est le patron de votre rapport demandé. Sauvegardé le comme fichier "
".SXW et ouvrer le avec OpenOffice. N'oubliez pas d'installer le packet Tiny "
"OpenOffice pour le modifier. Une fois qu'il est modifié, rechargez le dans "
"OpenERP en utilisant cet assistant."
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
msgid "The .SXW report"
msgstr "Rapport .SXW"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form,get_form_result:0
msgid "Continue"
msgstr "Continuer"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,send_form,file_sxw:0
msgid "Your .SXW file"
msgstr "Votre fichier .sxw "
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,init:0
msgid "Report designer"
msgstr "Report Designer"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,send_form,send_form_result:0
msgid "Update the report"
msgstr "Mettre à jour le rapport"
#. module: base_report_designer
#: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
msgid "Modify an existing report"
msgstr ""
msgstr "Modifier un Rapport Existant"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form,end:0
#: wizard_button:base_report_designer.modify,init,end:0
msgid "Cancel"
msgstr "Annuler"
#: wizard_field:base_report_designer.modify,get_form_result,report_id:0
#: wizard_field:base_report_designer.modify,get_form,report_id:0
#: wizard_field:base_report_designer.modify,send_form,report_id:0
msgid "Report"
msgstr "Rapport"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,end:0
@@ -119,17 +111,27 @@ msgid "Close"
msgstr "Fermer"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,operation:0
msgid "Operation"
msgstr "Opération"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form:0
msgid "Select your report"
msgstr "Sélectionner votre rapport"
#: wizard_button:base_report_designer.modify,get_form,end:0
#: wizard_button:base_report_designer.modify,init,end:0
msgid "Cancel"
msgstr "Annuler"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,init:0
msgid "Report designer introduction"
msgstr "Introduction au report designer"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,operation:0
msgid "Operation"
msgstr "Opération"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Report modified"
msgstr "Rapport modifié"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form:0
msgid "Select your report"
msgstr "Sélectionner votre rapport"
addons/base_setup/wizard/wizard_base_setup.py
+28 -28
View File
@@ -52,6 +52,8 @@ view_form_profit = """<?xml version="1.0"?>
view_form_company = """<?xml version="1.0"?>
<form string="Setup">
<notebook colspan="4">
<page string="General Information">
<image name="gtk-dialog-info" colspan="2"/>
<group>
<separator string="Define Main Company" colspan="4"/>
@@ -67,12 +69,18 @@ view_form_company = """<?xml version="1.0"?>
<field name="email" align="0.0"/>
<field name="phone" align="0.0"/>
<field name="currency" align="0.0"/>
</group>
</page>
<page string="Report Information">
<separator string="Report header" colspan="4"/>
<newline/>
<field name="rml_header1" align="0.0" colspan="4"/>
<field name="rml_footer1" align="0.0" colspan="4"/>
<field name="rml_footer2" align="0.0" colspan="4"/>
</group>
<separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
<field colspan="4" name="logo" widget="image"/>
</page>
</notebook>
</form>"""
view_form_update = """<?xml version="1.0"?>
@@ -110,8 +118,6 @@ class wizard_base_setup(wizard.interface):
res.sort()
return res
def _get_company(self, cr, uid, data, context):
pool=pooler.get_pool(cr.dbname)
company_obj=pool.get('res.company')
@@ -121,28 +127,10 @@ class wizard_base_setup(wizard.interface):
company=company_obj.browse(cr, uid, ids)[0]
self.fields['name']['default']=company.name
self.fields['currency']['default']=company.currency_id.id
serv_pro_id = pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')]) or False
if serv_pro_id:
return {'profile':serv_pro_id[0]}
return {}
#self.fields['rml_header1']['default']=company.rml_header1
#self.fields['rml_footer1']['default']=company.rml_footer1
#self.fields['rml_footer2']['default']=company.rml_footer2
#if not company.partner_id.address:
# return {}
#address=company.partner_id.address[0]
#self.fields['street']['default']=address.street
#self.fields['street2']['default']=address.street2
#self.fields['zip']['default']=address.zip
#self.fields['city']['default']=address.city
#self.fields['email']['default']=address.email
#self.fields['phone']['default']=address.phone
#if address.state_id:
# self.fields['state_id']['default']=address.state_id.id
#else:
# self.fields['state_id']['default']=-1
#if address.country_id:
# self.fields['country_id']['default']=address.country_id.id
#else:
# self.fields['country_id']['default']=-1
#return {}
def _get_states(self, cr, uid, context):
pool=pooler.get_pool(cr.dbname)
@@ -161,6 +149,14 @@ class wizard_base_setup(wizard.interface):
res.sort(lambda x,y: cmp(x[1],y[1]))
return res
def _get_currency(self, cr, uid, context):
pool=pooler.get_pool(cr.dbname)
currency_obj=pool.get('res.currency')
ids=currency_obj.search(cr, uid, [])
res=[(currency.id, currency.name) for currency in currency_obj.browse(cr, uid, ids)]
res.sort(lambda x,y: cmp(x[1],y[1]))
return res
def _update(self, cr, uid, data, context):
pool=pooler.get_pool(cr.dbname)
form=data['form']
@@ -168,7 +164,6 @@ class wizard_base_setup(wizard.interface):
module_obj=pool.get('ir.module.module')
module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
company_obj=pool.get('res.company')
partner_obj=pool.get('res.partner')
address_obj=pool.get('res.partner.address')
@@ -180,6 +175,7 @@ class wizard_base_setup(wizard.interface):
'rml_footer1': form['rml_footer1'],
'rml_footer2': form['rml_footer2'],
'currency_id': form['currency'],
'logo': form['logo'],
})
partner_obj.write(cr, uid, [company.partner_id.id], {
'name': form['name'],
@@ -275,7 +271,7 @@ class wizard_base_setup(wizard.interface):
'string':'Profile',
'type':'selection',
'selection':_get_profiles,
'default': -1,
# 'default': _get_service_profile,
'required': True,
},
@@ -326,8 +322,8 @@ class wizard_base_setup(wizard.interface):
},
'currency': {
'string': 'Currency',
'type': 'many2one',
'relation': 'res.currency',
'type': 'selection',
'selection':_get_currency,
'required': True,
},
'rml_header1':{
@@ -354,6 +350,10 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
'type': 'char',
'size': 200,
},
'logo':{
'string': 'Logo',
'type': 'binary',
},
}
states={
'init':{
addons/base_vat/base_vat_data.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="property_account_tax" position="after">
<field name="property_account_position" position="after">
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
<group colspan="1" col="2">
<label string="VAT :" align="1.0"/>
addons/board/i18n/fr_FR.po
+4 -6
View File
@@ -2,7 +2,6 @@
# This file containt the translation of the following modules:
# * board
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0\n"
@@ -19,11 +18,9 @@ msgstr ""
#. module: board
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
msgid "The Object name must start with x_ and not contain any special character !"
msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
#. module: board
#: model:ir.model,name:board.model_board_board
@@ -209,3 +206,4 @@ msgstr "Créer le menu"
#: field:board.note,name:0
msgid "Subject"
msgstr "Sujet"
addons/board_auction/i18n/fr_FR.po
+27 -27
View File
@@ -1,34 +1,35 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * board_auction
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
"PO-Revision-Date: 2008-10-13 08:03+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 08:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_auction
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: board_auction
#: view:board.board:0
msgid "Objects by day"
msgstr ""
msgstr "Objets par Jour"
#. module: board_auction
#: model:ir.ui.menu,name:board_auction.menu_board_auction_manager
msgid "Auction Manager"
msgstr ""
msgstr "Gestionnaire des Enchères"
#. module: board_auction
#: view:board.board:0
@@ -43,47 +44,47 @@ msgstr ""
#. module: board_auction
#: view:board.board:0
msgid "My Latest Deposits"
msgstr ""
msgstr "Mes derniers dépots"
#. module: board_auction
#: view:board.board:0
msgid "Total Adjudications"
msgstr ""
msgstr "Adjudications Totales"
#. module: board_auction
#: view:board.board:0
msgid "Auction manager "
msgstr ""
msgstr "Gestionnaire des Enchères "
#. module: board_auction
#: view:board.board:0
msgid "Objects statistics"
msgstr ""
msgstr "Statistiques des Objets"
#. module: board_auction
#: view:board.board:0
msgid "Estimations/Adjudication"
msgstr ""
msgstr "Estimations/Adjudication"
#. module: board_auction
#: view:board.board:0
msgid "Latest objects"
msgstr ""
msgstr "Derniers Objets"
#. module: board_auction
#: view:board.board:0
msgid "My objects By Day"
msgstr ""
msgstr "Mes Objets par Jour"
#. module: board_auction
#: view:board.board:0
msgid "Min/Adj/Max"
msgstr ""
msgstr "Min/Adj/Max"
#. module: board_auction
#: view:board.board:0
msgid "Menu"
msgstr ""
msgstr "Menu"
#. module: board_auction
#: view:board.board:0
@@ -93,15 +94,14 @@ msgstr "Mon tableau"
#. module: board_auction
#: model:ir.actions.act_window,name:board_auction.open_board_auction_manager
msgid "Auction manager board"
msgstr ""
msgstr "Tableau du Gestionnaire des Enchères"
#. module: board_auction
#: view:board.board:0
msgid "My Latest Objects"
msgstr ""
msgstr "Mes Derniers Objets"
#. module: board_auction
#: view:board.board:0
msgid "Latest deposits"
msgstr ""
msgstr "Derniers Dépôts"
addons/board_crm_configuration/i18n/fr_FR.po
+28 -28
View File
@@ -1,41 +1,42 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * board_crm_configuration
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
"PO-Revision-Date: 2008-10-13 08:13+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 08:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_crm_configuration
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: board_crm_configuration
#: view:report.crm.case.categ:0
msgid "Cases by Sections and Categories"
msgstr ""
msgstr "Cas par Section et Catégorie"
#. module: board_crm_configuration
#: model:ir.actions.act_window,name:board_crm_configuration.act_oppor_categ
#: view:board.board:0
msgid "Opportunities By Categories"
msgstr ""
msgstr "Oportunités par Catégorie"
#. module: board_crm_configuration
#: model:ir.actions.act_window,name:board_crm_configuration.act_my_cases
#: view:board.board:0
msgid "My Cases"
msgstr ""
msgstr "Mes Cas"
#. module: board_crm_configuration
#: view:board.board:0
@@ -45,7 +46,7 @@ msgstr ""
#. module: board_crm_configuration
#: model:ir.actions.act_window,name:board_crm_configuration.open_board_crm
msgid "CRM Dashboard"
msgstr ""
msgstr "Tableau de Bord CRM"
#. module: board_crm_configuration
#: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm
@@ -57,57 +58,56 @@ msgstr ""
#: model:ir.actions.act_window,name:board_crm_configuration.act_leads_month_user
#: view:board.board:0
msgid "Leads Of The Month By User"
msgstr ""
msgstr "Opportunités par Mois et Utilisateur"
#. module: board_crm_configuration
#: view:report.crm.case.user:0
msgid "Cases by User and Section"
msgstr ""
msgstr "Cas par Utilisateur et Section"
#. module: board_crm_configuration
#: view:board.board:0
msgid "My Meetings"
msgstr ""
msgstr "Mes rendez-vous"
#. module: board_crm_configuration
#: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm_config
msgid "CRM Configuration"
msgstr ""
msgstr "Configuration CRM"
#. module: board_crm_configuration
#: view:board.board:0
msgid "Jobs Requests Of The Month by Applied Job"
msgstr ""
msgstr "Demandes d'Emploi du Mois par Emploi Demandé"
#. module: board_crm_configuration
#: view:board.board:0
msgid "My Leads By Stage"
msgstr ""
msgstr "Mes Affaires par Stage"
#. module: board_crm_configuration
#: view:board.board:0
#: view:report.crm.case.section.stage:0
msgid "Leads By Stage"
msgstr ""
msgstr "Affaires par Stage"
#. module: board_crm_configuration
#: model:ir.ui.menu,name:board_crm_configuration.menu_board_statistics_dash
#: view:board.board:0
msgid "Statistics Dashboard"
msgstr ""
msgstr "Tableau de Bord Statistique"
#. module: board_crm_configuration
#: view:board.board:0
msgid "My Leads"
msgstr ""
msgstr "Mes affaires"
#. module: board_crm_configuration
#: model:ir.actions.act_window,name:board_crm_configuration.open_board_statistical_dash
msgid "CRM - Statistics Dashboard"
msgstr ""
msgstr "CRM - Tableau de Bord Statistique"
#. module: board_crm_configuration
#: view:board.board:0
msgid "My Jobs Requests"
msgstr ""
msgstr "Mes demandes d'emploi"
addons/board_manufacturing/i18n/fr_FR.po
+14 -13
View File
@@ -1,19 +1,21 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * board_manufacturing
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
"PO-Revision-Date: 2008-10-13 08:14+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Encoding: Plural-Forms:\n"
"X-Launchpad-Export-Date: 2008-10-13 08:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_manufacturing
#: view:board.board:0
@@ -28,7 +30,7 @@ msgstr "Ordre de fabrication suivant"
#. module: board_manufacturing
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: board_manufacturing
#: model:ir.ui.menu,name:board_manufacturing.menu_board_manufacturing
@@ -59,4 +61,3 @@ msgstr "Variation de la valeur du stock"
#: view:board.board:0
msgid "Workcenter futur load"
msgstr "Charge future du poste de charge"
addons/board_project/i18n/fr_FR.po
+24 -34
View File
@@ -1,19 +1,20 @@
# Translation of OpenERP Server.
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * board_project
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
"PO-Revision-Date: 2008-10-13 08:15+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 08:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_project
#: view:board.board:0
@@ -23,32 +24,22 @@ msgstr "Mon pipeline"
#. module: board_project
#: view:board.board:0
msgid "My Deadlines"
msgstr ""
msgstr "Mes dates limites"
#. module: board_project
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: board_project
#: view:board.board:0
msgid "User's timesheets"
msgstr "Feuille de présence de l'utilisateur"
#. module: board_project
#: view:hr_timesheet_sheet.sheet:0
msgid "Timesheets"
msgstr "Timesheets"
#. module: board_project
#: view:project.task:0
msgid "My Tasks"
msgstr ""
#. module: board_project
#: view:board.board:0
msgid "My Timesheet"
msgstr ""
msgstr "Mes tâches"
#. module: board_project
#: view:board.board:0
@@ -59,7 +50,7 @@ msgstr "Mon planning de projets"
#: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
#: view:board.board:0
msgid "Public Notes"
msgstr ""
msgstr "Notes publiques"
#. module: board_project
#: model:ir.actions.act_window,name:board_project.open_board_project
@@ -83,9 +74,9 @@ msgid "Project manager board"
msgstr "Tableau du responsable projet"
#. module: board_project
#: view:board.board:0
msgid "My tasks board"
msgstr "Mon tableau de tâches"
#: view:hr_timesheet_sheet.sheet:0
msgid "Timesheets"
msgstr "Feuille de présence"
#. module: board_project
#: model:ir.actions.act_window,name:board_project.act_my_account
@@ -97,7 +88,7 @@ msgstr "Mes comptes à facturer"
#: model:ir.actions.act_window,name:board_project.act_my_project
#: view:board.board:0
msgid "My projects"
msgstr "Mes projets "
msgstr "Mes projets"
#. module: board_project
#: model:ir.actions.act_window,name:board_project.action_view_task_tree
@@ -108,21 +99,20 @@ msgstr "Mes tâches ouvertes"
#. module: board_project
#: view:board.board:0
msgid "My Board"
msgstr ""
msgstr "Mon Tableau"
#. module: board_project
#: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
msgid "My Task's Deadlines"
msgstr ""
msgstr "Les Dates Limites de mes Tâches"
#. module: board_project
#: view:board.board:0
msgid "My Planning"
msgstr ""
msgid "My tasks board"
msgstr "Mon tableau de tâches"
#. module: board_project
#: model:ir.actions.act_window,name:board_project.open_board_project_manager
#: model:ir.ui.menu,name:board_project.menu_board_project_manager
msgid "Project Manager Dashboard"
msgstr "Tableau de bord de gestion de projet"
addons/board_sale/i18n/fr_FR.po
+20 -20
View File
@@ -4,59 +4,59 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
"PO-Revision-Date: 2008-10-13 08:53+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 09:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_sale
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: board_sale
#: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
msgid "Sale Dashboard"
msgstr ""
msgstr "Tableau de Bord des Ventes"
#. module: board_sale
#: view:board.board:0
msgid "Sales of the month"
msgstr ""
msgstr "Ventes du Mois"
#. module: board_sale
#: view:board.board:0
msgid "Sales manager board"
msgstr ""
msgstr "Tableau de Bord du Gestionnaire des Ventes"
#. module: board_sale
#: view:board.board:0
msgid "Cases of the month"
msgstr ""
msgstr "Cas du Mois"
#. module: board_sale
#: model:ir.ui.menu,name:board_sale.next_id_88
msgid "Sales"
msgstr ""
msgstr "Ventes"
#. module: board_sale
#: view:board.board:0
msgid "My open quotations"
msgstr ""
msgstr "Mes Devis Ouverts"
#. module: board_sale
#: view:board.board:0
msgid "Cases statistics"
msgstr ""
msgstr "Statistiques des Cas"
#. module: board_sale
#: view:board.board:0
msgid "Top ten sales of the month"
msgstr ""
msgstr "10 meilleures Ventes du Mois"
addons/crm/__terp__.py
+2 -2
View File
@@ -53,11 +53,11 @@ between mails and Tiny ERP.""",
"init_xml" : ["crm_data.xml"],
"demo_xml" : ["crm_demo.xml"],
"update_xml" : [
"security/crm_security.xml",
"security/ir.model.access.csv",
"crm_view.xml",
"crm_report.xml",
"crm_wizard.xml",
"security/crm_security.xml",
"security/ir.model.access.csv",
],
"active": False,
"installable": True
addons/crm/i18n/fr_FR.po
+109 -88
View File
@@ -4,27 +4,28 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:33+0000\n"
"PO-Revision-Date: 2008-10-13 10:15+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 11:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
#: wizard_field:crm.case.section.menu,design_menu,menu7_option:0
#: wizard_field:crm.case.section.menu,design_menu,menu7:0
msgid "My Draft "
msgstr ""
msgstr "Mes brouillons "
#. module: crm
#: view:crm.case:0
msgid "Add Last Mail for Replying"
msgstr "Ajouter le dernier courrier pour réponse"
msgstr "Ajouter le dernier Mail à la réponse"
#. module: crm
#: view:crm.segmentation:0
@@ -35,46 +36,51 @@ msgstr "Calcul de l'état d'esprit"
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
msgid "All Cases"
msgstr ""
msgstr "Tous les cas"
#. module: crm
#: wizard_view:crm.case.section.menu,init:0
msgid "Base Information"
msgstr ""
msgstr "Information de Base"
#. module: crm
#: field:crm.case.rule,trg_partner_categ_id:0
#: field:crm.segmentation,categ_id:0
msgid "Partner Category"
msgstr "Catégorie de partenaire"
msgstr "Catégorie du partenaire"
#. module: crm
#: field:crm.segmentation,sales_purchase_active:0
msgid "Use The Sales Purchase Rules"
msgstr ""
msgstr "Utilise les Règles Ventes - Achats"
#. module: crm
#: wizard_field:crm.case.section.menu,design_menu,menu13_option:0
#: wizard_field:crm.case.section.menu,design_menu,menu13:0
msgid "All Open "
msgstr ""
msgstr "Tous les ouverts "
#. module: crm
#: help:crm.segmentation,som_interval_default:0
msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
msgstr "Etat d'esprit par défaut pour la période précédent le calcul de l'intervale maximale. C'est l'état d'esprit par défaut si le partenaire n'a pas d'évenement."
msgid ""
"Default state of mind for period preceeding the 'Max Interval' computation. "
"This is the starting state of mind by default if the partner has no event."
msgstr ""
"Etat d'esprit par défaut pour la période précédent le calcul de l'intervale "
"maximale. C'est l'état d'esprit par défaut si le partenaire n'a pas "
"d'évenement."
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_case_section_menu
#: model:ir.ui.menu,name:crm.menu_wizard_case_section_menu
msgid "Create menus for a case section"
msgstr "Créer des menus pour une section de cas"
msgstr "Création des menus pour cette section de cas"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_rule-act
#: model:ir.ui.menu,name:crm.menu_crm_case_rule-act
msgid "Rules"
msgstr ""
msgstr "Règles"
#. module: crm
#: field:crm.case,email_cc:0
@@ -84,7 +90,7 @@ msgstr "E-mails en copie"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm
msgid "CRM & SRM"
msgstr "CRM & SRM"
msgstr "GRC & GRF"
#. module: crm
#: view:crm.segmentation:0
@@ -105,7 +111,7 @@ msgstr "Ajouter en copie"
#: wizard_field:crm.case.section.menu,design_menu,menu1_option:0
#: wizard_field:crm.case.section.menu,design_menu,menu1:0
msgid "My "
msgstr ""
msgstr "Mes "
#. module: crm
#: model:ir.ui.menu,name:crm.next_id_51
@@ -121,7 +127,7 @@ msgstr "Cas"
#: selection:crm.case.rule,trg_priority_from:0
#: selection:crm.case.rule,trg_priority_to:0
msgid "Highest"
msgstr "Très haute"
msgstr "Haute"
#. module: crm
#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -134,31 +140,29 @@ msgstr "Cas ouverts"
#. module: crm
#: help:crm.segmentation,categ_id:0
msgid "The partner category that will be added to partners that match the segmentation criterions after computation."
msgstr "La catégorie du partenaire qui sera ajouté aux partenaires correspondants aux critères de segmentation après calcul."
msgid ""
"The partner category that will be added to partners that match the "
"segmentation criterions after computation."
msgstr ""
"La catégorie du partenaire qui sera ajouté aux partenaires correspondants "
"aux critères de segmentation après calcul."
#. module: crm
#: view:crm.case.rule:0
msgid "%(partner)s = Partner name"
msgstr "%(partner)s = Nom du partenaire"
#. module: crm
#, python-format
#: code:addons/crm/crm.py:0
msgid "You can not escalate this case.\nYou are already at the top level."
msgstr ""
#. module: crm
#: wizard_button:crm.case.section.menu,init,design_menu:0
#: wizard_button:crm.case.section.menu,design_menu,create:0
msgid "Create menu Entries"
msgstr ""
msgstr "Créer les entrées du menu"
#. module: crm
#: field:crm.case.log,user_id:0
#: field:crm.case,user_id:0
msgid "User Responsible"
msgstr "Responsable"
msgstr "Utilisateur responsable"
#. module: crm
#: field:crm.segmentation.line,expr_value:0
@@ -170,26 +174,20 @@ msgstr "Valeur"
msgid "Case history"
msgstr "Historique du cas"
#. module: crm
#, python-format
#: code:addons/crm/crm.py:0
msgid "Error!"
msgstr ""
#. module: crm
#: field:crm.case.rule,act_state:0
msgid "Set state to"
msgstr "Mettre l'état à"
msgstr "Mettre à l'état"
#. module: crm
#: field:crm.case.categ,name:0
msgid "Case Category Name"
msgstr "Catégorie de cas"
msgstr "Nom de la catégorie du cas"
#. module: crm
#: wizard_view:crm.case.section.menu,init:0
msgid "Select Views (empty for default)"
msgstr ""
msgstr "Sélectionne les Vues (vide par défaut)"
#. module: crm
#: field:crm.segmentation,som_interval_max:0
@@ -215,7 +213,7 @@ msgstr "Email à envoyer"
#: wizard_field:crm.case.section.menu,design_menu,menu16_option:0
#: wizard_field:crm.case.section.menu,design_menu,menu16:0
msgid "All Unclosed and Unassigned "
msgstr ""
msgstr "Tous les Fermés et Non Assignés "
#. module: crm
#: field:crm.case.rule,trg_priority_from:0
@@ -231,7 +229,7 @@ msgstr "Nom de la règle"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
msgid "Cases Histories"
msgstr "Historique des cas"
msgstr "Historiques des cas"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -246,7 +244,7 @@ msgstr "Référence"
#. module: crm
#: field:crm.case.section,child_ids:0
msgid "Childs Sections"
msgstr "Sections fils"
msgstr "Sections enfants"
#. module: crm
#: view:res.partner.events:0
@@ -340,7 +338,7 @@ msgstr "Mail à ces adresses"
#. module: crm
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: crm
#: field:crm.case,priority:0
@@ -384,7 +382,7 @@ msgstr "Etat d'esprit"
#: model:ir.actions.act_window,name:crm.crm_case_section_act
#: model:ir.ui.menu,name:crm.menu_crm_case_section_act
msgid "Sections"
msgstr ""
msgstr "Sections"
#. module: crm
#: field:crm.case.history,email:0
@@ -413,13 +411,7 @@ msgstr "Très basse"
#. module: crm
#: view:crm.segmentation:0
msgid "Profiling"
msgstr ""
#. module: crm
#, python-format
#: code:addons/crm/crm.py:0
msgid "Error !"
msgstr ""
msgstr "Analyse"
#. module: crm
#: view:crm.case:0
@@ -435,7 +427,7 @@ msgstr "Date de création"
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_my
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_my
msgid "My cases"
msgstr "Mes cas "
msgstr "Mes cas"
#. module: crm
#: wizard_field:crm.case.section.menu,design_menu,menu15_option:0
@@ -445,8 +437,12 @@ msgstr ""
#. module: crm
#: help:crm.segmentation,som_interval_max:0
msgid "The computation is made on all events that occured during this interval, the past X periods."
msgstr "Le calcul est effectué sur tout les évenements qui ont eux lieu pendant cette interval, les dernières X périodes."
msgid ""
"The computation is made on all events that occured during this interval, the "
"past X periods."
msgstr ""
"Le calcul est effectué sur tout les évenements qui ont eux lieu pendant "
"cette interval, les dernières X périodes."
#. module: crm
#: view:crm.case.rule:0
@@ -488,7 +484,7 @@ msgstr "En attente"
#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
#: model:ir.ui.menu,name:crm.next_id_53
msgid "Segmentations"
msgstr ""
msgstr "Segmentations"
#. module: crm
#: wizard_field:crm.case.section.menu,design_menu,menu3:0
@@ -498,8 +494,19 @@ msgstr ""
#. module: crm
#: help:crm.segmentation,som_interval:0
msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionnality for recurring businesses."
msgid ""
"A period is the average number of days between two cycle of sale or purchase "
"for this segmentation. It's mainly used to detect if a partner has not "
"purchased or buy for a too long time, so we suppose that his state of mind "
"has decreased because he probably bought goods to another supplier. Use this "
"functionnality for recurring businesses."
msgstr ""
"Une période est le nombre de jours moyens entre deux cycles de vente ou "
"d'achat pour cette segmentation. Elle est principalement utilisée pour "
"vérifier si un partenaire n'a pas acheté ou vendu pour une période de temps "
"trop longue, ainsi, nous supposons que son état d'esprit a changé parce "
"qu'il a probablement acheté des biens chez un autre fournisseur. Utilisez "
"cette fonctionalité pour les affaires récurentes."
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -572,7 +579,7 @@ msgstr "Probabilité"
#. module: crm
#: wizard_view:crm.case.section.menu,design_menu:0
msgid "Update The Proposed Menus To Be Created"
msgstr ""
msgstr "Mettre à jour les Menus Proposés pour qu'ils soient créés"
#. module: crm
#: field:crm.segmentation,partner_id:0
@@ -678,7 +685,7 @@ msgstr "Infos E-mail"
#. module: crm
#: wizard_field:crm.case.section.menu,init,view_calendar:0
msgid "Calendar View"
msgstr ""
msgstr "Vue calendrier"
#. module: crm
#: selection:crm.case,priority:0
@@ -705,8 +712,12 @@ msgstr "Après délai"
#. module: crm
#: help:crm.segmentation,sales_purchase_active:0
msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
msgid ""
"Check if you want to use this tab as part of the segmentation rule. If not "
"checked, the criteria beneath will be ignored"
msgstr ""
"Vérifiez si vous voulez utiliser cet onglet comme faisant partie de la règle "
"de segmentation. S'il n'est pas coché, le critère en dessous sera ignoré"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
@@ -722,7 +733,7 @@ msgstr "Rappel avec attachement"
#. module: crm
#: field:crm.case,state:0
msgid "Status"
msgstr ""
msgstr "État"
#. module: crm
#: field:crm.case.rule,act_remind_user:0
@@ -737,7 +748,7 @@ msgstr "Mettre la section à"
#. module: crm
#: field:crm.segmentation,state:0
msgid "Execution Status"
msgstr ""
msgstr "Statut d'exécution"
#. module: crm
#: selection:crm.case,priority:0
@@ -754,12 +765,6 @@ msgstr "Normal"
msgid "Escalate"
msgstr "Escalader"
#. module: crm
#, python-format
#: code:addons/crm/crm.py:0
msgid "You must put a Partner eMail to use this action!"
msgstr ""
#. module: crm
#: field:crm.segmentation,som_interval_default:0
msgid "Default (0=None)"
@@ -806,12 +811,12 @@ msgstr "Section parent"
#. module: crm
#: wizard_field:crm.case.section.menu,init,menu_parent_id:0
msgid "Parent Menu"
msgstr ""
msgstr "Menu Parent"
#. module: crm
#: view:crm.segmentation:0
msgid "Included Answers :"
msgstr ""
msgstr "Réponses incluses :"
#. module: crm
#: view:crm.case.rule:0
@@ -825,13 +830,17 @@ msgstr "Mois"
#. module: crm
#: help:crm.case.section,reply_to:0
msgid "The email address wich is the 'Reply-To' of all email sent by Tiny ERP for cases in this section"
msgstr "Cette adresse email qui est le 'Répondre à' de tous les emails envoyé par Tiny ERP concernant les cas dans cette section"
msgid ""
"The email address wich is the 'Reply-To' of all email sent by Tiny ERP for "
"cases in this section"
msgstr ""
"Cette adresse email qui est le 'Répondre à' de tous les emails envoyé par "
"Tiny ERP concernant les cas dans cette section"
#. module: crm
#: wizard_field:crm.case.section.menu,init,menu_name:0
msgid "Base Menu Name"
msgstr ""
msgstr "Nom du Menu de Base"
#. module: crm
#: field:crm.case,date:0
@@ -842,7 +851,7 @@ msgstr "Date"
#. module: crm
#: wizard_view:crm.case.section.menu,design_menu:0
msgid "Created Menus"
msgstr ""
msgstr "Menus Créés"
#. module: crm
#: field:crm.case.log,name:0
@@ -877,7 +886,7 @@ msgstr "Délai après date déclenchement:"
#. module: crm
#: view:crm.segmentation:0
msgid "Profiling Options"
msgstr ""
msgstr "Options d'analyse"
#. module: crm
#: field:crm.case,partner_address_id:0
@@ -967,8 +976,11 @@ msgstr "Code de la section"
#. module: crm
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: crm
#: view:res.partner.events:0
@@ -984,7 +996,7 @@ msgstr "Responsable"
#. module: crm
#: wizard_view:crm.case.section.menu,init:0
msgid "Create Menus For Cases"
msgstr ""
msgstr "Créer des Menus pour les Cas"
#. module: crm
#: view:crm.case.rule:0
@@ -1016,7 +1028,7 @@ msgstr "Segmentation du partenaire"
#. module: crm
#: view:crm.segmentation:0
msgid "Excluded Answers :"
msgstr ""
msgstr "Réponses exclues :"
#. module: crm
#: field:crm.case.rule,act_priority:0
@@ -1110,8 +1122,12 @@ msgstr "Nom du segment"
#. module: crm
#: help:crm.segmentation,som_interval_decrease:0
msgid "If the partner has not purchased (or buied) during a period, decrease the state of mind by this factor. It's a multiplication"
msgstr "Si le partenaire n'a pas acheté pendant une période, diminue l'état d'esprit par ce facteur. C'est une multiplication"
msgid ""
"If the partner has not purchased (or buied) during a period, decrease the "
"state of mind by this factor. It's a multiplication"
msgstr ""
"Si le partenaire n'a pas acheté pendant une période, diminue l'état d'esprit "
"par ce facteur. C'est une multiplication"
#. module: crm
#: wizard_field:crm.case.section.menu,design_menu,menu8_option:0
@@ -1173,8 +1189,14 @@ msgstr "ID du cas"
#. module: crm
#: help:crm.segmentation,exclusif:0
msgid "Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions"
msgstr "Vérifie si la catégorie est limitée au partenaires correspondants aux critères de segmentation. Si vérifié, retire la catégorie des partenaires ne correspondants pas aux critères de segmentation."
msgid ""
"Check if the category is limited to partners that match the segmentation "
"criterions. If checked, remove the category from partners that doesn't match "
"segmentation criterions"
msgstr ""
"Vérifie si la catégorie est limitée au partenaires correspondants aux "
"critères de segmentation. Si vérifié, retire la catégorie des partenaires ne "
"correspondants pas aux critères de segmentation."
#. module: crm
#: field:crm.case,log_ids:0
@@ -1184,7 +1206,7 @@ msgstr "Historique"
#. module: crm
#: wizard_field:crm.case.section.menu,init,view_form:0
msgid "Form View"
msgstr ""
msgstr "Vue Formulaire"
#. module: crm
#: field:crm.segmentation,exclusif:0
@@ -1205,7 +1227,7 @@ msgstr "Continuer le processus"
#. module: crm
#: wizard_field:crm.case.section.menu,init,view_tree:0
msgid "Tree View"
msgstr ""
msgstr "Vue en arbre"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_section_open_act
@@ -1261,4 +1283,3 @@ msgstr ""
#: field:crm.case.rule,trg_date_type:0
msgid "Trigger Date"
msgstr "Date de déclenchement"
addons/crm/security/crm_security.xml
+9 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<data noupdate="0">
<record id="group_crm_manager" model="res.groups">
<field name="name">CRM / Manager</field>
@@ -10,5 +10,13 @@
<field name="name">CRM / User</field>
</record>
<record model='ir.ui.menu' id='menu_crm'>
<field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>
</record>
<record model='ir.ui.menu' id='menu_crm_configuration'>
<field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>
</record>
</data>
</openerp>
addons/crm_configuration/__terp__.py
+1
View File
@@ -39,6 +39,7 @@
"crm_jobs_menu.xml", "crm_opportunity_menu.xml",
"crm_helpdesk_menu.xml", "crm_lead_menu.xml",
"crm_meeting_menu.xml",
"security/ir.model.access.csv",
# "process/crm_configuration_process.xml",
],
"active": False,
addons/crm_configuration/i18n/fr_FR.po
+172 -169
View File
File diff suppressed because it is too large Load Diff
addons/crm_configuration/security/ir.model.access.csv
+11 -5
View File
@@ -1,5 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_crm_case_stage,crm.case.stage,model_crm_case_stage,crm.group_crm_user,1,0,0,0
access_report_crm_case_section_stage,report.crm.case.section.stage,model_report_crm_case_section_stage,crm.group_crm_manager,1,0,0,0
access_report_crm_case_section_categ_stage,report.crm.case.section.categ.stage,model_report_crm_case_section_categ_stage,crm.group_crm_manager,1,0,0,0
access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,crm.group_crm_manager,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
"access_report_crm_case_section_stage","report.crm.case.section.stage","model_report_crm_case_section_stage","crm.group_crm_manager",1,0,0,0
"access_report_crm_case_section_categ_stage","report.crm.case.section.categ.stage","model_report_crm_case_section_categ_stage","crm.group_crm_manager",1,0,0,0
"access_report_crm_case_section_categ_categ2","report.crm.case.section.categ.categ2","model_report_crm_case_section_categ_categ2","crm.group_crm_manager",1,0,0,
"access_report_crm_case_section_categ2","report.crm.case.section.categ2","model_report_crm_case_section_categ2","crm.group_crm_manager",1,0,0,
"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
"access_crm_menu_config_wizard","crm config wizard manager","model_crm_menu_config_wizard","crm.group_crm_manager",1,1,1,1
"access_crm_menu_config_wizard system","crm config wizard manager system","model_crm_menu_config_wizard","base.group_system",1,1,1,1
"access_crm_case_category2_user","crm_case_category2 user","model_crm_case_category2","crm.group_crm_user",1,0,0,0
"access_crm_case_category2_manager","crm_case_category2 manager","model_crm_case_category2","crm.group_crm_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_case_stage crm.case.stage model_crm_case_stage crm.group_crm_user 1 0 0 0
3 access_report_crm_case_section_stage report.crm.case.section.stage model_report_crm_case_section_stage crm.group_crm_manager 1 0 0 0
4 access_report_crm_case_section_categ_stage report.crm.case.section.categ.stage model_report_crm_case_section_categ_stage crm.group_crm_manager 1 0 0 0
5 access_crm_case_stage_manager access_report_crm_case_section_categ_categ2 crm.case.stage report.crm.case.section.categ.categ2 model_crm_case_stage model_report_crm_case_section_categ_categ2 crm.group_crm_manager 1 1 0 1 0 1
6 access_report_crm_case_section_categ2 report.crm.case.section.categ2 model_report_crm_case_section_categ2 crm.group_crm_manager 1 0 0
7 access_crm_case_stage_manager crm.case.stage model_crm_case_stage crm.group_crm_manager 1 1 1 1
8 access_crm_menu_config_wizard crm config wizard manager model_crm_menu_config_wizard crm.group_crm_manager 1 1 1 1
9 access_crm_menu_config_wizard system crm config wizard manager system model_crm_menu_config_wizard base.group_system 1 1 1 1
10 access_crm_case_category2_user crm_case_category2 user model_crm_case_category2 crm.group_crm_user 1 0 0 0
11 access_crm_case_category2_manager crm_case_category2 manager model_crm_case_category2 crm.group_crm_manager 1 1 1 1
addons/crm_profiling/i18n/fr_FR.po
+41 -34
View File
@@ -4,98 +4,106 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
"PO-Revision-Date: 2008-10-13 10:18+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 11:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: crm_profiling
#: field:crm.segmentation,answer_no:0
msgid "Excluded answers"
msgstr ""
msgstr "Réponses exclues"
#. module: crm_profiling
#: model:ir.model,name:crm_profiling.model_crm_profiling_question
#: field:crm_profiling.answer,question_id:0
#: field:crm_profiling.question,name:0
msgid "Question"
msgstr ""
msgstr "Question"
#. module: crm_profiling
#: wizard_button:open_questionnaire,init,open:0
msgid "Open Questionnaire"
msgstr ""
msgstr "Questionnaire Ouvert"
#. module: crm_profiling
#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
#: view:crm_profiling.questionnaire:0
msgid "Questionnaires"
msgstr ""
msgstr "Questionnaire"
#. module: crm_profiling
#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
#: field:crm_profiling.answer,name:0
msgid "Answer"
msgstr ""
msgstr "Réponse"
#. module: crm_profiling
#: help:crm.segmentation,profiling_active:0
msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
msgid ""
"Check if you want to use this tab as part of the segmentation rule. If not "
"checked, the criteria beneath will be ignored"
msgstr ""
"Vérifiez si vous voulez utiliser cet onglet comme faisant partie de la règle "
"de segmentation. S'il n'est pas coché, le critère en dessous sera ignoré"
#. module: crm_profiling
#: view:res.partner:0
msgid "Profiling"
msgstr ""
msgstr "Analyse"
#. module: crm_profiling
#: field:crm_profiling.questionnaire,description:0
msgid "Description"
msgstr ""
msgstr "Description"
#. module: crm_profiling
#: field:res.partner,answers_ids:0
#: view:crm_profiling.answer:0
#: view:crm_profiling.question:0
msgid "Answers"
msgstr ""
msgstr "Réponses"
#. module: crm_profiling
#: wizard_field:open_questionnaire,init,questionnaire_name:0
msgid "Questionnaire name"
msgstr ""
msgstr "Nom du Questionnaire"
#. module: crm_profiling
#: view:res.partner:0
msgid "Use a questionnaire"
msgstr ""
msgstr "Utiliser un Questionnaire"
#. module: crm_profiling
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: crm_profiling
#: field:crm.segmentation,answer_yes:0
msgid "Inclued answers"
msgstr ""
msgstr "Réponses Incluses"
#. module: crm_profiling
#: field:crm.segmentation,child_ids:0
msgid "Childs profile"
msgstr ""
msgstr "Profil Enfants"
#. module: crm_profiling
#: view:crm.segmentation:0
@@ -105,18 +113,18 @@ msgstr "Segmentation partenaire"
#. module: crm_profiling
#: field:crm.segmentation,profiling_active:0
msgid "Use The Profiling Rules"
msgstr ""
msgstr "Utiliser les Règles d'Analyse"
#. module: crm_profiling
#: field:crm_profiling.question,answers_ids:0
#: view:crm_profiling.question:0
msgid "Avalaible answers"
msgstr ""
msgstr "Réponses Disponibles"
#. module: crm_profiling
#: field:crm.segmentation,parent_id:0
msgid "Parent Profile"
msgstr ""
msgstr "Profil Parent"
#. module: crm_profiling
#: model:ir.actions.act_window,name:crm_profiling.open_questions
@@ -124,28 +132,27 @@ msgstr ""
#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
#: view:crm_profiling.question:0
msgid "Questions"
msgstr ""
msgstr "Questions"
#. module: crm_profiling
#: wizard_button:open_questionnaire,init,end:0
#: wizard_button:open_questionnaire,open,end:0
msgid "Cancel"
msgstr ""
msgstr "Annuler"
#. module: crm_profiling
#: wizard_view:open_questionnaire,init:0
#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
#: field:crm_profiling.questionnaire,name:0
msgid "Questionnaire"
msgstr ""
msgstr "Questionnaire"
#. module: crm_profiling
#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
msgid "Using a questionnaire"
msgstr ""
msgstr "Utiliser un Questionnaire"
#. module: crm_profiling
#: wizard_button:open_questionnaire,open,compute:0
msgid "Save Data"
msgstr ""
msgstr "Sauvegarder les Données"
addons/crm_profiling/security/ir.model.access.csv
+8 -6
View File
@@ -1,6 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_crm_profiling_question,crm_profiling.question,model_crm_profiling_question,crm.group_crm_user,1,0,0,0
access_crm_profiling_questionnaire,crm_profiling.questionnaire,model_crm_profiling_questionnaire,crm.group_crm_user,1,0,0,0
access_crm_profiling_answer,crm_profiling.answer,model_crm_profiling_answer,crm.group_crm_user,1,1,1,1
access_crm_profiling_question_manager,crm_profiling.question,model_crm_profiling_question,crm.group_crm_manager,1,1,1,1
access_crm_profiling_questionnaire_manager,crm_profiling.questionnaire,model_crm_profiling_questionnaire,crm.group_crm_manager,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question",,1,0,0,0
"access_crm_profiling_questionnaire","crm_profiling.questionnaire","model_crm_profiling_questionnaire",,1,0,0,0
"access_crm_profiling_answer_all","crm_profiling.answer all","model_crm_profiling_answer",,1,0,0,0
"access_crm_profiling_answer","crm_profiling.answer","model_crm_profiling_answer","crm.group_crm_user",1,1,1,1
"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","crm.group_crm_manager",1,1,1,1
"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","crm.group_crm_manager",1,1,1,1
"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","crm.group_crm_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_profiling_question crm_profiling.question model_crm_profiling_question crm.group_crm_user 1 0 0 0
3 access_crm_profiling_questionnaire crm_profiling.questionnaire model_crm_profiling_questionnaire crm.group_crm_user 1 0 0 0
4 access_crm_profiling_answer access_crm_profiling_answer_all crm_profiling.answer crm_profiling.answer all model_crm_profiling_answer crm.group_crm_user 1 1 0 1 0 1 0
5 access_crm_profiling_question_manager access_crm_profiling_answer crm_profiling.question crm_profiling.answer model_crm_profiling_question model_crm_profiling_answer crm.group_crm_manager crm.group_crm_user 1 1 1 1
6 access_crm_profiling_questionnaire_manager access_crm_profiling_question_manager crm_profiling.questionnaire crm_profiling.question manager model_crm_profiling_questionnaire model_crm_profiling_question crm.group_crm_manager 1 1 1 1
7 access_crm_profiling_questionnaire_manager crm_profiling.questionnaire manager model_crm_profiling_questionnaire crm.group_crm_manager 1 1 1 1
8 access_crm_profiling_answer_manager crm_profiling.answer manager model_crm_profiling_answer crm.group_crm_manager 1 1 1 1
addons/delivery/delivery_view.xml
+1 -1
View File
@@ -62,7 +62,7 @@
<field name="active" select="1"/>
<field name="carrier_id" select="1"/>
<field name="sequence" select="1"/>
<notebook>
<notebook colspan="4">
<page string="Grid definition">
<field colspan="4" name="line_ids" nolabel="1" select="1"/>
</page>
addons/delivery/i18n/fr_FR.po
+48 -112
View File
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 13:24+0000\n"
"PO-Revision-Date: 2008-10-13 10:22+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-13 11:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
#: field:delivery.grid,name:0
@@ -22,104 +23,73 @@ msgstr "Grille de transport"
#. module: delivery
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid
msgid "Delivery Grid"
msgstr ""
#. module: delivery
#: view:res.partner:0
msgid "Sales & Purchases"
msgstr ""
msgstr "Grille de Livraison"
#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid "<="
msgstr "<="
#. module: delivery
#: constraint:product.template:0
msgid "Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
#. module: delivery
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML non valide pour l'architecture de la vue!"
#. module: delivery
#: view:res.partner:0
msgid "Deliveries"
msgstr ""
msgstr "Livraisons"
#. module: delivery
#: wizard_button:delivery.sale.order,init,delivery:0
msgid "Create delivery line"
msgstr "Créer les lignes de livraison"
#. module: delivery
#, python-format
#: code:addons/delivery/wizard/delivery_sale_order.py:0
msgid "No grid avaible !"
msgstr ""
#. module: delivery
#: field:delivery.carrier,partner_id:0
msgid "Carrier Partner"
msgstr ""
#. module: delivery
#: model:product.template,name:delivery.delivery_product_product_template
msgid "Delivery by Poste"
msgstr ""
msgstr "Partenaire pour la Livraison"
#. module: delivery
#: field:delivery.grid,state_ids:0
msgid "States"
msgstr "Statuts"
#. module: delivery
#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
msgid "Add delivery line"
msgstr "Ajouter une ligne de Livraison"
#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr "Livraison"
#. module: delivery
#, python-format
#: code:addons/delivery/wizard/delivery_sale_order.py:0
msgid "The order state have to be draft to add delivery lines."
msgstr ""
#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
msgstr "Ligne grille"
#. module: delivery
#, python-format
#: code:addons/delivery/delivery.py:0
msgid "No price avaible !"
msgstr ""
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
msgid "Delivery Pricelist"
msgstr ""
msgstr "Liste de Prix Livraison"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_picking_tree5
#: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
msgid "Generate Draft Invoices On Receptions"
msgstr ""
#. module: delivery
#, python-format
#: code:addons/delivery/wizard/delivery_sale_order.py:0
msgid "No grid matching for this carrier !"
msgstr ""
msgstr "Créer les Factures Brouillon à la Réception"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid_line
@@ -139,11 +109,6 @@ msgstr "Volume"
msgid "Packings to be invoiced"
msgstr "Colisages à facturer"
#. module: delivery
#: constraint:product.product:0
msgid "Error: Invalid ean code"
msgstr ""
#. module: delivery
#: field:delivery.grid.line,grid_id:0
msgid "Grid"
@@ -164,6 +129,8 @@ msgstr "Créer les livraisons"
#: help:res.partner,property_delivery_carrier:0
msgid "This delivery method will be used when invoicing from packings."
msgstr ""
"Cette méthode de Livraison sera utilisée dans le cas de Factures générée à "
"partir des emballages"
#. module: delivery
#: selection:delivery.grid.line,type:0
@@ -194,7 +161,7 @@ msgstr "Transporteur et grilles de livraison"
#. module: delivery
#: field:delivery.grid.line,standard_price:0
msgid "Cost Price"
msgstr ""
msgstr "Prix standard"
#. module: delivery
#: view:delivery.grid:0
@@ -206,11 +173,6 @@ msgstr "Destination"
msgid "Name"
msgstr "Nom"
#. module: delivery
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
#. module: delivery
#: field:delivery.grid,country_ids:0
msgid "Countries"
@@ -245,6 +207,11 @@ msgstr "Opérateur"
msgid "Carrier"
msgstr "Transporteur"
#. module: delivery
#: view:res.partner:0
msgid "Properties"
msgstr "Propriétés"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
@@ -260,16 +227,10 @@ msgstr "Valeur maximum"
msgid "Start Zip"
msgstr "Code postal départ"
#. module: delivery
#, python-format
#: code:addons/delivery/wizard/delivery_sale_order.py:0
msgid "Order not in draft state !"
msgstr ""
#. module: delivery
#: field:delivery.carrier,grids_id:0
msgid "Delivery Grids"
msgstr ""
msgstr "Grilles de Livraison"
#. module: delivery
#: selection:delivery.grid.line,type:0
@@ -286,13 +247,7 @@ msgstr "Séquence"
#. module: delivery
#: field:delivery.grid.line,list_price:0
msgid "Sale Price"
msgstr ""
#. module: delivery
#, python-format
#: code:addons/delivery/delivery.py:0
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
msgstr "Prix de vente"
#. module: delivery
#: field:delivery.grid,zip_to:0
@@ -311,13 +266,20 @@ msgstr "Grilles de transport"
#. module: delivery
#: help:sale.order,carrier_id:0
msgid "Complete this field if you plan to invoice the shipping based on packings made."
msgstr "Complétez ce champ si vous planifiez de facturer la livraison sur base du colisage effectué."
msgid ""
"Complete this field if you plan to invoice the shipping based on packings "
"made."
msgstr ""
"Complétez ce champ si vous planifiez de facturer la livraison sur base du "
"colisage effectué."
#. module: delivery
#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
msgid "Delivery Costs"
msgstr ""
#: wizard_field:delivery.sale.order,init,carrier_id:0
#: wizard_view:delivery.sale.order,init:0
#: field:res.partner,property_delivery_carrier:0
#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
msgid "Delivery Method"
msgstr "Méthode de livraison"
#. module: delivery
#: view:delivery.grid:0
@@ -330,31 +292,11 @@ msgstr "Lignes grille"
msgid "Delivery grids"
msgstr "Grilles de transport"
#. module: delivery
#: wizard_field:delivery.sale.order,init,carrier_id:0
#: wizard_view:delivery.sale.order,init:0
#: field:res.partner,property_delivery_carrier:0
#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
msgid "Delivery Method"
msgstr "Méthode de livraison"
#. module: delivery
#, python-format
#: code:addons/delivery/stock.py:0
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
#. module: delivery
#: wizard_button:delivery.sale.order,init,end:0
msgid "Cancel"
msgstr "Annuler"
#. module: delivery
#, python-format
#: code:addons/delivery/stock.py:0
msgid "Warning"
msgstr ""
#. module: delivery
#: field:sale.order,carrier_id:0
msgid "Delivery method"
@@ -366,13 +308,7 @@ msgstr "Transporteur"
msgid "Price"
msgstr "Prix"
#. module: delivery
#: constraint:res.partner:0
msgid "The VAT doesn't seem to be correct."
msgstr ""
#. module: delivery
#: field:delivery.grid.line,price_type:0
msgid "Price Type"
msgstr "Type de prix"
addons/delivery/security/ir.model.access.csv
+9 -7
View File
@@ -1,7 +1,9 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_delivery_carrier,delivery.carrier,model_delivery_carrier,sale.group_sale_user,1,0,0,0
access_delivery_grid,delivery.grid,model_delivery_grid,sale.group_sale_user,1,0,0,0
access_delivery_grid_line,delivery.grid.line,model_delivery_grid_line,sale.group_sale_user,1,0,0,0
access_delivery_carrier_manager,delivery.carrier,model_delivery_carrier,sale.group_sale_manager,1,1,1,1
access_delivery_grid_manager,delivery.grid,model_delivery_grid,sale.group_sale_manager,1,1,1,1
access_delivery_grid_line_manager,delivery.grid.line,model_delivery_grid_line,sale.group_sale_manager,1,1,1,1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_delivery_carrier","delivery.carrier","model_delivery_carrier","sale.group_sale_user",1,0,0,0
"access_delivery_grid","delivery.grid","model_delivery_grid","sale.group_sale_user",1,0,0,0
"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","sale.group_sale_user",1,0,0,0
"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","sale.group_sale_manager",1,1,1,1
"access_delivery_grid_manager","delivery.grid","model_delivery_grid","sale.group_sale_manager",1,1,1,1
"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
"access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
"access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_delivery_carrier delivery.carrier model_delivery_carrier sale.group_sale_user 1 0 0 0
3 access_delivery_grid delivery.grid model_delivery_grid sale.group_sale_user 1 0 0 0
4 access_delivery_grid_line delivery.grid.line model_delivery_grid_line sale.group_sale_user 1 0 0 0
5 access_delivery_carrier_manager delivery.carrier model_delivery_carrier sale.group_sale_manager 1 1 1 1
6 access_delivery_grid_manager delivery.grid model_delivery_grid sale.group_sale_manager 1 1 1 1
7 access_delivery_grid_line_manager delivery.grid.line model_delivery_grid_line sale.group_sale_manager 1 1 1 1
8 access_delivery_carrier_partner_manager delivery.carrier partner_manager model_delivery_carrier base.group_partner_manager 1 0 0 0
9 access_delivery_carrier_stock_worker delivery.carrier stock_worker model_delivery_carrier stock.group_stock_user 1 0 0 0
addons/delivery/stock.py
+7 -3
View File
@@ -88,9 +88,13 @@ class stock_picking(osv.osv):
taxep = None
partner_id=picking.address_id.partner_id and picking.address_id.partner_id.id or False
if partner_id:
taxep_id = self.pool.get('res.partner').property_get(cursor, user,partner_id,property_pref=['property_account_tax']).get('property_account_tax',False)
if taxep_id:
taxep=self.pool.get('account.tax').browse(cursor, user,taxep_id)
print 'Found Partner'
partner = picking.address_id.partner_id
taxep = partner.property_account_position and partner.property_account_position.account_tax
print account_id
account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner, account_id)
print account_id
if not taxep or not taxep.id:
taxes_ids = [x.id for x in picking.carrier_id.product_id.taxes_id]
else:
addons/delivery/wizard/delivery_sale_order.py
+2 -3
View File
@@ -73,9 +73,8 @@ def _delivery_set(self, cr, uid, data, context):
taxep = None
partner_id=order.partner_id and order.partner_id.id or False
if partner_id:
taxep_id = pooler.get_pool(cr.dbname).get('res.partner').property_get(cr, uid,partner_id,property_pref=['property_account_tax']).get('property_account_tax',False)
if taxep_id:
taxep=pooler.get_pool(cr.dbname).get('account.tax').browse(cr, uid,taxep_id)
partner = order.partner_id
taxep = partner.property_account_position and partner.property_account_position.account_tax
if not taxep or not taxep.id:
taxes_ids = [x.id for x in grid.carrier_id.product_id.taxes_id]
else:
addons/document/__terp__.py
+5 -1
View File
@@ -14,7 +14,11 @@
""",
"depends" : ["base", "process"],
"init_xml" : ["document_data.xml"],
"update_xml" : ["document_view.xml"],
"update_xml" : [
"document_view.xml",
"security/document_security.xml",
"security/ir.model.access.csv",
],
"demo_xml" : ["document_demo.xml"],
"active": False,
"installable": True
addons/document/document.py
+5 -3
View File
@@ -1,7 +1,9 @@
#############################################################################
# -*- encoding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
# 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
# programmers who take the whole responsability of assessing all potential
addons/document/security/document_security.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
<record id="group_document_manager" model="res.groups">
<field name="name">Document / Manager</field>
</record>
</data>
</openerp>

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