diff options
| author | Rucha Patel <ruchakpatel@gmail.com> | 2008-10-22 10:23:28 +0530 |
|---|---|---|
| committer | Rucha Patel <ruchakpatel@gmail.com> | 2008-10-22 10:23:28 +0530 |
| commit | 018f521cce8aee52411a6aa89d7450f97e06ea8d (patch) | |
| tree | 8caa97f39783286f8abf27a3ba7fd5d3e20ba044 | |
| parent | 70792a1ddd24da503f70063e5973a1c730044ab2 (diff) | |
| parent | 1cfd596d726f277a1c0123d4090985144cc8fe98 (diff) | |
Merge
bzr revid: ruchakpatel@gmail.com-20081022045328-tmfonkuowvzdnsib
298 files changed, 16990 insertions, 7726 deletions
diff --git a/addons/.project b/addons/.project new file mode 100644 index 00000000000..8fc3cc934ff --- /dev/null +++ b/addons/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>pso-newaddons</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.python.pydev.PyDevBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.python.pydev.pythonNature</nature> + </natures> +</projectDescription> diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 01d9f9e499f..e8f25d84ad4 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -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", @@ -67,7 +67,7 @@ "product_view.xml", "account_assert_test.xml", "process/invoice_process.xml", - "process/statement_process.xml" + "process/statement_process.xml", ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/account.py b/addons/account/account.py index 27075fbb648..00d2ec3dcba 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -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): @@ -1032,6 +1032,7 @@ class account_tax_code(osv.osv): _name = 'account.tax.code' _description = 'Tax Code' + _rec_name = 'code' _columns = { 'name': fields.char('Tax Case Name', size=64, required=True), 'code': fields.char('Case Code', size=16), @@ -1681,16 +1682,20 @@ class account_tax_code_template(osv.osv): _name = 'account.tax.code.template' _description = 'Tax Code Template' _order = 'code' + _rec_name = 'code' _columns = { 'name': fields.char('Tax Case Name', size=64, required=True), 'code': fields.char('Case Code', size=16), '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 +1705,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 +1736,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 +1852,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 +1916,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 +1934,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 +1954,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 +2036,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') ] diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index b2007a34fc5..f005cc7aac4 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -127,6 +127,7 @@ <field name="date_due" select="1"/> <field name="residual"/> <field name="state"/> + <field name="origin"/> </tree> </field> </record> @@ -152,7 +153,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', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/> <field name="invoice_line_tax_id" view_mode="2"/> @@ -201,7 +202,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"/> @@ -211,17 +212,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> @@ -283,7 +284,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"/> @@ -293,17 +294,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> diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 9b3726b5c40..a9500a37187 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -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> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 89c19a436d0..8d652e06723 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -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"/> diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index f2573a71f9b..96a2c417739 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -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"/> @@ -86,6 +86,9 @@ <wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General ledger"/> <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/> + <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print journal"/> + <menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard"/> + </data> </openerp> diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index cee3a333e6a..606440020d0 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -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 --> diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po index e275365f645..2a888155ce6 100644 --- a/addons/account/i18n/fr_FR.po +++ b/addons/account/i18n/fr_FR.po @@ -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 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index a8eb3bd7623..d94ff838f45 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -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: @@ -855,24 +857,11 @@ class account_invoice_line(osv.osv): taxep=None lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang'] tax_obj = self.pool.get('account.tax') + part = self.pool.get('res.partner').browse(cr, uid, partner_id) if type in ('out_invoice', 'out_refund'): - taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax - if not taxep or not taxep.id: - tax_id = map(lambda x: x.id, res.taxes_id) - else: - tax_id = [taxep.id] - for t in res.taxes_id: - if not t.tax_group==taxep.tax_group: - tax_id.append(t.id) + tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, res.taxes_id) else: - taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_supplier_tax - if not taxep or not taxep.id: - tax_id = map(lambda x: x.id, res.supplier_taxes_id) - else: - tax_id = [taxep.id] - for t in res.supplier_taxes_id: - if not t.tax_group==taxep.tax_group: - tax_id.append(t.id) + tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, res.supplier_taxes_id) if type in ('in_invoice', 'in_refund'): result = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context) else: @@ -889,6 +878,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 @@ -962,13 +953,9 @@ 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 - if not taxep.id: - return {'value': {'invoice_line_tax_id': map(lambda x: x.id, taxes or []) }} - res = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res.append(t.id) + part = self.pool.get('res.partner').browse(cr, uid, partner_id) + + res = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, taxes) r = {'value':{'invoice_line_tax_id': res}} return r account_invoice_line() @@ -1021,14 +1008,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']) diff --git a/addons/account/partner.py b/addons/account/partner.py index a47aae0d792..bbc79406780 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -31,6 +31,64 @@ 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_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Accounts Mapping'), + 'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Taxes Mapping') + } + def map_tax(self, cr, uid, partner, taxes, context={}): + if (not partner) or (not partner.property_account_position) : + return map(lambda x: x.id, taxes) + result = [] + for t in taxes: + ok = False + for tax in partner.property_account_position.tax_ids: + if tax.tax_src_id.id==t.id: + if tax.tax_dest_id: + result.append(tax.tax_dest_id.id) + ok=True + if not ok: + result.append(t.id) + return result + + 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_tax(osv.osv): + _name = 'account.fiscal.position.tax' + _description = 'Fiscal Position Taxes Mapping' + _rec_name = 'position_id' + _columns = { + 'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'), + 'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True), + 'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax') + } +account_fiscal_position_tax() + + +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 +167,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', - type='many2one', - relation='account.tax', - string="Default Supplier Tax", - 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', + 'property_account_position': fields.property( + 'account.fiscal.position', type='many2one', - relation='account.tax', - string="Default 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 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', diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index d580ff02285..94f5f7fec00 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -1,6 +1,63 @@ <?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="tax_ids" colspan="4"> + <tree string="Taxes Mapping" editable="bottom"> + <field name="tax_src_id" domain="[('parent_id','=',False)]"/> + <field name="tax_dest_id" domain="[('parent_id','=',False)]"/> + </tree> + <form string="Taxes Mapping"> + <field name="tax_src_id" domain="[('parent_id','=',False)]"/> + <field name="tax_dest_id" domain="[('parent_id','=',False)]"/> + </form> + </field> + <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"/> + </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 +74,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"/> diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5fb1c522be1..9d39c9e8be8 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -13,7 +13,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_analytic0" model="process.node"> @@ -23,6 +23,7 @@ <field eval=""""Analytic"""" name="name"/> <field eval=""""From analytic accounts, It creates invoice."""" name="note"/> <field name="process_id" ref="process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_invoiceworkflow0"/> <field eval=""""object.state in ('draft', 'open', 'pending', 'close')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -62,10 +63,11 @@ <record id="process_node_bankstatement0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree2"/> <field name="model_id" ref="account.model_account_bank_statement"/> - <field eval=""""subflow"""" name="kind"/> + <field eval=""""state"""" name="kind"/> <field eval=""""Bank Statement"""" name="name"/> <field eval=""""Statement encoding produces payment entries"""" name="note"/> <field name="process_id" ref="process_process_invoiceworkflow0"/> +<!-- <field name="subflow_id" ref="process_process_statementworkflow0"/>--> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -102,10 +104,18 @@ <field eval=""""object.state=='paid'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- - Process Transition + Process Transition --> + + <record id="res_roles_invoice0" model="res.roles"> + <field eval=""""Invoice"""" name="name"/> + </record> + + <record id="account.t5" model="workflow.transition"> + <field name="role_id" ref="res_roles_invoice0"/> + </record> <record id="process_transition_analyticinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -123,6 +133,7 @@ <field eval=""""Number of entries are generated"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/> <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/> + <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/> </record> <record id="process_transition_validentries0" model="process.transition"> @@ -169,6 +180,17 @@ <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/> <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/> </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_createentries0" model="process.transition.action"> + <field eval=""""action_move_create"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Create entry"""" name="name"/> + <field name="transition_id" ref="process_transition_customerinvoice0"/> + </record> </data> </openerp> diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 57cfe332531..3ee13ace8d5 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -78,15 +78,16 @@ <field eval=""""Reconciliation of Entries"""" name="name"/> <field eval=""""Reconcilation of the entries with invoice."""" name="note"/> <field name="process_id" ref="process_process_statementworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='valid'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- Process Transition --> - - <record id="process_transition_filestatement0" model="process.transition"> + + <record id="process_transition_filestatement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""File statement"""" name="name"/> @@ -130,6 +131,26 @@ <field model="process.node" name="target_node_id" ref="process_node_reconciliationofentries0"/> <field model="process.node" name="source_node_id" ref="process_node_accountingstatemententries0"/> </record> + + <record id="process_transition_statemententries0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Statement Entries"""" name="name"/> + <field eval=""""From statement, create entries"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/> + <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_draftconfirmstatement0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmstatementfromdraft0"/> + </record> </data> </openerp>
\ No newline at end of file diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 1def5a203ab..11975d9a6b8 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -92,10 +92,14 @@ <menuitem action="action_account_analytic_account_tree2" id="account_analytic_def_chart" +<<<<<<< TREE parent="account.account_analytic_def_account"/> <!-- OVERRIDDEN BY NEW WIZARD +======= + parent="account_analytic_def_account"/> +>>>>>>> MERGE-SOURCE <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/> --> diff --git a/addons/account/project/report/analytic_check.rml b/addons/account/project/report/analytic_check.rml index 991d8e38c55..0bbc727e9f6 100644 --- a/addons/account/project/report/analytic_check.rml +++ b/addons/account/project/report/analytic_check.rml @@ -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 --> diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index 80673bba85d..5fc8466c90c 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -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: diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index 105c137d4d2..d7e9f391114 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -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"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Tableau1"> - <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="Tableau2"> + <blockTableStyle id="tbl_header"> <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="Tableau3"> + + <blockTableStyle id="tbl_code_name"> <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="Tableau4"> + + <blockTableStyle id="tbl_content"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/> </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"/> - </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"> + + + <blockTable colWidths="450.0,48.0,48.0" style="tbl_code_name"> <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> + <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> - <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"> + + <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="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> + <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> - <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> + + <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content"> + <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> + <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> - <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"> + </section> + + <blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content"> + <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> + <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> - <para style="P22"> - <font color="white"> </font> - </para> + </story> -</document> - +</document>
\ No newline at end of file diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index 9b62c559a12..f3640e421d6 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -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> - </td> - <td> - <para style="terp_default_9_Italic">[[ move_a['cj'] ]]</para> + <para style="terp_default_8_Italic_Center">[[ move_a['date'] ]]</para> </td> <td> - <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para> + <para style="terp_default_8_Italic">[[ move_a['cj'] ]] / [[ move_a['name'] ]]</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['debit'] ]]</para> </td> <td> - <para style="terp_default_9_italic_Rignt">[[ '%.2f' % move_a['credit'] ]]</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['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>
\ No newline at end of file diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index 63100e50a9d..3453e8f009b 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -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 --> diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml index 755ed501fd3..f87c74f4d69 100644 --- a/addons/account/project/report/quantity_cost_ledger.rml +++ b/addons/account/project/report/quantity_cost_ledger.rml @@ -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> diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index f14ab460225..a3206fbcdf8 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -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: diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index cfabf9d545f..8178d8fa399 100755 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -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']<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> - diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 5110287b2b0..11252b0707a 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -45,12 +45,28 @@ class journal_print(report_sxw.rml_parse): 'sum_credit': self._sum_credit }) - def lines(self, period_id, journal_id, *args): + def lines(self, period_id, journal_id, sort_selection='date', *args): + if type(period_id)==type([]): + ids_final = [] + for journal in journal_id: + for period in period_id: + ids_journal_period = self.pool.get('account.journal.period').search(self.cr,self.uid, [('journal_id','=',journal),('period_id','=',period)]) + if ids_journal_period: + self.cr.execute('update account_journal_period set state=%s where journal_id=%d and period_id=%d and state=%s', ('printed',journal,period,'draft')) + self.cr.commit() + self.cr.execute('select id from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\' order by ('+ sort_selection +'),id', (period, journal)) + ids = map(lambda x: x[0], self.cr.fetchall()) + ids_final.append(ids) + line_ids = [] + for line_id in ids_final: + a = self.pool.get('account.move.line').browse(self.cr, self.uid, line_id ) + line_ids.append(a) + return line_ids self.cr.execute('update account_journal_period set state=%s where journal_id=%d and period_id=%d and state=%s', ('printed',journal_id,period_id,'draft')) self.cr.commit() self.cr.execute('select id from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\' order by date,id', (period_id, journal_id)) ids = map(lambda x: x[0], self.cr.fetchall()) - return self.pool.get('account.move.line').browse(self.cr, self.uid, ids) + return self.pool.get('account.move.line').browse(self.cr, self.uid, ids ) def _sum_debit(self, period_id, journal_id): self.cr.execute('select sum(debit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id)) @@ -59,8 +75,8 @@ 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) +report_sxw.report_sxw('report.account.journal.period.print.wiz', 'account.journal.period', 'addons/account/report/wizard_account_journal.rml', parser=journal_print,header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 0deffbdee64..4831315864a 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -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> - </tr> - <tr> <td> - <para style="Table Contents">[[ company.name ]]</para> + <para style="P10a">Third party</para> </td> <td> - <para style="P3">[[ o.journal_id.code ]] [[ o.journal_id.name ]]</para> - </td> - <td> - <para style="P4">Currency: [[ company.currency_id.name ]]</para> - </td> - </tr> - </blockTable> - <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> + <para style="P10a">Entry label</para> </td> <td> - <para style="P7">Voucher Nb</para> + <para style="P10b">Debit</para> </td> <td> - <para style="P7">Account Number</para> + <para style="P10b">Credit</para> </td> + </tr> + <tr> <td> - <para style="P7">Third party</para> + <para style="P11">[[o.period_id.name ]]</para> </td> <td> - <para style="P7">Entry label</para> - </td> + <para style="P11a">[[ o.journal_id.code ]]</para></td> + <td></td> + <td></td> + <td></td> <td> - <para style="P7">Debit</para> + <para style="P12"><u>[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) or '0.00' ]]</u></para> </td> <td> - <para style="P7">Credit</para> + <para style="P12"><u>[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) or '0.00' ]]</u></para> </td> </tr> - </blockTable> - <blockTable colWidths="49.0,48.0,61.0,98.0,108.0,58.0,60.0" style="Table3"> - <tr> + <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> + <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="P8">[[ line.ref ]]</para> + <para style="terp_default_Centre_8">[[ line.ref ]]</para> </td> <td> - <para style="P8">[[ line.account_id.code ]]</para> + <para style="terp_default_Centre_8">[[ line.account_id.code ]]</para> </td> <td> - <para style="P8">[[ line.partner_id and line.partner_id.name ]]</para> + <para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para> </td> <td> - <para style="P9">[[ line.name ]]</para> + <para style="terp_default_8">[[ line.name ]]</para> </td> <td> - <para style="P10">[[ line.debit and '%.2f' % line.debit or '' ]]</para> + <para style="P8">[[ line.debit and '%.2f' % line.debit or '0.00' ]]</para> </td> <td> - <para style="P10">[[ line.credit and '%.2f' % line.credit or '' ]]</para> + <para style="P8">[[ line.credit and '%.2f' % line.credit or '0.00' ]]</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"> + <para style="Standard"> <font color="white"> </font> </para> + </tr> + </blockTable> </story> -</document> - +</document>
\ No newline at end of file diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py new file mode 100644 index 00000000000..b236c087949 --- /dev/null +++ b/addons/account/report/account_tax_code.py @@ -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) + diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index ade928c8a9d..c33827bf559 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -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"> + <blockTableStyle id="Table_Title_Table"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> </blockTableStyle> - <blockTableStyle id="Table3"> + <blockTableStyle id="Table_Line_Title"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/> </blockTableStyle> - <blockTableStyle id="Table4"> + <blockTableStyle id="Table_Line_Content_Detail"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> - <lineStyle kind="GRID" colorName="black"/> + <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"> - <tr> - <td> - <para style="Table Contents"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="P2">Accounting Entries</para> - </td> - <td> - <para style="P3"> - <font color="white"> </font> - </para> - </td> - </tr> + <!--blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table"> <tr> <td> - <para style="Table Contents">[[ company.name ]]</para> + <para style="terp_header">[[ company.name ]]</para> </td> <td> - <para style="P4"> - <font color="white"> </font> + <para style="terp_header"> + <font face="Times-Roman" size="11.0"/> </para> </td> <td> - <para style="P5">Currency: [[ company.currency_id.name ]]</para> + <para style="terp_header">Accounting Entries-[[ 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"> - <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 (Country)</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,38.0,55.0,118.0,104.0,58.0,60.0" style="Table3"> + <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="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> + <para style="terp_tblheader_Details_Centre">Date</para> </td> <td> - <para style="P8">[[ line.ref ]]</para> + <para style="terp_tblheader_Details">Voucher Nb</para> </td> <td> - <para style="P8">[[ line.account_id.code ]]</para> + <para style="terp_tblheader_Details">Account Number</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> + <para style="terp_tblheader_Details">Third party (Country)</para> </td> <td> - <para style="P9">[[ line.name ]]</para> + <para style="terp_tblheader_Details">Entry label</para> </td> <td> - <para style="P10">[[ '%.2f' % line.debit ]]</para> + <para style="terp_tblheader_Details_Right">Debit</para> </td> <td> - <para style="P10">[[ '%.2f' % line.credit ]]</para> + <para style="terp_tblheader_Details_Right">Credit</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"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="P12"> - <font color="white"> </font> - </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> - <para style="Standard"> + </section> + <para style="terp_default_8"> <font color="white"> </font> </para> </story> diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py index bd04138c8bf..ee7f5555ae9 100755 --- a/addons/account/report/aged_trial_balance.py +++ b/addons/account/report/aged_trial_balance.py @@ -31,13 +31,13 @@ import rml_parse from report import report_sxw class aged_trial_report(rml_parse.rml_parse): - + def __init__(self, cr, uid, name, context): super(aged_trial_report, self).__init__(cr, uid, name, context) self.line_query = '' self.total_account = [] - - + + self.localcontext.update({ 'time': time, 'get_lines': self._get_lines, @@ -46,19 +46,19 @@ class aged_trial_report(rml_parse.rml_parse): 'get_for_period': self._get_for_period, 'get_company': self._get_company, 'get_currency': self._get_currency, - + }) - - + + def _get_lines(self, form): - + if (form['result_selection'] == 'customer' ): self.ACCOUNT_TYPE = "('receivable')" elif (form['result_selection'] == 'supplier'): self.ACCOUNT_TYPE = "('payable')" else: self.ACCOUNT_TYPE = "('payable','receivable')" - + res = [] account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') @@ -78,7 +78,7 @@ class aged_trial_report(rml_parse.rml_parse): for i in range(7): self.total_account.append(0) # - + for partner in partners: values = {} ## If choise selection is in the future @@ -94,7 +94,7 @@ class aged_trial_report(rml_parse.rml_parse): "AND account_account.active", (form['date1'], partner['id'],form['date1'], form['company_id'])) before = self.cr.fetchone() - + self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0) values['direction'] = before and before[0] or 0.0 @@ -112,7 +112,6 @@ class aged_trial_report(rml_parse.rml_parse): after = self.cr.fetchone() self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0) values['direction'] = after and after[0] or "" - #print str(values['direction']) for i in range(5): self.cr.execute("SELECT SUM(debit-credit) " \ "FROM account_move_line AS line, account_account " \ @@ -128,8 +127,6 @@ class aged_trial_report(rml_parse.rml_parse): during = self.cr.fetchone() # Ajout du compteur self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0) - - #print str(during) values[str(i)] = during and during[0] or "" self.cr.execute("SELECT SUM(debit-credit) " \ "FROM account_move_line AS line, account_account " \ @@ -145,19 +142,16 @@ class aged_trial_report(rml_parse.rml_parse): values['total'] = total and total[0] or 0.0 ## Add for total self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0) - print self.total_account,">>>>>>>>>>>>>Total>>>>>>>>>>>>>>>>" values['name'] = partner['name'] #t = 0.0 #for i in range(5)+['direction']: # t+= float(values.get(str(i), 0.0) or 0.0) #values['total'] = t - + if values['total']: - res.append(values) - + total = 0.0 - totals = {} for r in res: total += float(r['total'] or 0.0) @@ -166,24 +160,17 @@ class aged_trial_report(rml_parse.rml_parse): totals[str(i)] += float(r[str(i)] or 0.0) return res - - - def _get_total(self,pos): - print self.total_account,"========_get_total========" period = self.total_account[int(pos)] - return period + return period - def _get_direction(self,pos): - period = self.total_account[int(pos)] - return period + return period def _get_for_period(self,pos): - period = self.total_account[int(pos)] - return period + return period def _get_company(self, form): return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name @@ -194,5 +181,5 @@ class aged_trial_report(rml_parse.rml_parse): report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner', 'addons/account/report/aged_trial_balance.rml',parser=aged_trial_report,header=False) - + diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index c4dab8fc600..7b595a311a7 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -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: diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 359465379d2..ade1659de58 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -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"> + <blockTableStyle id="Table_header_Content"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Sub_Header_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"/> + <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="Table2"> + <blockTableStyle id="Table_Subheader_Content_detail"> <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="Table3"> + <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="Table4"> + <blockTableStyle id="Table_Final_Total"> <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"/> + <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"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="P2">Central Journal</para> + <para style="terp_header">[[ company.name ]]</para> </td> <td> - <para style="P3"> + <para style="terp_header"> <font color="white"> </font> </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> + <para style="terp_header">Central Journal-[[ 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> - </td> - <td> - <para style="P8">Account name</para> + <para style="terp_tblheader_General_Centre">Journal Code</para> </td> <td> - <para style="P8">Currency</para> + <para style="terp_tblheader_General_Centre">Journal Name</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> - </td> - <td> - <para style="P10">[[ line['name'] ]]</para> + <para style="terp_tblheader_General_Centre">[[ o.journal_id.code or '' ]]</para> </td> <td> - <para style="P10"> - <font color="white"> </font> - </para> + <para style="terp_tblheader_General_Centre">[[ o.journal_id.name ]]</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"> + <para style="terp_default_8"> + <font color="white"> </font> + </para> + <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="P12">TOTAL:</para> + <para style="terp_tblheader_Details_Centre">Account Num.</para> + </td> + <td> + <para style="terp_tblheader_Details">Account Name</para> </td> <td> - <para style="P13">[[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]]</para> + <para style="terp_tblheader_Details_Right">Debit</para> </td> <td> - <para style="P13">[[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]]</para> + <para style="terp_tblheader_Details_Right">Credit</para> </td> </tr> - </blockTable> - <para style="Standard"> - <font color="white"> </font> - </para> - <pageBreak/> - <para style="P14"> + + <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> - diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index 9233a98b765..8899977e17a 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -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: diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 8de0f1a82ea..f89c7d201b6 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -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"> + <blockTableStyle id="Table_Header_Title"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Print_Current_datetime"> <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"> + <blockTableStyle id="Table_Journal_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="Table3"> + <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="Table4"> + <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="Table2"> + <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"> - <font color="white"> </font> - </para> + <para style="terp_header">[[ company.name ]]</para> </td> <td> - <para style="P1">General Journal </para> - </td> - <td> - <para style="P2"> + <para style="terp_header"> <font color="white"> </font> </para> </td> - </tr> - <tr> <td> - <para style="Table Contents">[[ company.name ]]</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="P3"> - <font color="white"> </font> - </para> + <para style="terp_default_Bold_9">Printing Date :</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"> + <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="95.0,135.0,61.0,101.0,90.0" repeatRows="1" style="Table5"> + <section> + <blockTable colWidths="61.0,228.0,95.0,80.0,73.0" style="Table_Journal_Title" repeatRows="1"> <tr> <td> - <para style="P6">Journal code</para> + <para style="terp_tblheader_Details">Jrl Code</para> </td> <td> - <para style="P6">Journal name</para> + <para style="terp_tblheader_Details">Journal Name</para> </td> <td> - <para style="P6">Period</para> + <para style="terp_tblheader_Details">Period</para> </td> <td> - <para style="P6">Debit trans.</para> + <para style="terp_tblheader_Details_Right">Debit Trans.</para> </td> <td> - <para style="P6">Credit trans.</para> + <para style="terp_tblheader_Details_Right">Credit Trans.</para> </td> </tr> - </blockTable> - <para style="Standard"> - <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"> + <tr> - <td> - <para style="P11">TOTAL:</para> - </td> - <td> - <para style="P12">[[ '%.2f' % sum_debit() ]]</para> - </td> - <td> - <para style="P12">[[ '%.2f' % sum_credit() ]]</para> - </td> - </tr> - </blockTable> - <para style="Standard"> + <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> - diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 15be15e7be9..20817dff3f3 100755 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -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>
\ No newline at end of file diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py index f090b18c090..a091ec905dd 100755 --- a/addons/account/report/general_ledger_landscape.py +++ b/addons/account/report/general_ledger_landscape.py @@ -35,8 +35,8 @@ import pooler class general_ledger_landscape(rml_parse.rml_parse): _name = 'report.account.general.ledger_landscape' - - + + def preprocess(self, objects, data, ids): ## self.borne_date = self.get_min_date(data['form']) @@ -46,18 +46,18 @@ class general_ledger_landscape(rml_parse.rml_parse): new_ids = ids else: new_ids.append(data['form']['Account_list']) - + objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) - - super(general_ledger_landscape, self).preprocess(objects, data, new_ids) - + + super(general_ledger_landscape, self).preprocess(objects, data, new_ids) + def __init__(self, cr, uid, name, context): super(general_ledger_landscape, self).__init__(cr, uid, name, context) self.query = "" self.child_ids = "" self.tot_currency = 0.0 self.period_sql = "" - self.sold_accounts = {} + self.sold_accounts = {} self.localcontext.update( { 'time': time, 'lines': self.lines, @@ -66,7 +66,7 @@ class general_ledger_landscape(rml_parse.rml_parse): 'sum_solde_account': self._sum_solde_account, 'sum_debit': self._sum_debit, 'sum_credit': self._sum_credit, - 'sum_solde': self._sum_solde, + 'sum_solde': self._sum_solde, 'get_children_accounts': self.get_children_accounts, 'sum_currency_amount_account': self._sum_currency_amount_account }) @@ -75,7 +75,7 @@ class general_ledger_landscape(rml_parse.rml_parse): result = {} #for id in ids: # result.setdefault(id, False) - + for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): # For avoid long text in the field we will limit it to 5 lines # @@ -85,7 +85,7 @@ class general_ledger_landscape(rml_parse.rml_parse): num_id_move = str(account_line.move_id.id) num_id_line = str(account_line.id) account_id = str(account_line.account_id.id) - # search the basic account + # search the basic account # We have the account ID we will search all account move line from now until this time # We are in the case of we are on the top of the account move Line cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ @@ -103,10 +103,8 @@ class general_ledger_landscape(rml_parse.rml_parse): result[account_line.id] = concat + '...' break rup_id+=1 - - #print str(result) return result - + def get_min_date(self,form): ## Get max born from account_fiscal year # @@ -123,9 +121,9 @@ class general_ledger_landscape(rml_parse.rml_parse): periods = form['periods'][0][2] if not periods: sql = """ - Select min(p.date_start) from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + Select min(p.date_start) from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ """ - else: + else: periods_id = ','.join(map(str, periods)) sql = """ Select min(p.date_start) from account_period as p where p.id in ( """ + periods_id + """) @@ -141,30 +139,30 @@ class general_ledger_landscape(rml_parse.rml_parse): } return date_borne - - + + def get_children_accounts(self, account, form): - - + + self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, [('parent_id', 'child_of', self.ids)]) -# +# res = [] ctx = self.context.copy() ## We will make the test for period or date ## We will now make the test # - if form.has_key('fiscalyear'): + if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] ctx['periods'] = form['periods'][0][2] else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] ## - + # self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx) - + for child_id in self.pool.get('account.account').search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])]): child_account = self.pool.get('account.account').browse(self.cr, self.uid, child_id) sold_account = self._sum_solde_account(child_account,form) @@ -175,7 +173,6 @@ class general_ledger_landscape(rml_parse.rml_parse): [('account_id','=',child_account.id)], context=ctx)) <> 0 : res.append(child_account) - #print "Type de vue :" + form['display_account'] elif form['display_account'] == 'bal_solde': if child_account.type != 'view' \ and len(self.pool.get('account.move.line').search(self.cr, self.uid, @@ -183,7 +180,7 @@ class general_ledger_landscape(rml_parse.rml_parse): context=ctx)) <> 0 : if ( sold_account <> 0.0): res.append(child_account) - else: + else: if child_account.type != 'view' \ and len(self.pool.get('account.move.line').search(self.cr, self.uid, [('account_id','=',child_account.id)], @@ -205,17 +202,17 @@ class general_ledger_landscape(rml_parse.rml_parse): sum_credit = 0 else: sum_credit = resultat[0]['sum_credit'] - + move.init_credit = sum_credit move.init_debit = sum_debit - + else: move.init_credit = 0 move.init_debit = 0 - + ## return res - + def lines(self, account, form): inv_types = { 'out_invoice': 'CI: ', @@ -229,9 +226,9 @@ class general_ledger_landscape(rml_parse.rml_parse): else: sorttag = 'j.code' sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name, l.debit, l.credit, l.period_id + SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name, l.debit, l.credit, l.period_id FROM account_move_line l LEFT JOIN res_currency c on (l.currency_id=c.id) JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %d AND %s + AND account_id = %d AND %s ORDER by %s"""%(account.id,self.query,sorttag) self.cr.execute(sql) res = self.cr.dictfetchall() @@ -258,11 +255,11 @@ class general_ledger_landscape(rml_parse.rml_parse): if (l['credit'] > 0): if l['amount_currency'] != None: l['amount_currency'] = abs(l['amount_currency']) * -1 - + # if l['amount_currency'] != None: - self.tot_currency = self.tot_currency + l['amount_currency'] - + self.tot_currency = self.tot_currency + l['amount_currency'] + return res def _sum_debit_account(self, account, form): @@ -291,7 +288,7 @@ class general_ledger_landscape(rml_parse.rml_parse): sum_credit += account.init_credit # ## - + return sum_credit def _sum_solde_account(self, account, form): @@ -301,7 +298,7 @@ class general_ledger_landscape(rml_parse.rml_parse): sum_solde = self.cr.fetchone()[0] or 0.0 if form['soldeinit']: sum_solde += account.init_debit - account.init_credit - + return sum_solde def _sum_debit(self, form): @@ -330,31 +327,24 @@ class general_ledger_landscape(rml_parse.rml_parse): self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) -# print ("SELECT (sum(debit) - sum(credit)) as Test "\ -# "FROM account_move_line l "\ -# "WHERE l.account_id in ("+','.join(map(str, child_ids))+") AND "+query+period_sql) sum_solde = self.cr.fetchone()[0] or 0.0 return sum_solde - + def _set_get_account_currency_code(self, account_id): - print"====account_id=====",account_id self.cr.execute("SELECT c.code as code "\ "FROM res_currency c,account_account as ac "\ "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id)) result = self.cr.fetchone() - print"====result====",result if result: self.account_currency = result[0] else: self.account_currency = False - - + def _sum_currency_amount_account(self, account, form): - self._set_get_account_currency_code(account.id) self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %d "%account.id) total = self.cr.fetchone() - + if self.account_currency: return_field = str(total[0]) + self.account_currency return return_field diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 439dff350bb..16ddfa9a594 100755 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -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>
\ No newline at end of file diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml index f9f213f0d89..aa0d111b28f 100644 --- a/addons/account/report/overdue.rml +++ b/addons/account/report/overdue.rml @@ -14,223 +14,246 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Tableau3"> + <blockTableStyle id="Table1"> <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"/> + <!-- <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="Tableau6"> + <blockTableStyle id="Tableau3"> <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="P17"> + <para style="P4"> <font color="white"> </font> </para> - <para style="P18"> + <para style="P5"> <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 style="P17"><font face="Helvetica">Document</font><font face="Helvetica">:</font> Customer account statement</para> + <para style="P17"> + <font face="Helvetica">Date: </font> + <font face="Helvetica">[[ time.strftime('%d/%m/%Y') ]]</font> </para> - <para style="P15"><font face="Times-Roman">Customer Ref:</font> [[ o.id ]]</para> - <para style="P16"> + <para style="P18"><font face="Helvetica">Customer Ref:</font> [[ o.id ]]</para> + <para style="P19"> <font color="white"> </font> </para> - <para style="P16">Dear Sir/Madam,</para> - <para style="P16"> + <para style="P19">Dear Sir/Madam,</para> + <para style="P19"> <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"> + <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="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"> + <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="P16">Best regards.</para> - <para style="P19"> + <para style="P19">Best regards.</para> + <para style="P6"> <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"> + <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> - <td> - <para style="P5"> - <font face="Times-Roman">[[repeatIn(getLines(o), 'line') ]]</font> - <font face="Times-Roman"> [[ line['date'] ]]</font> - </para> - </td> - <td> - <para style="P6">[[ line['name'] ]]</para> - </td> + <tr> <td> - <para style="P7">[[ line['ref'] ]]</para> + <para style="P8">Sub-Total: </para> </td> + <td></td> + <td></td> + <td></td> <td> - <para style="P7">[[ line['date_maturity'] ]]</para> + <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="P10">[[ line['debit'] and '%.2f' % (line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</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="P8">[[ line['credit'] and '%.2f' % (line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) or '' ]]</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'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]</para> </td> <td> - <para style="P8">[[ (line['date_maturity'] < 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> + <para style="P15"> + <font color="white"> </font> + </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> + <para style="P8">Balance: </para> </td> + <td></td> + <td></td> + <td></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> + <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="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 style="P12"> + <font color="white"> </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'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]]</para> + <para style="P9"> + <font color="white"> </font> + </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="P8a"> + <font face="Helvetica">[[repeatIn(getLines(o), 'line') ]]</font> + <font face="Helvetica"> [[ line['date'] ]]</font> + </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="P10">[[ line['name'] ]]</para> </td> <td> - <para style="P9"> - <font color="white"> </font> - </para> + <para style="P11">[[ line['ref'] ]]</para> </td> <td> - <para style="P11"> - <font color="white"> </font> - </para> + <para style="P11">[[ line['date_maturity'] ]]</para> </td> <td> - <para style="P20"> - <font color="white"> </font> - </para> + <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'] < 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> - diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index e7313354aea..519456527c8 100644 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -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 diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index 5e99323bb09..561eb07f505 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -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> - + <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("%m-%d-%y %H:%M", time.localtime()) ]]</drawString> + <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> + <para style="P12a">[[ setTag('tr','tr',{'style':'Line1'}) ]] Code </para> </td> <td> - <para style="P8">[[ comma_me(sum_debit(data)) ]]</para> + <para style="P12a">Partner name</para> </td> <td> - <para style="P8">[[ comma_me(sum_credit(data)) ]]</para> + <para style="P12b">Débit</para> </td> <td> - <para style="P8">[[ comma_me(sum_sdebit(data)) ]]</para> + <para style="P12b">Crédit</para> </td> <td> - <para style="P8">[[ comma_me(sum_scredit(data)) ]]</para> + <para style="P12b">Balance</para> </td> <td> - <para style="P8">[[ comma_me(sum_litige(data)) ]]</para> + <para style="P12b">In dispute</para> </td> </tr> <tr> <td> - <para style="P7">Balance</para> + <para style="P7">[[ setTag('tr','tr',{'style':'Line2'}) ]] Grand total</para> </td> <td> - <para style="P8"> - <font color="white"> </font> - </para> + <para style="P8"></para> </td> <td> - <para style="P8"> - <font color="white"> </font> - </para> + <para style="P8"><u>[[ sum_debit(data) or '0.0' ]]</u></para> </td> <td> - <para style="P8">[[ comma_me(solde_debit(data)) ]]</para> + <para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para> </td> <td> - <para style="P8">[[ comma_me(solde_credit(data)) ]]</para> + <para style="P8"><u>[[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]]</u></para> </td> <td> - <para style="P8"> - <font color="white"> </font> - </para> + <para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></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> - </td> + <!--<tr> <td> - <para style="P12a">Partner name</para> - </td> - <td> - <para style="P12">Débit</para> - </td> - <td> - <para style="P12">Crédit</para> + <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="P12">Balance</para> + <para style="P8">[[ solde_credit(data) or '0.0' ]]</para> </td> <td> - <para style="P12">In dispute</para> </td> - </tr> + </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="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('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==3 and a['code'] ]] [[ a['name'] ]] </para> + <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">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['debit']) ]]</para> + <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">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['credit']) ]]</para> + <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">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['balance']) ]]</para> + <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">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['enlitige']) ]]</para> + <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>
\ No newline at end of file diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index 445ca968878..6e8cc64f29c 100755 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -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 diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index 50dd5a89dda..3b34e3bb618 100755 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -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'])>3 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]]</u></font> + <font>[[ len(o['level'])<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'])>3 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]]</u></font> + <font>[[ len(o['level'])<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'])>3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</u></font> + <font>[[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]]</font> + </para> + </td> </tr> diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index c8bda2a3045..194e18d1d53 100755 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -59,7 +59,7 @@ class third_party_ledger(rml_parse.rml_parse): for date in date_array: full_str_date.append(str(date)) return full_str_date - + # def transform_period_into_date_array(self,data): ## Get All Period Date @@ -67,18 +67,61 @@ class third_party_ledger(rml_parse.rml_parse): 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 = [] + 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) self.date_lst = date_array self.date_lst.sort() - + def transform_date_into_date_array(self,data): return_array = self.date_range(data['form']['date1'],data['form']['date2']) 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 + 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] + sql = "SELECT max(date) as start_date from account_move_line" + self.cr.execute(sql) + stop_date = self.cr.fetchone()[0] + 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) @@ -97,22 +140,31 @@ class third_party_ledger(rml_parse.rml_parse): for date_string in self.date_lst: string_map = date_string + ',' return string_map - + def preprocess(self, objects, data, ids): PARTNER_REQUEST = '' if (data['model'] == 'res.partner'): - print"data['model']",data['model'] ## Si on imprime depuis les partenaires if ids: PARTNER_REQUEST = "AND line.partner_id IN (" + ','.join(map(str, ids)) + ")" # 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': + self.transform_none_into_date_array(data) + elif data['form']['state'] == 'bydate': + self.transform_date_into_date_array(data) + elif data['form']['state'] == 'byperiod': + self.transform_period_into_date_array(data) + elif data['form']['state'] == '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()] @@ -135,14 +187,14 @@ class third_party_ledger(rml_parse.rml_parse): self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()]) account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') partner_to_use = [] - + if data['form']['soldeinit'] : self.cr.execute( "SELECT DISTINCT line.partner_id " \ "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 + " " \ @@ -165,7 +217,7 @@ class third_party_ledger(rml_parse.rml_parse): for res_line in res: partner_to_use.append(res_line['partner_id']) res = self.cr.dictfetchall() - + for res_line in res: partner_to_use.append(res_line['partner_id']) new_ids = partner_to_use @@ -198,7 +250,7 @@ class third_party_ledger(rml_parse.rml_parse): sum = r['debit'] - r['credit'] r['progress'] = sum full_account.append(r) - + self.cr.execute( "SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \ "FROM account_move_line l " \ @@ -216,11 +268,11 @@ class third_party_ledger(rml_parse.rml_parse): sum = r['debit'] - r['credit'] r['progress'] = sum full_account.append(r) - + return full_account def _sum_debit_partner(self, partner,data): - + account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') result_tmp = 0.0 if data['form']['reconcil'] : @@ -241,7 +293,7 @@ class third_party_ledger(rml_parse.rml_parse): result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 - + self.cr.execute( "SELECT sum(debit) " \ @@ -251,14 +303,14 @@ class third_party_ledger(rml_parse.rml_parse): " " + RECONCILE_TAG + " " \ "AND date IN (" + self.date_lst_string + ") " , (partner.id,)) - - contemp = self.cr.fetchone() + + contemp = self.cr.fetchone() if contemp != None: result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 return result_tmp - + def _sum_credit_partner(self, partner,data): account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') result_tmp = 0.0 @@ -280,7 +332,7 @@ class third_party_ledger(rml_parse.rml_parse): result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 - + self.cr.execute( "SELECT sum(credit) " \ "FROM account_move_line " \ @@ -290,13 +342,13 @@ class third_party_ledger(rml_parse.rml_parse): "AND date IN (" + self.date_lst_string + ") " , (partner.id,)) - contemp = self.cr.fetchone() + contemp = self.cr.fetchone() if contemp != None: result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 return result_tmp - + def _sum_debit(self,data): if not self.ids: return 0.0 @@ -327,18 +379,18 @@ class third_party_ledger(rml_parse.rml_parse): "WHERE partner_id IN (" + self.partner_ids + ") " \ # "AND account_id IN (" + self.account_ids + ") " \ " " + RECONCILE_TAG + " " \ - "AND date IN (" + self.date_lst_string + ") " + "AND date IN (" + self.date_lst_string + ") " ) - contemp = self.cr.fetchone() + contemp = self.cr.fetchone() if contemp != None: result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 - + return result_tmp - - + + def _sum_credit(self,data): if not self.ids: return 0.0 @@ -368,14 +420,14 @@ class third_party_ledger(rml_parse.rml_parse): "WHERE partner_id IN (" + self.partner_ids + ") " \ # "AND account_id IN (" + self.account_ids + ") " \ " " + RECONCILE_TAG + " " \ - "AND date IN (" + self.date_lst_string + ") " + "AND date IN (" + self.date_lst_string + ") " ) - contemp = self.cr.fetchone() + contemp = self.cr.fetchone() if contemp != None: result_tmp = contemp[0] or 0.0 else: result_tmp = result_tmp + 0.0 - + return result_tmp def _get_company(self, form): @@ -383,7 +435,7 @@ class third_party_ledger(rml_parse.rml_parse): def _get_currency(self, form): return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name - + report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner', 'addons/account/report/third_party_ledger.rml',parser=third_party_ledger, header=False) diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index 0bddb226e95..d19a3395544 100755 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -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>
\ No newline at end of file diff --git a/addons/account/report/wizard_account_journal.rml b/addons/account/report/wizard_account_journal.rml new file mode 100644 index 00000000000..def6acbecb8 --- /dev/null +++ b/addons/account/report/wizard_account_journal.rml @@ -0,0 +1,191 @@ +<?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="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> + <blockTableStyle id="Standard_Outline"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table1"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <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="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> + <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" 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" 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="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"/> + <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="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="65.0,62.0,58.0,62.0,174.0,57.0,61.0" style="Table1" repeatRows="1"> + <para style="terp_default_8">[[repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2],data['form']['sort_selection']), 'line') ]]</para> + <tr> + <td> + <para style="P10a">Date</para> + </td> + <td> + <para style="P10">Voucher No</para> + </td> + <td> + <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> + <td> + <para style="P11">[[line[0].period_id.name ]]</para> + </td> + <td> + <para style="P11a">[[line[0].journal_id.code ]]</para></td> + <td></td> + <td></td> + <td></td> + <td> + <para style="P12"><u>[[ '%.2f' % sum_debit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]</u></para> + </td> + <td> + <para style="P12"><u>[[ '%.2f' % sum_credit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]</u></para> + </td> + </tr > + <tr> + <para style="terp_default_8">[[repeatIn(line,'l')]]</para> + <td> + <para style="terp_default_8">[[ l.date ]]</para> + </td> + <td> + <para style="terp_default_Centre_8">[[ l.ref ]]</para> + </td> + <td> + <para style="terp_default_Centre_8">[[ l.account_id.code ]]</para> + </td> + <td> + <para style="terp_default_8">[[ l.partner_id and l.partner_id.name ]]</para> + </td> + <td> + <para style="terp_default_8">[[ l.name ]]</para> + </td> + <td> + <para style="P8">[[ l.debit and '%.2f' % l.debit or '0.00' ]]</para> + </td> + <td> + <para style="P8">[[ l.credit and '%.2f' % l.credit or '0.00' ]]</para> + </td> + <para style="Standard"> + <font color="white"> </font> + </para> + </tr> + </blockTable> + </story> +</document>
\ No newline at end of file diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 3860447ff9d..7f441b1b551 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -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> diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 67bbe0f197e..9dbdcb18b55 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -4,15 +4,18 @@ "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_user","account.account user","model_account_account","base.group_user",1,0,0,0 +"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",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 +27,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,14 +51,31 @@ "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_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 +"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1 "access_account_analytic_account_manager","account.analytic.account","model_account_analytic_account","account.group_account_manager",1,1,1,1 "access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1 "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.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0 +"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1 +"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0 +"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","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0 diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py index 6ecd2040756..3cae8e78a95 100644 --- a/addons/account/wizard/__init__.py +++ b/addons/account/wizard/__init__.py @@ -64,6 +64,7 @@ import wizard_use_model import wizard_state_open import wizard_statement_from_invoice +import wizard_print_journal # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py index 431e183f156..3677f51f050 100644 --- a/addons/account/wizard/wizard_account_balance_report.py +++ b/addons/account/wizard/wizard_account_balance_report.py @@ -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')]} } diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py index ce95c2c8ab1..7e8bcc6048c 100755 --- a/addons/account/wizard/wizard_aged_trial_balance.py +++ b/addons/account/wizard/wizard_aged_trial_balance.py @@ -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') diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py index 08af6074215..5b28e10ceb9 100644 --- a/addons/account/wizard/wizard_partner_balance_report.py +++ b/addons/account/wizard/wizard_partner_balance_report.py @@ -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"/> +<form string="Select period" colspan="4"> + <field name="company_id"/> + <field name="result_selection"/> <newline/> - <field name="fiscalyear" colspan="4"/> - <field name="periods" colspan="4"/> + <field name="fiscalyear"/> + <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/> <newline/> - <field name="result_selection"/> - <field name="soldeinit"/> + <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): - 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 - data['form']['soldeinit'] = True - data['form']['result_selection'] = 'all' - return data['form'] - def _get_defaults_fordate(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 + company_id = user.company_id.id else: - company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] + 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) + 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 _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'} } } diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py new file mode 100644 index 00000000000..d9440a8a231 --- /dev/null +++ b/addons/account/wizard/wizard_print_journal.py @@ -0,0 +1,71 @@ +# -*- 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 wizard +import pooler + +form = '''<?xml version="1.0"?> +<form string="Print Journal"> + <field name="journal_id"/> + <field name="period_id"/> + <field name="sort_selection"/> +</form>''' + +fields = { + 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True}, + 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True}, + 'sort_selection':{ + 'string':"Entries Sorted By", + 'type':'selection', + 'selection':[('date','By date'),('ref','Reference Number')], + 'required':True, + 'default': lambda *a: 'date', + }, + +} + +def print_journal(self, cr, uid, data, context): + return {} + +class wizard_print_journal(wizard.interface): + states = { + 'init': { + 'actions': [], + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))}, + }, + 'print': { + 'actions': [print_journal], + 'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'}, + }, + } +wizard_print_journal('account.print.journal.report') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index e9f2daf4b01..298cf910275 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -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'} } } diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv index fe56cde8939..f7f141ac15a 100644 --- a/addons/account_analytic_plans/security/ir.model.access.csv +++ b/addons/account_analytic_plans/security/ir.model.access.csv @@ -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 diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po index c192840f293..f1c7b9cf177 100644 --- a/addons/account_budget/i18n/fr_FR.po +++ b/addons/account_budget/i18n/fr_FR.po @@ -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: " - -#. module: account_budget -#: view:account.budget.post:0 -msgid "Dotations" -msgstr "Dotations" - -#. module: account_budget +"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_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 "" - -#. module: account_budget -#: view:account.budget.post:0 -msgid "Master Budget" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Période" +msgstr "Réf. du Compte Analytique" -#. module: account_budget -#: selection:crossovered.budget,state:0 -msgid "Cancelled" -msgstr "" +#. module: account_budget_crossover +#: rml:account.analytic.account.budget:0 +#: rml:crossovered.budget.report:0 +msgid "Currency:" +msgstr "Devise" -#. 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 "" - -#. module: account_budget -#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread -msgid "Spread amount" -msgstr "Ventiler le montant" +msgstr "Brouillon" + +#. module: account_budget_crossover +#: rml:account.analytic.account.budget:0 +#: rml:crossovered.budget.report:0 +msgid "at" +msgstr "à" + +#. 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 +#. 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 "" +msgstr "Pourcentage" -#. module: account_budget -#: field:crossovered.budget,state:0 -msgid "Status" -msgstr "" +#. module: account_budget_crossover +#: selection:crossovered.budget,state:0 +msgid "Validated" +msgstr "Validé" -#. 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_crossover +#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines +msgid "Crossovered Budget Lines" +msgstr "" -#. 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_crossover +#: field:crossovered.budget,name:0 +msgid "Name" +msgstr "Nom" -#. module: account_budget +#. module: account_budget_crossover +#: field:crossovered.budget,state:0 +msgid "Status" +msgstr "État" + +#. 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 "" +msgstr "Réf. du Budget" -#. module: account_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 "" +msgstr "Montant Plannifié" -#. 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 +#. module: account_budget_crossover +#: model:ir.ui.menu,name:account_budget_crossover.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" +msgstr "Écritures" -#. module: account_budget +#. module: account_budget_crossover #: view:crossovered.budget:0 msgid "Validate" -msgstr "" +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 "" +msgstr "Sélectionnez les Options" -#. 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 +#. 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 "" +msgstr "Montant en Pratique" -#. module: account_budget +#. module: account_budget_crossover #: field:crossovered.budget,date_to:0 #: field:crossovered.budget.lines,date_to:0 msgid "End Date" -msgstr "" +msgstr "Date de fin" -#. module: account_budget +#. module: account_budget_crossover #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" -#. module: account_budget +#. module: account_budget_crossover #: field:crossovered.budget.lines,theoritical_amount:0 msgid "Theoritical Amount" -msgstr "" +msgstr "Montant Théorique" -#. module: account_budget -#: field:account.budget.post.dotation,name:0 -#: field:account.budget.post,name:0 -#: 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 +#: rml:account.analytic.account.budget:0 +#: rml:crossovered.budget.report:0 +msgid "Total:" +msgstr "Total:" -#. module: account_budget +#. module: account_budget_crossover #: selection:crossovered.budget,state:0 -#: view:crossovered.budget:0 -msgid "Done" -msgstr "" +msgid "Cancelled" +msgstr "Annulé" -#. module: account_budget +#. 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 "" - -#. module: account_budget -#: wizard_field:account.budget.spread,init,fiscalyear:0 -msgid "Fiscal Year" -msgstr "Exercice comptable" +msgstr "Sélectionnez la Période de Date" -#. 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 -#: wizard_field:account.budget.spread,init,amount:0 -#: field:account.budget.post.dotation,amount:0 -msgid "Amount" -msgstr "Montant" - -#. 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 +#: rml:crossovered.budget.report:0 +msgid "Budget :" +msgstr "Budget :" + +#. module: account_budget_crossover +#: selection:crossovered.budget,state:0 +#: view:crossovered.budget:0 +msgid "Done" +msgstr "Terminé" + +#. 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" diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py index a1b6713ca83..392df34f11a 100644 --- a/addons/account_followup/__terp__.py +++ b/addons/account_followup/__terp__.py @@ -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 diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml index 8739a94372a..81298dbf24d 100644 --- a/addons/account_followup/followup_view.xml +++ b/addons/account_followup/followup_view.xml @@ -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> diff --git a/addons/account_followup/i18n/fr_FR.po b/addons/account_followup/i18n/fr_FR.po index a7794a7331f..c049727c42f 100644 --- a/addons/account_followup/i18n/fr_FR.po +++ b/addons/account_followup/i18n/fr_FR.po @@ -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 diff --git a/addons/account_followup/wizard/wizard_view.xml b/addons/account_followup/wizard/wizard_view.xml new file mode 100644 index 00000000000..643265ddca2 --- /dev/null +++ b/addons/account_followup/wizard/wizard_view.xml @@ -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> + diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv index d5d97f5cbdc..09ee2170239 100644 --- a/addons/account_payment/security/ir.model.access.csv +++ b/addons/account_payment/security/ir.model.access.csv @@ -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 diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml index 082c15f139f..b105fae4cf4 100755 --- a/addons/account_report/account_report.xml +++ b/addons/account_report/account_report.xml @@ -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> diff --git a/addons/account_report/report/__init__.py b/addons/account_report/report/__init__.py index 3592ada3b0a..03cbac9c6d7 100644 --- a/addons/account_report/report/__init__.py +++ b/addons/account_report/report/__init__.py @@ -29,6 +29,7 @@ ############################################################################## import accounting_report +import print_indicator # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py new file mode 100644 index 00000000000..203f249178b --- /dev/null +++ b/addons/account_report/report/print_indicator.py @@ -0,0 +1,265 @@ + +# -*- 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 + path=tools.config['addons_path']+"/account_report/tmp_images/image" + + dirname =tools.config['addons_path']+'/account_report/tmp_images/' + if not os.path.isdir(dirname): + os.mkdir(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: + diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml new file mode 100644 index 00000000000..7e66c37452c --- /dev/null +++ b/addons/account_report/report/print_indicator.rml @@ -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> + + diff --git a/addons/account_report/security/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv index e74efd16f3b..ace4bc06db0 100644 --- a/addons/account_report/security/ir.model.access.csv +++ b/addons/account_report/security/ir.model.access.csv @@ -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 diff --git a/addons/account_report/wizard/wizard_print_indicators.py b/addons/account_report/wizard/wizard_print_indicators.py index 373b86fd914..b781073ddf4 100644 --- a/addons/account_report/wizard/wizard_print_indicators.py +++ b/addons/account_report/wizard/wizard_print_indicators.py @@ -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') diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po index 3dcb5980d8b..003361b5d18 100644 --- a/addons/account_tax_include/i18n/fr_FR.po +++ b/addons/account_tax_include/i18n/fr_FR.po @@ -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" diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__terp__.py index 5ee1e35b8a8..b7293fd4c77 100644 --- a/addons/analytic_journal_billing_rate/__terp__.py +++ b/addons/analytic_journal_billing_rate/__terp__.py @@ -17,6 +17,7 @@ "demo_xml" : [], "update_xml" : [ "analytic_journal_billing_rate_view.xml", + "security/ir.model.access.csv", ], "active": False, "installable": True diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv new file mode 100644 index 00000000000..cf13af205ba --- /dev/null +++ b/addons/analytic_journal_billing_rate/security/ir.model.access.csv @@ -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 diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py index 6208cd43226..1a71adee8d6 100644 --- a/addons/analytic_user_function/__terp__.py +++ b/addons/analytic_user_function/__terp__.py @@ -17,6 +17,7 @@ "demo_xml" : [], "update_xml" : [ "analytic_user_function_view.xml", + "security/ir.model.access.csv", ], "active": False, "installable": True diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv new file mode 100644 index 00000000000..b2fb45404e8 --- /dev/null +++ b/addons/analytic_user_function/security/ir.model.access.csv @@ -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 diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml index cb810f113d1..219cea03776 100644 --- a/addons/association_vertical/aso_vertical_view.xml +++ b/addons/association_vertical/aso_vertical_view.xml @@ -6,15 +6,15 @@ <field eval=""terp-calendar"" 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=""Fund Raising"" name="name"/> <field eval=""terp-account"" 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">"My Open Projects"</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=""ir.ui.menu"" name="resource"/> @@ -48,7 +48,7 @@ <field eval=""Products"" 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=""ir.ui.menu"" name="resource"/> diff --git a/addons/association_vertical/i18n/fr_FR.po b/addons/association_vertical/i18n/fr_FR.po index 007476ec9bd..8f8dcff1847 100644 --- a/addons/association_vertical/i18n/fr_FR.po +++ b/addons/association_vertical/i18n/fr_FR.po @@ -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" diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py index 867e965a700..8aa4b40ebb6 100644 --- a/addons/auction/__terp__.py +++ b/addons/auction/__terp__.py @@ -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" diff --git a/addons/auction/i18n/fr_FR.po b/addons/auction/i18n/fr_FR.po index baba2575ee0..5c4dbb35cbb 100644 --- a/addons/auction/i18n/fr_FR.po +++ b/addons/auction/i18n/fr_FR.po @@ -4,31 +4,33 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 4.3.99\n" +"Project-Id-Version: OpenERP Server 4.3.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2008-10-10 07:40:32+0000\n" -"PO-Revision-Date: 2008-10-10 07:40:32+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2008-09-05 16:25+0000\n" +"PO-Revision-Date: 2008-10-14 15:04+0000\n" +"Last-Translator: Olivier Laurent <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2008-10-14 15:32+0000\n" +"X-Generator: Launchpad (build Unknown)\n" +"Version: 1.0\n" #. module: auction #: field:report.deposit.border,total_marge:0 msgid "Total margin" -msgstr " Marge totale" +msgstr "Marge totale" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "SMS - Gateway: clickatell" -msgstr "" +msgstr "Passerelle SMS: clickatell" #. module: auction #: view:auction.lots:0 msgid "Set to draft" -msgstr "" +msgstr "Mettre en brouillon" #. module: auction #: xsl:report.auction.seller.list:0 @@ -38,22 +40,27 @@ msgstr "" #: field:report.seller.auction,seller:0 #: view:auction.lots:0 msgid "Seller" -msgstr " Vendeur" +msgstr "Vendeur" #. module: auction #: wizard_field:auction.lots.sms_send,init,text:0 msgid "SMS Message" -msgstr "" +msgstr "Message SMS" + +#. module: auction +#: wizard_view:auction.taken,init:0 +msgid "Selectionner les lots qui sont livres" +msgstr "Selectionner les lots qui sont livres" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my msgid "My Encoded Objects Per Day" -msgstr " Mes objets encodés par jour" +msgstr "Mes objets encodés par jour" #. module: auction #: model:ir.model,name:auction.model_auction_lot_history msgid "Lot history" -msgstr "" +msgstr "Historique du Lot" #. module: auction #: model:ir.model,name:auction.model_report_buyer_auction @@ -64,12 +71,12 @@ msgstr "" #. module: auction #: field:report.buyer.auction2,net_revenue:0 msgid "Net Revenue" -msgstr " Revenu net" +msgstr "Revenu net" #. module: auction #: model:ir.ui.menu,name:auction.menu_action_bids_form msgid "Bids line" -msgstr " Ligne de l'ordre d'achat" +msgstr "Ligne de l'ordre d'achat" #. module: auction #: xsl:report.auction.deposit:0 @@ -86,21 +93,20 @@ msgstr "" #: field:auction.lots,ach_uid:0 #: field:report.buyer.auction2,buyer:0 #: field:report.buyer.auction,buyer:0 -#: model:ir.ui.menu,name:auction.auction_report_buyer_menu #: view:auction.lots:0 msgid "Buyer" -msgstr " Acheteur" +msgstr "Acheteur" #. module: auction #: field:report.auction.view,nobjects:0 #: field:report.buyer.auction,object:0 msgid "No of objects" -msgstr " Nb d'objets" +msgstr "Nb d'objets" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree msgid "Adjudication by Auction" -msgstr " Adjudication par vente" +msgstr "Adjudication par vente" #. module: auction #: rml:auction.total.rml:0 @@ -110,38 +116,38 @@ msgstr "" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot msgid "Numerotation (per lot)" -msgstr "" +msgstr "Numérotation (par lot)" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Books, manuscripts, eso." -msgstr "" +msgstr "Antiquités/Ouvrages, Manuscrits, etc, ..." #. module: auction #: field:auction.deposit.cost,account:0 msgid "Destination Account" -msgstr " Compte de destination" +msgstr "Compte de destination" #. module: auction #: wizard_field:auction.lots.make_invoice,init,amount:0 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0 msgid "Invoiced Amount" -msgstr "" +msgstr "Montant facturé" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Tin / Copper wares" -msgstr "" +msgstr "Antiquités/Étain / Cuivres" #. module: auction #: field:auction.lots,paid_ach:0 msgid "Buyer invoice reconciled" -msgstr " Facture de l'acheteur réconciliée" +msgstr "Facture de l'acheteur réconciliée" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken msgid "Mark as taken away" -msgstr " Marquer comme emporté" +msgstr "Marquer comme emporté" #. module: auction #: xsl:report.auction.seller.list:0 @@ -151,18 +157,18 @@ msgstr "" #. module: auction #: field:auction.deposit.cost,amount:0 msgid "Amount" -msgstr " Montant" +msgstr "Montant" #. module: auction #: model:ir.actions.act_window,name:auction.action_deposit_border #: model:ir.ui.menu,name:auction.menu_auction_deposit_border msgid "Deposit border" -msgstr " Bordereau de dépôt" +msgstr "Bordereau de dépôt" #. module: auction #: xsl:report.auction.deposit:0 msgid "VAT" -msgstr "" +msgstr "TVA" #. module: auction #: view:auction.lots:0 @@ -172,12 +178,12 @@ msgstr "" #. module: auction #: xsl:flagey.huissier:0 msgid "Adjudication" -msgstr "" +msgstr "Adjudication" #. module: auction #: field:auction.dates,account_analytic_id:0 msgid "Analytic Account" -msgstr " Compte analytique" +msgstr "Compte analytique" #. module: auction #: rml:auction.code_bar_lot:0 @@ -187,49 +193,54 @@ msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction msgid "Objects by Auction" -msgstr " Objets par vente" +msgstr "Objets par vente" #. module: auction #: field:auction.lots,lot_num:0 #: field:report.unclassified.objects,lot_num:0 msgid "List Number" -msgstr " N° de liste" +msgstr "N° de liste" #. module: auction #: field:auction.deposit.cost,name:0 msgid "Cost Name" -msgstr " Nom du coût" +msgstr "Nom du coût" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antiques" -msgstr "" +msgstr "Antiquités" #. module: auction #: view:auction.dates:0 msgid "State" -msgstr "" +msgstr "État" #. module: auction #: field:report.auction.estimation.adj.category,lot_type:0 msgid "Object Type" -msgstr " Type de l'objet" +msgstr "Type de l'objet" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Contemporary Art" -msgstr "" +msgstr "Art Contemporain" #. module: auction #: view:auction.lots:0 #: view:report.unclassified.objects:0 msgid "Ref" -msgstr "" +msgstr "Réf" #. module: auction #: field:report.auction.view,nseller:0 msgid "No of sellers" -msgstr " Nb de vendeurs" +msgstr "Nb de vendeurs" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1 +msgid "Seller's summary" +msgstr "Résumé du Vendeur" #. module: auction #: constraint:hr.attendance:0 @@ -245,7 +256,7 @@ msgstr "" #. module: auction #: field:report.auction.view2,obj_margin_procent:0 msgid "Net margin (%)" -msgstr " Marge nette (%)" +msgstr "Marge nette (%)" #. module: auction #: selection:auction.lots,state:0 @@ -253,27 +264,29 @@ msgstr " Marge nette (%)" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Unsold" -msgstr "" +msgstr "Non Vendu" #. module: auction #: view:auction.dates:0 msgid "Dates" -msgstr "" +msgstr "Dates" #. module: auction #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" -msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure" +msgstr "" +"Erreur: l'unité de vente doit appartenir à une catégorie différente que " +"l'unité de mesure" #. module: auction #: rml:auction.total.rml:0 msgid "Items" -msgstr "" +msgstr "Articles" #. module: auction #: field:auction.dates,seller_costs:0 msgid "Seller Costs" -msgstr " Coûts des vendeurs" +msgstr "Coûts des vendeurs" #. module: auction #: model:ir.actions.report.xml,name:auction.bid_auction @@ -283,22 +296,22 @@ msgstr " Coûts des vendeurs" #: view:auction.bid:0 #: view:auction.bid_line:0 msgid "Bids" -msgstr " Ordre d'achat" +msgstr "Ordre d'achat" #. module: auction -#: model:ir.ui.menu,name:auction.auction_all_objects_menu +#: model:ir.ui.menu,name:auction.menu_auction_all_objects msgid "All objects" -msgstr " Tous les objets" +msgstr "Tous les objets" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2 msgid "Buyer's auction for all months" -msgstr " Ventes/Vendeurs de l'année en cours" +msgstr "Ventes/Vendeurs de l'année en cours" #. module: auction #: field:auction.bid,contact_tel:0 msgid "Contact" -msgstr "" +msgstr "Contact" #. module: auction #: field:report.auction.view,obj_ret:0 @@ -315,27 +328,27 @@ msgstr "" #. module: auction #: field:auction.lots,sel_inv_id:0 msgid "Seller Invoice" -msgstr " Facture du vendeur" +msgstr "Facture du vendeur" #. module: auction #: view:auction.dates:0 msgid "Commissions" -msgstr "" +msgstr "Commissions" #. module: auction #: wizard_button:auction.lots.numerotate,search,init:0 msgid "Back" -msgstr "" +msgstr "Précédent" #. module: auction #: model:ir.actions.act_window,name:auction.action_all_objects_unsold msgid "Unsold objects" -msgstr " Objets non vendus" +msgstr "Objets non vendus" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_sold1 msgid "Sold Objects" -msgstr " Objets vendus" +msgstr "Objets vendus" #. module: auction #: view:report.buyer.auction2:0 @@ -349,14 +362,9 @@ msgid "Deposit Border Form" msgstr "" #. module: auction -#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2 -msgid "Auction's Revenues" -msgstr "" - -#. module: auction #: wizard_field:auction.lots.send.aie,date_ask,lang:0 msgid "Langage" -msgstr "" +msgstr "Langage" #. module: auction #: model:ir.model,name:auction.model_auction_lots @@ -364,17 +372,17 @@ msgstr "" #: field:auction.lot.history,lot_id:0 #: view:auction.lots:0 msgid "Object" -msgstr " Objet" +msgstr "Objet" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_map_user msgid "Map buyer username to Partners" -msgstr " Associer un acheteur à un partenaire " +msgstr "Associer un acheteur à un partenaire" #. module: auction #: wizard_field:auction.lots.numerotate,search,lot_num:0 msgid "Inventory Number" -msgstr "" +msgstr "Numéro d'Inventaire" #. module: auction #: wizard_button:auction.lots.buyer_map,check,end:0 @@ -382,13 +390,13 @@ msgstr "" #: wizard_button:auction.lots.numerotate,search,end:0 #: wizard_button:auction.lots.numerotate,not_exist,end:0 msgid "Exit" -msgstr "" +msgstr "Quitter" #. module: auction #: field:report.auction.object.date,obj_num:0 #: field:report.auction.view2,obj_number:0 msgid "# of Objects" -msgstr " # d'objets" +msgstr "# d'objets" #. module: auction #: view:report.buyer.auction:0 @@ -403,17 +411,17 @@ msgstr "" #: field:report.seller.auction,state:0 #: field:report.unclassified.objects,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_sms msgid "SMS Send" -msgstr " Envoi SMS" +msgstr "Envoi SMS" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Cartoons" -msgstr "" +msgstr "Antiquités/Bandes Dessinées" #. module: auction #: selection:auction.lots,state:0 @@ -421,37 +429,32 @@ msgstr "" #: selection:report.unclassified.objects,state:0 #: view:auction.lots:0 msgid "Sold" -msgstr "" +msgstr "Vendu" #. module: auction #: field:auction.bid_line,name:0 msgid "Bid date" -msgstr " Date de l'ordre d'achat" +msgstr "Date de l'ordre d'achat" #. module: auction #: field:auction.dates,acc_expense:0 msgid "Expense Account" -msgstr " Comptes des dépenses" - -#. module: auction -#: model:ir.ui.menu,name:auction.menu_wizard_emporte -msgid "Deliveries Management" -msgstr "" +msgstr "Comptes des dépenses" #. module: auction #: field:auction.lots,obj_desc:0 msgid "Object Description" -msgstr " Description de l'objet" +msgstr "Description de l'objet" #. module: auction #: selection:auction.deposit,method:0 msgid "Contact the Seller" -msgstr "" +msgstr "Contacter le Vendeur" #. module: auction #: view:auction.lots:0 msgid "Auction Objects" -msgstr " " +msgstr "Objets aux enchères" #. module: auction #: field:auction.lots,gross_revenue:0 @@ -460,7 +463,7 @@ msgstr " " #: field:report.object.encoded.manager,gross_revenue:0 #: field:report.seller.auction2,gross_revenue:0 msgid "Gross revenue" -msgstr " Revenu brut" +msgstr "Revenu brut" #. module: auction #: view:report.seller.auction2:0 @@ -470,7 +473,7 @@ msgstr "" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_pay msgid "Pay objects of the buyer" -msgstr " Payer les objets de l'acheteur" +msgstr "Payer les objets de l'acheteur" #. module: auction #: view:report.deposit.border:0 @@ -480,17 +483,17 @@ msgstr "" #. module: auction #: view:auction.lots:0 msgid "Buyer information" -msgstr " " +msgstr "Information sur l'Acheteur" #. module: auction #: wizard_button:auction.lots.sms_send,init,send:0 msgid "Send SMS" -msgstr "" +msgstr "Envoyer un SMS" #. module: auction #: field:auction.lots,name2:0 msgid "Short Description (2)" -msgstr " Courte description (2)" +msgstr "Courte description (2)" #. module: auction #: model:ir.model,name:auction.model_auction_dates @@ -499,31 +502,25 @@ msgstr "" #. module: auction #: rml:auction.total.rml:0 -#: model:ir.ui.menu,name:auction.auction_buyers_menu msgid "Buyers" -msgstr " Acheteurs" +msgstr "Acheteurs" #. module: auction #: wizard_field:auction.pay.buy,init,amount3:0 #: wizard_field:auction.pay.buy,init,amount2:0 #: wizard_field:auction.pay.buy,init,amount:0 msgid "Amount paid" -msgstr "" +msgstr "Montant payé" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree msgid "My Latest Deposits" -msgstr " Mes derniers Dépôts" - -#. module: auction -#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 -msgid "Buyer's Revenues" -msgstr "" +msgstr "Mes derniers Dépôts" #. module: auction #: field:auction.bid_line,price:0 msgid "Maximum Price" -msgstr " Prix maximum" +msgstr "Prix maximum" #. module: auction #: view:report.buyer.auction2:0 @@ -533,27 +530,22 @@ msgstr "" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "Bulk SMS send" -msgstr "" - -#. module: auction -#: wizard_view:auction.taken,init:0 -msgid "Select lots which are Sold" -msgstr "" +msgstr "Envoi de SMS Par Lots" #. module: auction #: field:auction.lots,statement_id:0 msgid "Payment" -msgstr " Paiement" +msgstr "Paiement" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Old weapons and militaria" -msgstr "" +msgstr "Antiquités/Armes anciennes et militaria" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts/Chineese furnitures" -msgstr "" +msgstr "Antiquités/Art Oriental/Meubles Chinois" #. module: auction #: selection:auction.deposit,method:0 @@ -565,13 +557,13 @@ msgstr "" #: wizard_button:auction.lots.send.aie.results,init,date_ask:0 #: wizard_button:auction.lots.send.aie,init,date_ask:0 msgid "Continue" -msgstr "" +msgstr "Continuer" #. module: auction #: field:report.object.encoded.manager,obj_num:0 #: field:report.object.encoded,obj_num:0 msgid "# of Encoded obj." -msgstr "" +msgstr "# d'Objets Encodés" #. module: auction #: xsl:report.auction.vnd_bordereau:0 @@ -581,12 +573,12 @@ msgstr "" #. module: auction #: field:auction.lots,paid_vnd:0 msgid "Seller Paid" -msgstr " Payé pour le vendeur" +msgstr "Payé pour le vendeur" #. module: auction #: rml:auction.total.rml:0 msgid "# of sellers:" -msgstr "" +msgstr "# de vendeurs" #. module: auction #: field:report.buyer.auction2,date:0 @@ -603,14 +595,9 @@ msgid "# of items taken away:" msgstr "" #. module: auction -#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 -msgid "Auction's Summary" -msgstr "" - -#. module: auction #: rml:buyer.list:0 msgid "%)" -msgstr "" +msgstr "%)" #. module: auction #: wizard_view:auction.lots.able,init:0 @@ -624,7 +611,7 @@ msgstr "" #: wizard_field:auction.lots.send.aie,date_ask,objects:0 #: field:report.deposit.border,nb_obj:0 msgid "# of objects" -msgstr "" +msgstr "# d'objets" #. module: auction #: wizard_field:auction.lots.numerotate,search,lot_est2:0 @@ -633,12 +620,12 @@ msgstr "" #: field:report.auction.view,max_est:0 #: field:report.unclassified.objects,lot_est2:0 msgid "Maximum Estimation" -msgstr " " +msgstr "Estimation Maximum" #. module: auction #: field:auction.lots,buyer_price:0 msgid "Buyer price" -msgstr " Prix de l'acheteur" +msgstr "Prix de l'acheteur" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel @@ -651,11 +638,6 @@ msgid "Antique/Collectible & art objects" msgstr "" #. module: auction -#: field:auction.lots,is_ok:0 -msgid "Buyer's payment" -msgstr "" - -#. module: auction #: model:ir.model,name:auction.model_report_deposit_border msgid "Report deposit border" msgstr "" @@ -668,33 +650,33 @@ msgstr "" #. module: auction #: field:auction.lot.history,price:0 msgid "Withdrawn price" -msgstr " Prix de retrait" +msgstr "Prix de retrait" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Verreries" -msgstr "" +msgstr "Antiquités/Verreries" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Toys" -msgstr "" +msgstr "Antiquités/Jouets" #. module: auction #: field:auction.deposit,create_uid:0 #: field:auction.lots,create_uid:0 msgid "Created by" -msgstr " créé par" +msgstr "créé par" #. module: auction #: xsl:report.auction.deposit:0 msgid "Estimate" -msgstr "" +msgstr "Estimez" #. module: auction #: rml:auction.total.rml:0 msgid "# of buyers:" -msgstr "" +msgstr "# d'acheteurs" #. module: auction #: field:auction.lots,costs:0 @@ -707,19 +689,14 @@ msgid "Cat" msgstr "" #. module: auction -#: constraint:account.tax.code:0 -msgid "Error ! You can not create recursive accounts." -msgstr "" - -#. module: auction -#: model:ir.ui.menu,name:auction.auction_menu_root +#: model:ir.ui.menu,name:auction.menu_root msgid "Auction Management" -msgstr " Gestion des enchères" +msgstr "Gestion des enchères" #. module: auction #: field:auction.dates,journal_seller_id:0 msgid "Seller Journal" -msgstr " Journal du vendeur" +msgstr "Journal du vendeur" #. module: auction #: view:report.buyer.auction:0 @@ -734,7 +711,7 @@ msgstr "Ajouter un artiste" #. module: auction #: field:auction.lot.category,name:0 msgid "Category Name" -msgstr " Nom de la catégorie" +msgstr "Nom de la catégorie" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager @@ -745,44 +722,44 @@ msgstr "Comparaison des estimations" #. module: auction #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot msgid "Code barres du lot" -msgstr "" +msgstr "Code barres du lot" #. module: auction #: wizard_button:auction.lots.numerotate,not_exist,init:0 msgid "Retry" -msgstr "" +msgstr "Réessayez" #. module: auction #: field:auction.artists,birth_death_dates:0 msgid "Birth / Death dates" -msgstr " Dates naissance/décès" +msgstr "Dates naissance/décès" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Jewelry" -msgstr "" +msgstr "Antiquités/Joaillerie" #. module: auction #: model:ir.model,name:auction.model_report_unclassified_objects msgid "Unclassified objects " -msgstr "" +msgstr "Objets Non Classés " #. module: auction #: wizard_button:auction.lots.numerotate_cont,init,set_number:0 #: wizard_field:auction.lots.send.aie,init,numerotation:0 #: wizard_field:auction.lots.send.aie,date_ask,numerotation:0 msgid "Numerotation" -msgstr "" +msgstr "Numérotation" #. module: auction #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit msgid "Bordereau de dépôt" -msgstr "" +msgstr "Bordereau de dépôt" #. module: auction #: xsl:report.auction.deposit:0 msgid "Document type" -msgstr "" +msgstr "Type de document" #. module: auction #: model:ir.model,name:auction.model_report_auction_estimation_adj_category @@ -792,7 +769,7 @@ msgstr "" #. module: auction #: rml:buyer.list:0 msgid "Adj(EUR)" -msgstr "" +msgstr "Adj (EUR)" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -818,12 +795,12 @@ msgstr "Catégories des objets" #. module: auction #: wizard_field:auction.lots.send.aie,date_ask,img_send:0 msgid "Send Image also ?" -msgstr "" +msgstr "Envoyer l'image aussi ?" #. module: auction #: view:auction.deposit:0 msgid "General Informations" -msgstr "" +msgstr "Informations générales" #. module: auction #: constraint:ir.ui.view:0 @@ -833,7 +810,7 @@ msgstr "XML non valide pour l'architecture de la vue" #. module: auction #: view:report.auction.view:0 msgid "Auctions results" -msgstr "" +msgstr "Résultats de l'Enchère" #. module: auction #: wizard_field:auction.lots.sms_send,init,app_id:0 @@ -844,17 +821,17 @@ msgstr "" #: field:auction.bid_line,bid_id:0 #: field:auction.bid,name:0 msgid "Bid ID" -msgstr " ID de l'ordre d'achat" +msgstr "ID de l'ordre d'achat" #. module: auction #: rml:auction.total.rml:0 msgid "Min Estimate:" -msgstr "" +msgstr "Estimation Min." #. module: auction #: field:report.buyer.auction2,net_margin:0 msgid "Net Margin" -msgstr "" +msgstr "Marge Nette" #. module: auction #: field:auction.lots,vnd_lim_net:0 @@ -862,44 +839,49 @@ msgid "Net limit ?" msgstr "" #. module: auction +#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 +msgid "Buyer's revenues" +msgstr "Revenus de l'Acheteur" + +#. module: auction #: rml:auction.total.rml:0 msgid "# of commissions:" -msgstr "" +msgstr "# de commissions :" #. module: auction #: model:ir.actions.act_window,name:auction.action_unclassified_objects #: model:ir.ui.menu,name:auction.menu_all_objects_unclassified #: view:report.unclassified.objects:0 msgid "Unclassified objects" -msgstr " Objets inclassifiés" +msgstr "Objets inclassifiés" #. module: auction #: wizard_view:auction.lots.make_invoice_buyer,init:0 msgid "(Keep empty for automatic number)" -msgstr "" +msgstr "(Laisser vide pour une numérotation automatique)" #. module: auction #: model:ir.model,name:auction.model_report_auction_object_date #: view:report.auction.object.date:0 msgid "Objects per day" -msgstr "" +msgstr "Objets par jour" #. module: auction #: model:product.template,name:auction.monproduit_product_template msgid "Oeuvres a 21%" -msgstr "" +msgstr "Oeuvres à 21%" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Carpet and textilles" -msgstr "" +msgstr "Antiquités/Tapis et Textiles" #. module: auction #: xsl:report.auction.seller.list:0 #: field:report.object.encoded,adj:0 #: field:report.object.encoded.manager,adj:0 msgid "Adj." -msgstr "" +msgstr "Adj." #. module: auction #: xsl:report.auction.deposit:0 @@ -908,32 +890,32 @@ msgstr "" #: field:report.auction.adjudication,date:0 #: field:report.auction.estimation.adj.category,date:0 msgid "Date" -msgstr "" +msgstr "Date" #. module: auction #: field:auction.lots,obj_ret:0 msgid "Price retired" -msgstr " Prix de retrait" +msgstr "Prix de retrait" #. module: auction #: view:auction.deposit:0 msgid "Extra Costs" -msgstr "" +msgstr "Coûts Additionnels" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_new msgid "New Auction Dates" -msgstr " Nouvelle vente" +msgstr "Nouvelle vente" #. module: auction #: field:report.deposit.border,moy_est:0 msgid "Avg. Est" -msgstr "" +msgstr "Est. Moy." #. module: auction #: field:auction.deposit,date_dep:0 msgid "Deposit date" -msgstr " Date de dépôt" +msgstr "Date de dépôt" #. module: auction #: model:ir.model,name:auction.model_report_auction_adjudication @@ -943,7 +925,7 @@ msgstr "" #. module: auction #: field:auction.deposit,specific_cost_ids:0 msgid "Specific Costs" -msgstr " Coûts spécifiques" +msgstr "Coûts spécifiques" #. module: auction #: view:report.buyer.auction2:0 @@ -955,17 +937,17 @@ msgstr "" #: view:auction.dates:0 #: view:report.auction.view2:0 msgid "Auctions" -msgstr "" +msgstr "Enchères" #. module: auction #: field:report.seller.auction,object_number:0 msgid "No of Objects" -msgstr "" +msgstr "Nombre d'Objets" #. module: auction #: view:auction.lots:0 msgid "History" -msgstr "" +msgstr "Historique" #. module: auction #: rml:auction.code_bar_lot:0 @@ -975,12 +957,12 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Painting" -msgstr "" +msgstr "Antiquités/Tableaux" #. module: auction #: field:auction.lot.category,aie_categ:0 msgid "Aie Category" -msgstr " Aie catégorie" +msgstr "Aie catégorie" #. module: auction #: xsl:report.auction.deposit:0 @@ -992,22 +974,22 @@ msgstr "" #. module: auction #: field:auction.deposit,method:0 msgid "Withdrawned method" -msgstr " Méthode de retrait" +msgstr "Méthode de retrait" #. module: auction #: view:auction.dates:0 msgid "Beginning of the auction" -msgstr " Début de la vente" +msgstr "Début de la vente" #. module: auction #: field:auction.artists,biography:0 msgid "Biography" -msgstr " Biographie" +msgstr "Biographie" #. module: auction #: field:auction.lots,lot_local:0 msgid "Location" -msgstr " Localisation" +msgstr "Emplacement" #. module: auction #: wizard_view:auction.payer.sel,init:0 @@ -1018,24 +1000,24 @@ msgstr "" #: wizard_button:auction.payer.sel,init,pay2:0 #: wizard_button:auction.pay.buy,init,pay:0 msgid "Pay" -msgstr "" +msgstr "Payer" #. module: auction #: field:report.object.encoded.manager,obj_margin:0 #: field:report.object.encoded,obj_margin:0 #: field:report.seller.auction2,net_margin:0 msgid "Net margin" -msgstr "" +msgstr "Marge Nette" #. module: auction #: view:auction.dates:0 msgid "Analytic" -msgstr "" +msgstr "Analytique" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_results msgid "Send results to Auction-in-europe.com" -msgstr " Envoi des résultats vers Auction-in-europe.com" +msgstr "Envoi des résultats vers Auction-in-europe.com" #. module: auction #: rml:bids.lots:0 @@ -1046,56 +1028,51 @@ msgstr "" #. module: auction #: selection:auction.deposit,method:0 msgid "Decrease limit of 10%" -msgstr "" +msgstr "Diminuer la limite de 10 %" #. module: auction #: view:auction.lot.category:0 msgid "Lot Category" -msgstr " Catégorie du lot" +msgstr "Catégorie du lot" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_reporting1 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all1 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all2 msgid "Seller's auction" -msgstr " Ventes/Vendeurs" +msgstr "Ventes/Vendeurs" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1 msgid "Invoice Buyer objects" -msgstr " Facturer les objets de l'acheteur" - -#. module: auction -#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2 -msgid "Seller's Revenues" -msgstr "" +msgstr "Facturer les objets de l'acheteur" #. module: auction #: xsl:flagey.huissier:0 msgid "Price" -msgstr "" +msgstr "Prix" #. module: auction #: rml:bids.phones.details:0 msgid "-" -msgstr "" +msgstr "-" #. module: auction #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Subtotal:" -msgstr "" +msgstr "Sous-total :" #. module: auction #: view:auction.deposit:0 msgid "Photos" -msgstr "" +msgstr "Photos" #. module: auction #: wizard_field:auction.lots.make_invoice,init,number:0 #: wizard_field:auction.lots.make_invoice_buyer,init,number:0 msgid "Invoice Number" -msgstr "" +msgstr "Numéro de facture" #. module: auction #: constraint:product.product:0 @@ -1103,11 +1080,6 @@ msgid "Error: Invalid ean code" msgstr "Erreur: code EAN invalide" #. module: auction -#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1 -msgid "Buyer's Summary" -msgstr "" - -#. module: auction #: view:auction.dates:0 msgid "Names" msgstr "Noms" @@ -1115,7 +1087,7 @@ msgstr "Noms" #. module: auction #: rml:bids.lots:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: auction #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0 @@ -1127,15 +1099,9 @@ msgid "Depositer Inventory" msgstr "Inventaire de dépôt" #. module: auction -#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m -#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member -msgid "Depositer's Statistics" -msgstr "" - -#. module: auction #: view:report.object.encoded.manager:0 msgid "Total adj." -msgstr "" +msgstr "Adj. Totale" #. module: auction #: wizard_field:auction.lots.send.aie.results,init,uname:0 @@ -1144,12 +1110,12 @@ msgstr "" #: wizard_field:auction.lots.send.aie,date_ask,uname:0 #: wizard_field:auction.lots.sms_send,init,user:0 msgid "Login" -msgstr "" +msgstr "Connexion" #. module: auction #: view:auction.lots:0 msgid "Not sold" -msgstr "" +msgstr "Non Vendu" #. module: auction #: wizard_button:auction.lots.enable,init,go:0 @@ -1159,23 +1125,23 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Others" -msgstr "" +msgstr "Antiquités/Autres" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_lots_3 msgid "Seller Form" -msgstr "" +msgstr "Formulaire du Vendeur" #. module: auction #: field:auction.lots,lot_type:0 #: field:report.unclassified.objects,lot_type:0 msgid "Object category" -msgstr " Catégorie de l'objet" +msgstr "Catégorie de l'objet" #. module: auction #: wizard_view:auction.taken,init:0 msgid "Mark Lots" -msgstr "" +msgstr "Marquer les Lots" #. module: auction #: wizard_field:auction.lots.enable,init,confirm_en:0 @@ -1188,7 +1154,7 @@ msgstr "N° du catalogue" #. module: auction #: view:auction.dates:0 msgid "Accounting" -msgstr "" +msgstr "Comptabilité" #. module: auction #: view:report.buyer.auction2:0 @@ -1198,12 +1164,12 @@ msgstr "" #. module: auction #: model:ir.actions.report.xml,name:auction.bid_phone msgid "Bids phones" -msgstr "Téléphone: Ordre d'achat " +msgstr "Téléphone: Ordre d'achat" #. module: auction #: model:ir.actions.act_window,name:auction.action_report_object_by_auction msgid "Auction dates" -msgstr " Dates de l'enchère" +msgstr "Dates de l'enchère" #. module: auction #: view:report.seller.auction2:0 @@ -1213,43 +1179,48 @@ msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree msgid "Encoded Objects Per Day" -msgstr " Objets encodés par jour" +msgstr "Objets encodés par jour" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Buyer form" -msgstr "" +msgstr "Formulaire de l'Acheteur" #. module: auction #: rml:auction.total.rml:0 msgid "Debit:" -msgstr "" +msgstr "Débit :" #. module: auction #: field:auction.lots,author_right:0 msgid "Author rights" -msgstr " Droit d'auteurs" +msgstr "Droit d'auteurs" #. module: auction #: view:auction.lots:0 msgid "Payment's history" -msgstr " Historique du paiement" +msgstr "Historique du paiement" + +#. module: auction +#: wizard_button:auction.taken,init,valid:0 +msgid " Valider " +msgstr " Valider " #. module: auction #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Document" -msgstr "" +msgstr "Document" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid ", TEL:" -msgstr "" +msgstr ", TEL:" #. module: auction #: view:report.auction.view:0 msgid "Auction results" -msgstr "" +msgstr "Résultats de l'Enchère" #. module: auction #: rml:auction.bids:0 @@ -1267,14 +1238,12 @@ msgstr "" #. module: auction #: wizard_button:auction.lots.buyer_map,check,set_buyer:0 msgid "Update" -msgstr "" +msgstr "Mettre à jour" #. module: auction #: rml:auction.total.rml:0 -#: model:ir.ui.menu,name:auction.auction_report_seller_menu -#: model:ir.ui.menu,name:auction.auction_seller_menu msgid "Sellers" -msgstr " Vendeurs" +msgstr "Vendeurs" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1284,22 +1253,22 @@ msgstr "" #. module: auction #: model:ir.actions.report.xml,name:auction.res_w_buyer msgid "Results with buyer" -msgstr " Résultats des acheteurs" +msgstr "Résultats des acheteurs" #. module: auction #: wizard_button:auction.lots.auction_move,init,set_date:0 msgid "Move to Auction date" -msgstr "" +msgstr "Déplacer à la date de l'Enchère" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_dates_old msgid "Old Auctions" -msgstr " Anciennes ventes" +msgstr "Anciennes ventes" #. module: auction #: rml:auction.total.rml:0 msgid "# of unsold items:" -msgstr "" +msgstr "@ d'articles non vendus" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1320,60 +1289,65 @@ msgstr "Date de l'enchère" #. module: auction #: rml:auction.code_bar_lot:0 msgid ", ID" -msgstr "" +msgstr ", ID" #. module: auction #: model:ir.actions.report.xml,name:auction.lot_list_inv msgid "Lots List - Landscape" -msgstr " Liste des lots - Paysage" +msgstr "Liste des lots - Paysage" #. module: auction #: field:auction.bid_line,auction:0 msgid "Auction Name" -msgstr "" +msgstr "Nom de l'Enchère" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_manager_tree1 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_member_tree1 msgid "Attendance" -msgstr " Présence" +msgstr "Présence" #. module: auction #: view:auction.lots:0 msgid "Seller information" -msgstr "" +msgstr "Information sur le vendeur" #. module: auction #: model:ir.actions.report.xml,name:auction.id_deposit msgid "Deposits" -msgstr "" +msgstr "Dépots" #. module: auction #: field:auction.lot.category,priority:0 msgid "Priority" -msgstr " Priorité" +msgstr "Priorité" #. module: auction #: xsl:report.auction.deposit:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Inventory" -msgstr "" +msgstr "Inventaire" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1 +msgid "Buyer's summary" +msgstr "Résumé de l'Acheteur" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_dates_next msgid "Next Auctions" -msgstr " Prochaines ventes" +msgstr "Prochaines ventes" #. module: auction #: rml:buyer.list:0 #: xsl:report.auction.seller.list:0 msgid "#" -msgstr "" +msgstr "#" #. module: auction #: field:auction.lots,ach_emp:0 msgid "Taken Away" -msgstr " Emporté" +msgstr "Emporté" #. module: auction #: view:report.object.encoded.manager:0 @@ -1383,22 +1357,22 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Miniatures / Collections" -msgstr "" +msgstr "Antiquités/Figurines / Collections" #. module: auction #: wizard_view:auction.lots.numerotate,not_exist:0 msgid "This lot does not exist !" -msgstr "" +msgstr "Ce lot n'existe pas !" #. module: auction #: view:auction.dates:0 msgid "Close + Create all invoices" -msgstr " Fermer et créer les factures" +msgstr "Fermer et créer les factures" #. module: auction #: field:auction.bid_line,call:0 msgid "To be Called" -msgstr " A appeler" +msgstr "A appeler" #. module: auction #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_manager_tree @@ -1414,7 +1388,7 @@ msgstr "" #: field:report.auction.view,min_est:0 #: field:report.unclassified.objects,lot_est1:0 msgid "Minimum Estimation" -msgstr "" +msgstr "Estimation Minimum" #. module: auction #: view:report.seller.auction:0 @@ -1425,7 +1399,7 @@ msgstr "" #: wizard_view:auction.lots.auction_move,init:0 #: model:ir.actions.wizard,name:auction.wizard_change_auction msgid "Change Auction Date" -msgstr " Changer la date de l'enchère" +msgstr "Changer la date de l'enchère" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1447,32 +1421,32 @@ msgstr "" #: wizard_button:auction.lots.send.aie,date_ask,end:0 #: wizard_button:auction.lots.sms_send,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: auction #: rml:auction.total.rml:0 msgid "Max Estimate:" -msgstr "" +msgstr "Estimation Max :" #. module: auction #: wizard_button:auction.lots.buyer_map,done,end:0 msgid "Close" -msgstr "" +msgstr "Fermer" #. module: auction #: field:report.auction.view2,obj_margin:0 msgid "Avg margin" -msgstr " Moy de la marge" +msgstr "Moy de la marge" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Art from the Ivory Coast" -msgstr "" +msgstr "Antiquités/Art de la Côte d'Ivoire" #. module: auction #: view:auction.dates:0 msgid "End of auction" -msgstr " Fin de la vente" +msgstr "Fin de la vente" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1483,23 +1457,26 @@ msgstr "" #: wizard_button:auction.lots.make_invoice,init,invoice:0 #: wizard_button:auction.lots.make_invoice_buyer,init,invoice:0 msgid "Create invoices" -msgstr "" +msgstr "Créer les factures" #. module: auction #: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie" +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: auction #: selection:auction.dates,state:0 #: selection:report.auction.adjudication,state:0 msgid "Closed" -msgstr "" +msgstr "Fermé" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_unplanned1 msgid "Unplanned objects" -msgstr " Objets non plannifiés" +msgstr "Objets non plannifiés" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1514,7 +1491,7 @@ msgstr "" #. module: auction #: field:auction.dates,journal_id:0 msgid "Buyer Journal" -msgstr " Journal de l'acheteur" +msgstr "Journal de l'acheteur" #. module: auction #: xsl:report.auction.ach_bordereau:0 @@ -1522,28 +1499,28 @@ msgstr " Journal de l'acheteur" #: selection:report.object.encoded,state:0 #: selection:report.unclassified.objects,state:0 msgid "Paid" -msgstr "" +msgstr "Payé" #. module: auction #: rml:bids.lots:0 #: rml:bids.phones.details:0 msgid "Phone" -msgstr "" +msgstr "Téléphone" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Argenterie" -msgstr "" +msgstr "Antiquités/Argenterie" #. module: auction #: model:ir.actions.act_window,name:auction.view_report_object_by_auction msgid "Detailed lots" -msgstr " Lots détaillés" +msgstr "Lots détaillés" #. module: auction #: field:auction.lot.category,active:0 msgid "Active" -msgstr "" +msgstr "Actif" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1553,46 +1530,46 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Sculpture, bronze, eso." -msgstr "" +msgstr "Antiquiés/Sculpture, bronze, etc, ..." #. module: auction -#: rml:buyer.list:0 #: xsl:report.auction.ach_bordereau:0 +#: rml:buyer.list:0 #: xsl:report.auction.seller.list:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Total:" -msgstr "" +msgstr "Total :" #. module: auction #: view:report.auction.object.date:0 msgid "Objects per Day" -msgstr "" +msgstr "Objets par Jour" #. module: auction #: xsl:report.auction.deposit:0 msgid "Document Number" -msgstr "" +msgstr "Numéro du Document" #. module: auction #: view:report.object.encoded:0 #: view:report.object.encoded.manager:0 msgid "Objects statistics" -msgstr "" +msgstr "Statistiques des Objets" #. module: auction #: wizard_button:auction.lots.numerotate,search,set_number:0 msgid "Numerotate" -msgstr "" +msgstr "Numéroter" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "Buyer, Price" -msgstr "" +msgstr "Prix de l'Acheteur" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Unclassifieds" -msgstr "" +msgstr "Non Classés" #. module: auction #: model:ir.actions.report.xml,name:auction.v_huissier @@ -1602,12 +1579,12 @@ msgstr "" #. module: auction #: field:auction.lots,vnd_lim:0 msgid "Seller limit" -msgstr " Limite du vendeur" +msgstr "Limite du vendeur" #. module: auction #: wizard_view:auction.lots.buyer_map,done:0 msgid "All objects are assigned to buyers !" -msgstr "" +msgstr "Tous les objets sont assignés aux acheteurs !" #. module: auction #: wizard_button:auction.lots.able,init,go:0 @@ -1616,8 +1593,11 @@ msgstr "" #. module: auction #: 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: auction #: field:auction.deposit,transfer:0 @@ -1636,11 +1616,6 @@ msgid "Artist/Author 2" msgstr "Artiste/Auteur 2" #. module: auction -#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1 -msgid "Seller's Summary" -msgstr "" - -#. module: auction #: model:ir.model,name:auction.model_report_seller_auction msgid "Auction Reporting on seller view" msgstr "" @@ -1648,7 +1623,7 @@ msgstr "" #. module: auction #: wizard_field:auction.taken,init,lot_ids:0 msgid "Lots Emportes" -msgstr "" +msgstr "Lots emportés" #. module: auction #: wizard_button:auction.lots.send.aie.results,date_ask,send:0 @@ -1659,7 +1634,7 @@ msgstr "" #. module: auction #: field:auction.lots,net_margin:0 msgid "Net Margin (%)" -msgstr " Marge nette (%) " +msgstr "Marge nette (%)" #. module: auction #: field:report.auction.object.date,month:0 @@ -1669,7 +1644,7 @@ msgstr "Mois" #. module: auction #: model:ir.actions.act_window,name:auction.auction_lots_open msgid "Simplified lots for adjudication" -msgstr " Lots simplifiés" +msgstr "Lots simplifiés" #. module: auction #: field:auction.lots,product_id:0 @@ -1679,7 +1654,7 @@ msgstr "Produit" #. module: auction #: model:ir.actions.report.xml,name:auction.total_result1 msgid "Auction Totals with lists" -msgstr " Totaux de la vente" +msgstr "Totaux de la vente" #. module: auction #: model:ir.model,name:auction.model_report_auction_view @@ -1694,7 +1669,7 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Porcelain, Ceramics, Glassmaking, ..." -msgstr "" +msgstr "Antiquités/Porcelaine, Céramiques, Verrerie, ..." #. module: auction #: xsl:report.auction.ach_bordereau:0 @@ -1703,36 +1678,34 @@ msgstr "" #. module: auction #: field:auction.deposit,lot_id:0 -#: model:ir.ui.menu,name:auction.auction_objects_menu #: view:auction.deposit:0 msgid "Objects" -msgstr " Objets" +msgstr "Objets" #. module: auction #: wizard_view:auction.lots.numerotate,init:0 #: wizard_view:auction.lots.numerotate,search:0 msgid "Object Reference" -msgstr "" +msgstr "Référence de l'Objet" #. module: auction #: rml:auction.total.rml:0 msgid "Paid:" -msgstr "" +msgstr "Payé :" #. module: auction #: field:auction.deposit,total_neg:0 msgid "Allow Negative Amount" -msgstr " Permettre un montant négatif" +msgstr "Permettre un montant négatif" #. module: auction #: rml:auction.bids:0 #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.deposit:0 #: rml:auction.total.rml:0 -#: model:ir.ui.menu,name:auction.auction_report_auction_menu #: view:auction.lots:0 msgid "Auction" -msgstr " Ventes aux enchères" +msgstr "Ventes aux enchères" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1753,17 +1726,17 @@ msgstr "" #: field:report.seller.auction,auction:0 #: field:report.unclassified.objects,auction:0 msgid "Auction date" -msgstr " Date de l'enchère" +msgstr "Date de l'enchère" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_unsold msgid "Unsold Objects" -msgstr " Objets non vendus" +msgstr "Objets non vendus" #. module: auction #: field:report.buyer.auction,avg_price:0 msgid "Avg Adj." -msgstr " Moy Adj" +msgstr "Moy Adj" #. module: auction #: model:ir.model,name:auction.model_auction_deposit_cost @@ -1773,17 +1746,17 @@ msgstr "" #. module: auction #: wizard_field:auction.lots.numerotate,search,bord_vnd_id:0 msgid "Object Inventory" -msgstr "" +msgstr "Inventaire des Objets" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Art from the Ivory Coast/African Arts" -msgstr "" +msgstr "Antiquités/Art de la Côte d'Ivoire/Art Africain" #. module: auction #: field:auction.dates,auction1:0 msgid "First Auction Day" -msgstr " Début de l'enchère" +msgstr "Début de l'enchère" #. module: auction #: view:report.attendance:0 @@ -1795,24 +1768,19 @@ msgstr "" #: field:report.auction.adjudication,adj_total:0 #: field:report.auction.estimation.adj.category,adj_total:0 msgid "Total Adjudication" -msgstr " Adjudication totale" +msgstr "Adjudication totale" #. module: auction #: wizard_field:auction.lots.buyer_map,check,ach_login:0 #: field:auction.lots,ach_login:0 #: field:report.unclassified.objects,ach_login:0 msgid "Buyer Username" -msgstr " Nom de l'acheteur" - -#. module: auction -#: model:ir.ui.menu,name:auction.auction_report_manager_menu -msgid "Manager" -msgstr "Manager " +msgstr "Nom de l'acheteur" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Customer Reference" -msgstr "" +msgstr "Référence Client" #. module: auction #: view:auction.artists:0 @@ -1822,18 +1790,18 @@ msgstr "Artistes" #. module: auction #: field:report.seller.auction,avg_estimation:0 msgid "Avg estimation" -msgstr "" +msgstr "Estimation moyenne" #. module: auction #: xsl:report.auction.ach_bordereau:0 #: field:report.attendance,total_attendance:0 msgid "Total" -msgstr "" +msgstr "Total" #. module: auction #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open msgid "Open lots" -msgstr " Lots ouverts" +msgstr "Lots ouverts" #. module: auction #: view:report.seller.auction:0 @@ -1843,22 +1811,22 @@ msgstr "" #. module: auction #: view:auction.lots:0 msgid "Lots" -msgstr "" +msgstr "Lots" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_send msgid "Send to website" -msgstr " Envoi vers le site web" +msgstr "Envoi vers le site web" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_old msgid "Old Auction Dates" -msgstr " Anciennes ventes" +msgstr "Anciennes ventes" #. module: auction #: field:auction.lots,seller_price:0 msgid "Seller price" -msgstr " Prix du vendeur" +msgstr "Prix du vendeur" #. module: auction #: model:ir.model,name:auction.model_report_seller_auction2 @@ -1868,7 +1836,7 @@ msgstr "" #. module: auction #: model:ir.actions.report.xml,name:auction.buy_id_list msgid "Buyer List" -msgstr "" +msgstr "Liste des Acheteurs" #. module: auction #: rml:buyer.list:0 @@ -1880,24 +1848,24 @@ msgstr "" #: wizard_field:auction.pay.buy,init,statement_id3:0 #: wizard_field:auction.pay.buy,init,statement_id1:0 msgid "Statement" -msgstr "" +msgstr "Déclaration" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Engravings" -msgstr "" +msgstr "Antiquités/Gravures" #. module: auction #: wizard_field:auction.lots.numerotate_cont,init,number:0 #: wizard_view:auction.lots.numerotate_cont,init:0 msgid "First Number" -msgstr "" +msgstr "Premier Numéro" #. module: auction #: field:report.object.encoded,estimation:0 #: field:report.object.encoded.manager,estimation:0 msgid "Estimation" -msgstr "" +msgstr "Estimation" #. module: auction #: model:ir.model,name:auction.model_report_auction_view2 @@ -1907,17 +1875,18 @@ msgstr "" #. module: auction #: field:auction.dates,expo1:0 msgid "First Exposition Day" -msgstr " Premier jour de l'exposition" +msgstr "Premier jour de l'exposition" #. module: auction #: wizard_view:auction.lots.auction_move,init:0 -msgid "Warning, this will erase the object adjudication price and its buyer !" -msgstr "" +msgid "" +"Warning, this will erase the object adjudication price and its buyer !" +msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !" #. module: auction #: field:report.auction.object.date,name:0 msgid "Created date" -msgstr " Date de création" +msgstr "Date de création" #. module: auction #: view:auction.bid:0 @@ -1927,12 +1896,12 @@ msgstr "" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "TEL:" -msgstr "" +msgstr "TÉL :" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_to_sell msgid "Objects to sell" -msgstr " Objets à vendre" +msgstr "Objets à vendre" #. module: auction #: field:auction.lots,net_revenue:0 @@ -1941,28 +1910,28 @@ msgstr " Objets à vendre" #: field:report.object.encoded,net_revenue:0 #: field:report.seller.auction2,net_revenue:0 msgid "Net revenue" -msgstr " Revenu net" +msgstr "Revenu net" #. module: auction #: xsl:report.auction.deposit:0 #: xsl:report.auction.lots.list.landscape:0 msgid "Limit" -msgstr "" +msgstr "Limite" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree_manager msgid "Latest Deposits" -msgstr " Derniers dépôts" +msgstr "Derniers dépôts" #. module: auction #: rml:auction.total.rml:0 msgid "# of items:" -msgstr "" +msgstr "# d'articles :" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Musical Instruments" -msgstr "" +msgstr "Antiquités/Instruments de Musique" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1972,63 +1941,68 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Graphic Arts" -msgstr "" +msgstr "Antiquités/Arts Graphiques" #. module: auction #: model:ir.actions.report.xml,name:auction.buyer_form_id msgid "Buyer Form" -msgstr " Fiche du acheteur" +msgstr "Fiche du acheteur" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_invoice msgid "Invoice Seller objects" -msgstr " Facturer les objets du vendeur" +msgstr "Facturer les objets du vendeur" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts" -msgstr "" +msgstr "Antiquiés/Arts Orientaux" #. module: auction #: field:auction.bid,partner_id:0 msgid "Buyer Name" -msgstr " Nom de l'acheteur" +msgstr "Nom de l'acheteur" #. module: auction #: field:report.auction.view2,sum_adj:0 msgid "Sum of adjudication" -msgstr " somme de l'adjudication" +msgstr "somme de l'adjudication" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_enable_taken msgid "Unmark as taken away" -msgstr " Marquer comme non emporté" +msgstr "Marquer comme non emporté" #. module: auction #: field:auction.lots,gross_margin:0 msgid "Gross Margin (%)" -msgstr " Marge brute (%)" +msgstr "Marge brute (%)" #. module: auction #: xsl:report.auction.vnd_bordereau:0 msgid "Lot" -msgstr "" +msgstr "Lot" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2 +msgid "Auction's revenues" +msgstr "Revenus de l'Enchère" #. module: auction #: field:auction.lots,obj_comm:0 #: field:report.unclassified.objects,obj_comm:0 msgid "Commission" -msgstr "" +msgstr "Commission" #. module: auction #: wizard_field:auction.lots.numerotate,init,lot_num:0 msgid "Lot Number" -msgstr "" +msgstr "Numéro de Lot" #. module: auction #: constraint:res.partner:0 msgid "The VAT doesn't seem to be correct." -msgstr "" +msgstr "Le numéro de TVA ne semble pas correct." #. module: auction #: field:report.attendance,employee_id:0 @@ -2039,7 +2013,7 @@ msgstr "Employé" #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Adj.(EUR)" -msgstr "" +msgstr "Adj. (EUR)" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -2047,13 +2021,13 @@ msgid "Est." msgstr "" #. module: auction -#: model:ir.ui.menu,name:auction.auction_report_menu -msgid "Reporting" -msgstr "Reporting" - -#. module: auction #: view:auction.lots:0 msgid "Catalog" +msgstr "Catalogue" + +#. module: auction +#: field:auction.lots,is_ok:0 +msgid "Buyer s payment" msgstr "" #. module: auction @@ -2063,36 +2037,26 @@ msgid "Deposit Border" msgstr "" #. module: auction -#: model:ir.ui.menu,name:auction.auction_config_menu -msgid "Configuration" -msgstr "Configuration" - -#. module: auction #: view:report.seller.auction:0 msgid "Auction reporting graph view" msgstr "" #. module: auction -#: model:ir.ui.menu,name:auction.auction_outils_menu -msgid "Tools Bar Codes" -msgstr "" - -#. module: auction #: field:auction.deposit.cost,deposit_id:0 msgid "Deposit" -msgstr " Dépôt" +msgstr "Dépôt" #. module: auction #: field:auction.dates,expo2:0 msgid "Last Exposition Day" -msgstr " Dernier jour d'exposition" +msgstr "Dernier jour d'exposition" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view1 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view2 #: model:ir.actions.act_window,name:auction.action_auction_report_thismonth_view2 msgid "Auction report" -msgstr " Rapport de l'auction" +msgstr "Rapport de l'auction" #. module: auction #: field:auction.artists,name:0 @@ -2102,23 +2066,23 @@ msgstr "Nom Artiste/Auteur" #. module: auction #: field:auction.lots,image:0 msgid "Image" -msgstr "" +msgstr "Image" #. module: auction #: selection:report.object.encoded,state:0 msgid "Invoiced" -msgstr "" +msgstr "Facturé" #. module: auction #: selection:auction.lots,state:0 #: view:auction.lots:0 msgid "Taken away" -msgstr "" +msgstr "Emporté" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_form_id msgid "Seller List" -msgstr " Listes des vendeurs " +msgstr "Listes des vendeurs" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -2130,7 +2094,7 @@ msgstr "" #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting2 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all1 msgid "Buyer's auction" -msgstr " Ventes/Vendeurs" +msgstr "Ventes/Vendeurs" #. module: auction #: view:report.seller.auction2:0 @@ -2140,7 +2104,7 @@ msgstr "" #. module: auction #: view:auction.deposit:0 msgid "Deposit Costs" -msgstr "" +msgstr "Coûts du dépot" #. module: auction #: selection:auction.dates,state:0 @@ -2150,12 +2114,12 @@ msgstr "" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Draft" -msgstr " " +msgstr "Brouillon" #. module: auction #: rml:buyer.list:0 msgid "........." -msgstr "" +msgstr "........." #. module: auction #: xsl:report.auction.ach_bordereau:0 @@ -2170,23 +2134,22 @@ msgstr "" #. module: auction #: rml:report.auction.buyer.result:0 msgid "Adj" -msgstr "" +msgstr "Adj" #. module: auction -#: model:ir.ui.menu,name:auction.auction_date_menu #: view:auction.dates:0 msgid "Auction Dates" -msgstr " Dates des ventes aux enchères" +msgstr "Dates des ventes aux enchères" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Furnitures" -msgstr "" +msgstr "Antiquiés/Meubles" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Customer Contact" -msgstr "" +msgstr "Contact Client" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -2205,12 +2168,17 @@ msgstr "Utilisateur" #. module: auction #: view:report.unplanned.object:0 msgid "Unplanned Objects" -msgstr "" +msgstr "Objets Non Prévus" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 +msgid "Auction's summary" +msgstr "Résumé de l'Enchère" #. module: auction #: field:report.buyer.auction2,gross_revenue:0 msgid "Gross Revenue" -msgstr " Revenu brut" +msgstr "Revenu brut" #. module: auction #: field:auction.artists,pseudo:0 @@ -2226,12 +2194,12 @@ msgstr "" #: rml:buyer.list:0 #: xsl:report.auction.seller.list:0 msgid "To pay" -msgstr "" +msgstr "À Payer" #. module: auction #: field:auction.dates,buyer_costs:0 msgid "Buyer Costs" -msgstr " Coût de l'acheteur" +msgstr "Coût de l'acheteur" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_numerotate_automatic @@ -2241,27 +2209,27 @@ msgstr "Numérotation automatique" #. module: auction #: rml:auction.total.rml:0 msgid "Auction Date:" -msgstr "" +msgstr "Date de l'Enchère :" #. module: auction #: field:auction.lots,ach_inv_id:0 msgid "Buyer Invoice" -msgstr " Facture de l'acheteur" +msgstr "Facture de l'acheteur" #. module: auction #: rml:auction.bids:0 msgid "Tel" -msgstr "" +msgstr "Tél" #. module: auction #: wizard_field:auction.pay.buy,init,total:0 msgid "Amount to paid" -msgstr "" +msgstr "Montant à payer" #. module: auction #: field:auction.lots,artist_id:0 msgid "Artist/Author" -msgstr " Artiste/Auteur" +msgstr "Artiste/Auteur" #. module: auction #: model:ir.model,name:auction.model_auction_lot_category @@ -2269,6 +2237,12 @@ msgid "auction.lot.category" msgstr "" #. module: auction +#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m +#: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member +msgid " Depositer's Statistics" +msgstr "" + +#. module: auction #: model:ir.model,name:auction.model_auction_bid msgid "Bid auctions" msgstr "" @@ -2287,27 +2261,27 @@ msgstr "" #. module: auction #: field:report.auction.view,nbuyer:0 msgid "No of buyers" -msgstr " Nb d'acheteurs" +msgstr "Nb d'acheteurs" #. module: auction #: field:report.seller.auction,avg_price:0 msgid "Avg adjudication" -msgstr "" +msgstr "Adjudication Moy." #. module: auction #: view:report.object.encoded.manager:0 msgid "Object statistic" -msgstr "" +msgstr "Statistique de l'Objet" #. module: auction #: field:auction.dates,auction2:0 msgid "Last Auction Day" -msgstr " Fin de l'enchère" +msgstr "Fin de l'enchère" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_next1 msgid "Next Auction Dates" -msgstr " Prochaines ventes" +msgstr "Prochaines ventes" #. module: auction #: view:report.auction.view2:0 @@ -2331,7 +2305,7 @@ msgstr "" #: view:auction.lots:0 #: view:auction.deposit:0 msgid "Description" -msgstr " " +msgstr "Description" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -2339,22 +2313,27 @@ msgid "Cont. Art/Arts" msgstr "" #. module: auction +#: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2 +msgid "Seller's revenues" +msgstr "Revenus du Vendeur" + +#. module: auction #: field:auction.lots,obj_price:0 #: field:report.auction.estimation.adj.category,obj_price:0 #: field:report.auction.view,adj_price:0 #: field:report.unclassified.objects,obj_price:0 msgid "Adjudication price" -msgstr " Prix d'adjudication" +msgstr "Prix d'adjudication" #. module: auction #: field:auction.dates,acc_income:0 msgid "Income Account" -msgstr " Compte des entrées" +msgstr "Compte des entrées" #. module: auction #: xsl:flagey.huissier:0 msgid "Ref." -msgstr "" +msgstr "Réf." #. module: auction #: wizard_field:auction.lots.send.aie.results,init,password:0 @@ -2363,34 +2342,34 @@ msgstr "" #: wizard_field:auction.lots.send.aie,date_ask,password:0 #: wizard_field:auction.lots.sms_send,init,password:0 msgid "Password" -msgstr "" +msgstr "Mot de passe" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_wizard_emporte +msgid "Gestion des livraisons" +msgstr "Gestion des livraisons" #. module: auction #: field:auction.lots,ach_avance:0 msgid "Buyer Advance" -msgstr " Avance de l'acheteur" +msgstr "Avance de l'acheteur" #. module: auction #: wizard_field:auction.lots.numerotate,search,name:0 #: field:auction.lots,name:0 #: field:report.unclassified.objects,name:0 msgid "Short Description" -msgstr " Courte description" - -#. module: auction -#: model:ir.ui.menu,name:auction.auction_report_employees_menu -msgid "Employees" -msgstr " Employés" +msgstr "Courte description" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Clocks and watches" -msgstr "" +msgstr "Antiquités/Horloges et Montres" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Scientific Instruments" -msgstr "" +msgstr "Antiquités/Instruments Scientifiques" #. module: auction #: wizard_view:auction.lots.enable,init:0 @@ -2400,28 +2379,28 @@ msgstr "" #. module: auction #: wizard_view:auction.pay.buy,init:0 msgid "Pay objects" -msgstr "" +msgstr "Payer les Objets" #. module: auction #: view:report.object.encoded:0 #: view:report.object.encoded.manager:0 msgid "# objects" -msgstr "" +msgstr "# d'objets" #. module: auction #: rml:auction.total.rml:0 msgid "Adjudication:" -msgstr "" +msgstr "Adjudication :" #. module: auction #: field:report.buyer.auction2,sumadj:0 msgid "Sum of adjustication" -msgstr "" +msgstr "Somme de l'adjudication" #. module: auction #: model:ir.actions.report.xml,name:auction.details_bids_phones msgid "Bids per lot (phone)" -msgstr " Ordre d'achat par lot(tél) " +msgstr "Ordre d'achat par lot(tél)" #. module: auction #: field:report.buyer.auction2,buyer_login:0 @@ -2432,27 +2411,22 @@ msgstr "Login de l'acheteur" #. module: auction #: field:auction.deposit,tax_id:0 msgid "Expenses" -msgstr " Dépenses" +msgstr "Dépenses" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Wine" -msgstr "" - -#. module: auction -#: wizard_button:auction.taken,init,valid:0 -msgid " OK " -msgstr "" +msgstr "Antiquités/Vins" #. module: auction #: rml:auction.total.rml:0 msgid "Auction name:" -msgstr "" +msgstr "Nom d' l'Enchère :" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/African Arts" -msgstr "" +msgstr "Antiquités/Art Africain" #. module: auction #: model:ir.actions.report.xml,name:auction.art2 @@ -2462,7 +2436,7 @@ msgstr "Biographie de l'auteur" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Posters" -msgstr "" +msgstr "Antiquités/Affiches" #. module: auction #: field:auction.lots,history_ids:0 @@ -2472,5 +2446,4 @@ msgstr "Historique de la vente" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "Orders" -msgstr "" - +msgstr "Commandes" diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv index 12683d6624e..642209edd05 100644 --- a/addons/auction/security/ir.model.access.csv +++ b/addons/auction/security/ir.model.access.csv @@ -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,0,0,0 +"access_report_buyer_auction2","report.buyer.auction2","model_report_buyer_auction2","base.group_user",1,0,0,0 +"access_report_seller_auction","report.seller.auction","model_report_seller_auction","base.group_user",1,0,0,0 +"access_report_seller_auction2","report.seller.auction2","model_report_seller_auction2","base.group_user",1,0,0,0 +"access_report_auction_view","report.auction.view","model_report_auction_view","base.group_user",1,0,0,0 +"access_report_auction_view2","report.auction.view2","model_report_auction_view2","base.group_user",1,0,0,0 +"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,0,0,0 +"access_report_auction_estimation_adj_category","report.auction.estimation.adj.category","model_report_auction_estimation_adj_category","base.group_user",1,0,0,0 +"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0 +"access_report_attendance","report.attendance","model_report_attendance","base.group_user",1,0,0,0 +"access_report_deposit_border","report.deposit.border","model_report_deposit_border","base.group_user",1,0,0,0 +"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0 +"access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,0,0,0 +"access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,0,0,0 diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 6fd1df8228e..2a6dc558963 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -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() diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 817135a8571..5cc819d8dea 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -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> diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv index f6605186bed..fdf7e700c3c 100644 --- a/addons/base_contact/security/ir.model.access.csv +++ b/addons/base_contact/security/ir.model.access.csv @@ -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 diff --git a/addons/base_iban/i18n/fr_FR.po b/addons/base_iban/i18n/fr_FR.po index 0b2162cce67..5c20bab3839 100644 --- a/addons/base_iban/i18n/fr_FR.po +++ b/addons/base_iban/i18n/fr_FR.po @@ -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 diff --git a/addons/base_module_publish/i18n/fr_FR.po b/addons/base_module_publish/i18n/fr_FR.po index bcea05d737e..b8e462790ec 100644 --- a/addons/base_module_publish/i18n/fr_FR.po +++ b/addons/base_module_publish/i18n/fr_FR.po @@ -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 diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 32e6a827e24..6e5160e5d98 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -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': diff --git a/addons/base_module_record/i18n/fr_FR.po b/addons/base_module_record/i18n/fr_FR.po index c2f62668404..532f86ae250 100644 --- a/addons/base_module_record/i18n/fr_FR.po +++ b/addons/base_module_record/i18n/fr_FR.po @@ -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" diff --git a/addons/base_report_creator/i18n/fr_FR.po b/addons/base_report_creator/i18n/fr_FR.po index a17e981949e..5237002fb22 100644 --- a/addons/base_report_creator/i18n/fr_FR.po +++ b/addons/base_report_creator/i18n/fr_FR.po @@ -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" diff --git a/addons/base_report_designer/i18n/fr_FR.po b/addons/base_report_designer/i18n/fr_FR.po index fdeb4fcac33..27aec6725d8 100644 --- a/addons/base_report_designer/i18n/fr_FR.po +++ b/addons/base_report_designer/i18n/fr_FR.po @@ -4,16 +4,32 @@ # 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: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 +msgid "Modify a report" +msgstr "Modifier un rapport" + +#. module: base_report_designer +#: wizard_view:base_report_designer.modify,init:0 +msgid "Report designer" +msgstr "Report Designer" + +#. 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_field:base_report_designer.modify,init,text:0 @@ -21,29 +37,31 @@ 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 -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é" - -#. module: base_report_designer -#: wizard_button:base_report_designer.modify,init,get_form:0 -msgid "Modify a report" -msgstr "Modifier un rapport" +#: wizard_view:base_report_designer.modify,get_form:0 +#: wizard_view:base_report_designer.modify,send_form:0 +msgid "Get a report" +msgstr "Recevoir un rapport" #. module: base_report_designer #: wizard_view:base_report_designer.modify,send_form_result:0 @@ -51,34 +69,22 @@ msgid "Your report has been modified." msgstr "Votre rapport a été modifié" #. 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 " - -#. 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 "" - -#. 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_view:base_report_designer.modify,get_form_result:0 -#: wizard_view:base_report_designer.modify,get_form:0 -#: wizard_view:base_report_designer.modify,send_form:0 -msgid "Get a report" -msgstr "Recevoir un rapport" +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 "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 "" +msgid "The .SXW report" +msgstr "Rapport .SXW" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form,get_form_result:0 @@ -86,24 +92,23 @@ 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" +#: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify +msgid "Modify an existing report" +msgstr "Modifier un Rapport Existant" #. 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" +#: 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 -#: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify -msgid "Modify an existing report" -msgstr "" +#: wizard_button:base_report_designer.modify,get_form_result,end:0 +#: wizard_button:base_report_designer.modify,send_form,end:0 +#: wizard_button:base_report_designer.modify,send_form_result,end:0 +msgid "Close" +msgstr "Fermer" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form,end:0 @@ -112,11 +117,9 @@ msgid "Cancel" msgstr "Annuler" #. module: base_report_designer -#: wizard_button:base_report_designer.modify,get_form_result,end:0 -#: wizard_button:base_report_designer.modify,send_form,end:0 -#: wizard_button:base_report_designer.modify,send_form_result,end:0 -msgid "Close" -msgstr "Fermer" +#: 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 @@ -124,12 +127,11 @@ 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" - -#. module: base_report_designer -#: wizard_view:base_report_designer.modify,init:0 -msgid "Report designer introduction" -msgstr "Introduction au report designer" - diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py index f8de1e6bfa8..d469ef9d072 100644 --- a/addons/base_setup/wizard/wizard_base_setup.py +++ b/addons/base_setup/wizard/wizard_base_setup.py @@ -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':{ diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml index d61201f93d8..d0f1de72732 100644 --- a/addons/base_vat/base_vat_data.xml +++ b/addons/base_vat/base_vat_data.xml @@ -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"/> diff --git a/addons/board/i18n/fr_FR.po b/addons/board/i18n/fr_FR.po index c11d01715bd..e88317f66d2 100644 --- a/addons/board/i18n/fr_FR.po +++ b/addons/board/i18n/fr_FR.po @@ -4,21 +4,23 @@ # 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-10 15:05:34+0000\n" +"PO-Revision-Date: 2008-09-10 15:05:34+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:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board #: constraint:ir.model:0 + msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" +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 @@ -28,7 +30,7 @@ msgstr "" #. module: board #: wizard_view:board.board.menu.create,init:0 msgid "Menu Information" -msgstr "" +msgstr "Menu Information" #. module: board #: model:ir.model,name:board.model_board_note @@ -44,12 +46,12 @@ msgstr "Note" #. module: board #: field:board.board.line,width:0 msgid "Width" -msgstr "" +msgstr "Largeur" #. module: board #: model:ir.ui.menu,name:board.menu_view_board_form msgid "Dashboard Definition" -msgstr "" +msgstr "Définition du Tableau de Bord" #. module: board #: field:board.note,user_id:0 @@ -65,12 +67,12 @@ msgstr "Publier une note" #. module: board #: field:board.board.line,name:0 msgid "Title" -msgstr "" +msgstr "Titre" #. module: board #: field:board.board,line_ids:0 msgid "Action Views" -msgstr "" +msgstr "Vues Action" #. module: board #: field:board.note,date:0 @@ -90,17 +92,17 @@ msgstr "Type de note" #. module: board #: wizard_view:board.board.menu.create,init:0 msgid "Create Menu For Dashboard" -msgstr "" +msgstr "Créer un Menu pour le Tableau de Bord" #. module: board #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: board #: wizard_field:board.board.menu.create,init,menu_parent_id:0 msgid "Parent Menu" -msgstr "" +msgstr "Menu Parent" #. module: board #: view:board.note:0 @@ -112,27 +114,27 @@ msgstr "Notes" #: field:board.board,name:0 #: view:board.board:0 msgid "Dashboard" -msgstr "" +msgstr "Tableau de bord" #. module: board #: field:board.board.line,action_id:0 msgid "Action" -msgstr "" +msgstr "Action" #. module: board #: field:board.board.line,position:0 msgid "Position" -msgstr "" +msgstr "Position" #. module: board #: model:ir.actions.act_window,name:board.dashboard_open msgid "Open Dashboard" -msgstr "" +msgstr "Ouvrir le Tableau de Bord" #. module: board #: wizard_field:board.board.menu.create,init,menu_name:0 msgid "Menu Name" -msgstr "" +msgstr "Nom du menu" #. module: board #: field:board.note,type:0 @@ -142,17 +144,17 @@ msgstr "Type de note" #. module: board #: selection:board.board.line,position:0 msgid "Left" -msgstr "" +msgstr "Gauche" #. module: board #: field:board.board,view_id:0 msgid "Board View" -msgstr "" +msgstr "Vue Tableau de Bord" #. module: board #: selection:board.board.line,position:0 msgid "Right" -msgstr "" +msgstr "Droit" #. module: board #: model:ir.ui.menu,name:board.next_id_50 @@ -162,7 +164,7 @@ msgstr "Configuration" #. module: board #: field:board.board.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Séquence" #. module: board #: model:ir.model,name:board.model_board_board_line @@ -177,28 +179,28 @@ msgstr "Tableaux de bord" #. module: board #: field:board.board.line,height:0 msgid "Height" -msgstr "" +msgstr "Hauteur" #. module: board #: model:ir.actions.wizard,name:board.wizard_board_create_menu msgid "Create Board Menu" -msgstr "" +msgstr "Créer un Menu Tableau" #. module: board #: wizard_button:board.board.menu.create,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: board #: view:board.board:0 msgid "Dashboard View" -msgstr "" +msgstr "Vue Tableau de Bord" #. module: board #: wizard_button:board.board.menu.create,init,create_menu:0 #: view:board.board:0 msgid "Create Menu" -msgstr "" +msgstr "Créer le menu" #. module: board #: field:board.note,name:0 diff --git a/addons/board_account/i18n/fr_FR.po b/addons/board_account/i18n/fr_FR.po index 5acba51297f..6f3e340eeee 100644 --- a/addons/board_account/i18n/fr_FR.po +++ b/addons/board_account/i18n/fr_FR.po @@ -1,19 +1,20 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_account # 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-10 15:05:35+0000\n" +"PO-Revision-Date: 2008-09-10 15:05: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-13 08:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_account #: view:board.board:0 @@ -28,7 +29,7 @@ msgstr "Factures brouillons" #. module: board_account #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: board_account #: model:ir.actions.act_window,name:board_account.open_board_account @@ -81,4 +82,3 @@ msgstr "Tableau de compte" #: view:board.board:0 msgid "Aged income" msgstr "Revenus âgés" - diff --git a/addons/board_association/i18n/fr_FR.po b/addons/board_association/i18n/fr_FR.po index 48438ade6fe..a97821e8b0a 100644 --- a/addons/board_association/i18n/fr_FR.po +++ b/addons/board_association/i18n/fr_FR.po @@ -1,57 +1,57 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_association # 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-10 15:05:35+0000\n" +"PO-Revision-Date: 2008-09-10 15:05: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-13 08:08+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_association #: model:ir.ui.menu,name:board_association.menu_board_associations_manager msgid "Associations" -msgstr "" +msgstr "Associations" #. module: board_association #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: board_association #: view:board.board:0 msgid "Association Dashboard" -msgstr "" +msgstr "Tableau de Bord Association" #. module: board_association #: view:board.board:0 msgid "My tasks" -msgstr "" +msgstr "Mes Tâches" #. module: board_association #: view:board.board:0 msgid "New members" -msgstr "" +msgstr "Nouveaux Membres" #. module: board_association #: view:board.board:0 msgid "Unpaid Invoices" -msgstr "" +msgstr "Factures impayées" #. module: board_association #: view:board.board:0 msgid "Next Events" -msgstr "" +msgstr "Prochains événements" #. module: board_association #: view:board.board:0 msgid "Registrations by Events" -msgstr "" - +msgstr "Inscriptions par événement" diff --git a/addons/board_auction/i18n/fr_FR.po b/addons/board_auction/i18n/fr_FR.po index dfac4ed8dbb..481f87b7553 100644 --- a/addons/board_auction/i18n/fr_FR.po +++ b/addons/board_auction/i18n/fr_FR.po @@ -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" diff --git a/addons/board_crm_configuration/i18n/fr_FR.po b/addons/board_crm_configuration/i18n/fr_FR.po index d67477414fc..dea2949f7f8 100644 --- a/addons/board_crm_configuration/i18n/fr_FR.po +++ b/addons/board_crm_configuration/i18n/fr_FR.po @@ -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" diff --git a/addons/board_manufacturing/i18n/fr_FR.po b/addons/board_manufacturing/i18n/fr_FR.po index 69b4ecf7ea9..8210f8fcb71 100644 --- a/addons/board_manufacturing/i18n/fr_FR.po +++ b/addons/board_manufacturing/i18n/fr_FR.po @@ -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" - diff --git a/addons/board_project/i18n/fr_FR.po b/addons/board_project/i18n/fr_FR.po index 038db6e99b5..45e6cae41ee 100644 --- a/addons/board_project/i18n/fr_FR.po +++ b/addons/board_project/i18n/fr_FR.po @@ -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,12 +24,12 @@ 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 @@ -36,19 +37,9 @@ 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" - diff --git a/addons/board_sale/i18n/fr_FR.po b/addons/board_sale/i18n/fr_FR.po index 7ea49db411e..7ea4f87c053 100644 --- a/addons/board_sale/i18n/fr_FR.po +++ b/addons/board_sale/i18n/fr_FR.po @@ -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" diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index 8932a7c2131..42a1f9113a9 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -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 diff --git a/addons/crm/i18n/fr_FR.po b/addons/crm/i18n/fr_FR.po index 01d2728c2b5..be36fca66ff 100644 --- a/addons/crm/i18n/fr_FR.po +++ b/addons/crm/i18n/fr_FR.po @@ -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,8 +140,12 @@ 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 @@ -143,22 +153,16 @@ 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 @@ -171,25 +175,19 @@ 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 @@ -755,12 +766,6 @@ 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)" msgstr "Facteur par défaut" @@ -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" - diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 9e73b1a0e84..aa91246e872 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -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> diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index afe76960dff..4e8284927d6 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -1,12 +1,15 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_crm_segmentation,crm.segmentation,model_crm_segmentation,crm.group_crm_manager,1,1,1,1 -access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,crm.group_crm_manager,1,1,1,1 -access_crm_case_section,crm.case.section,model_crm_case_section,crm.group_crm_user,1,0,0,0 -access_crm_case_categ,crm.case.categ,model_crm_case_categ,crm.group_crm_user,1,0,0,0 -access_crm_case_rule,crm.case.rule,model_crm_case_rule,crm.group_crm_user,1,0,0,0 -access_crm_case,crm.case,model_crm_case,crm.group_crm_user,1,1,1,1 -access_crm_case_log,crm.case.log,model_crm_case_log,crm.group_crm_user,1,1,1,1 -access_crm_case_history,crm.case.history,model_crm_case_history,crm.group_crm_user,1,1,1,1 -access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,crm.group_crm_manager,1,1,1,1 -access_crm_case_categ_manager,crm.case.categ.manager,model_crm_case_categ,crm.group_crm_manager,1,1,1,1 -access_crm_case_rule_manager,crm.case.rule.manager,model_crm_case_rule,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_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1 +"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1 +"access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0 +"access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0 +"access_crm_case_rule","crm.case.rule","model_crm_case_rule","crm.group_crm_user",1,0,0,0 +"access_crm_case_manger","crm.case manager","model_crm_case","crm.group_crm_user",1,1,1,1 +"access_crm_case","crm.case","model_crm_case","crm.group_crm_manager",1,1,1,1 +"access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1 +"access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1 +"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1 +"access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1 +"access_crm_case_rule_manager","crm.case.rule.manager","model_crm_case_rule","crm.group_crm_manager",1,1,1,1 +"access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1 +"access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1 diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 5b6f8e9de21..0f6ccf2cabf 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm", "process"], + "depends" : ["crm","report_crm", "process", "account"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", @@ -39,7 +39,8 @@ "crm_jobs_menu.xml", "crm_opportunity_menu.xml", "crm_helpdesk_menu.xml", "crm_lead_menu.xml", "crm_meeting_menu.xml", -# "process/crm_configuration_process.xml", + "security/ir.model.access.csv", + "process/crm_configuration_process.xml", ], "active": False, "installable": True diff --git a/addons/crm_configuration/i18n/fr_FR.po b/addons/crm_configuration/i18n/fr_FR.po index 5bb0a5c2efb..e5402882e8e 100644 --- a/addons/crm_configuration/i18n/fr_FR.po +++ b/addons/crm_configuration/i18n/fr_FR.po @@ -4,37 +4,38 @@ # 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-13 10: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" +"X-Launchpad-Export-Date: 2008-10-13 11:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all1 msgid "Bugs Waiting Approval" -msgstr "" +msgstr "Bugs en attente d'approbation" #. module: crm_configuration #: model:ir.model,name:crm_configuration.model_report_crm_case_section_categ_stage msgid "Cases by section, Category and stage" -msgstr "" +msgstr "Cas par section, catégorie et étape" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads msgid "Leads Tracking" -msgstr "" +msgstr "Suivi des affaires" #. module: crm_configuration #: view:crm.case:0 msgid "Title" -msgstr "" +msgstr "Titre" #. module: crm_configuration #: view:crm.case:0 @@ -45,82 +46,82 @@ msgstr "Ajouter le dernier courrier pour réponse" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_opp #: view:crm.case:0 msgid "Opportunities" -msgstr "" +msgstr "Opportunités" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor22 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor22 msgid "My Opportunities" -msgstr "" +msgstr "Mes opportunités" #. module: crm_configuration #: model:ir.model,name:crm_configuration.model_report_crm_case_section_categ2 msgid "Cases by section and category2" -msgstr "" +msgstr "Cas par section et catégorie2" #. module: crm_configuration #: view:crm.case:0 msgid "Leads Tree" -msgstr "" +msgstr "Arbre des affaires" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my3 msgid "My Bugs Not Fixed" -msgstr "" +msgstr "Mes bugs non fixés" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetall3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_meetall3 msgid "Next Deadlines" -msgstr "" +msgstr "Prochaine date d'échéance" #. module: crm_configuration #: view:crm.case:0 msgid "Meeting For Leads Generation" -msgstr "" +msgstr "Rendez-vous pour affaires" #. module: crm_configuration #: view:crm.case:0 msgid "Severity" -msgstr "" +msgstr "Sévérité" #. module: crm_configuration #: view:crm.case:0 msgid "Funds Form" -msgstr "" +msgstr "Recherche de fonds" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_user msgid "Cases by Leads and User" -msgstr "" +msgstr "Cas par affaire et utilisateur" #. module: crm_configuration #: view:crm.case:0 msgid "Campaign Type" -msgstr "" +msgstr "Type de campagne" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act11 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act11 msgid "My Jobs Requests" -msgstr "" +msgstr "Mes demandes d'emploi" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_user msgid "Cases by Opportunities and User" -msgstr "" +msgstr "Cas par opportunités et utilisateurs" #. module: crm_configuration #: field:crm.case.stage,name:0 msgid "Stage Name" -msgstr "" +msgstr "Nom de l'étape" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f7 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f7 msgid "Old Feature Requests" -msgstr "" +msgstr "Demande d'ancienne fonctionalité" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetall1 @@ -128,64 +129,64 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_meetall1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_meetmy1 msgid "Draft Meetings" -msgstr "" +msgstr "Rendez-vous brouillon" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor msgid "New Opportunity" -msgstr "" +msgstr "Nouvelle opportunité" #. module: crm_configuration #: field:crm.case,partner_mobile:0 msgid "Mobile" -msgstr "" +msgstr "Portable" #. module: crm_configuration #: view:crm.case:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: crm_configuration #: view:crm.case:0 msgid "Opportunities Form" -msgstr "" +msgstr "Forumlaire opportunités" #. module: crm_configuration #: view:crm.case:0 msgid "Amount" -msgstr "" +msgstr "Montant" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_meet_my msgid "My Meetings" -msgstr "" +msgstr "Mes rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Lead Source" -msgstr "" +msgstr "Source de l'affaire" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act111 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act111 msgid "All Jobs Requests" -msgstr "" +msgstr "Toutes les demandes d'emploi" #. module: crm_configuration #: view:crm.case:0 msgid "Expected Salary" -msgstr "" +msgstr "Salaire demandé" #. module: crm_configuration #: view:crm.case:0 msgid "Applied Job" -msgstr "" +msgstr "Job postulé" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all2 msgid "All Draft Leads" -msgstr "" +msgstr "Toutes les affaires draft" #. module: crm_configuration #: field:report.crm.case.section.categ2,nbr:0 @@ -193,48 +194,48 @@ msgstr "" #: field:report.crm.case.section.categ.stage,nbr:0 #: field:report.crm.case.section.stage,nbr:0 msgid "# of Cases" -msgstr "" +msgstr "# de cas" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_act0 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_act0 msgid "All Bugs" -msgstr "" +msgstr "Tous les bugs" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree_month #: view:report.crm.case.section.categ2:0 msgid "Cases by Section and Category2" -msgstr "" +msgstr "Cas par section et catégorie2" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my3 msgid "My Open Leads" -msgstr "" +msgstr "Mes affaires ouvertes" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my0 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my0 msgid "My Bugs" -msgstr "" +msgstr "Mes bugs" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetings #: view:crm.case:0 msgid "Meetings" -msgstr "" +msgstr "Rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Refuse Job" -msgstr "" +msgstr "Refuser Emploi" #. module: crm_configuration #: field:crm.case.category2,name:0 msgid "Case Category2 Name" -msgstr "" +msgstr "Catégorie des cas2" #. module: crm_configuration #: view:crm.case:0 @@ -245,19 +246,19 @@ msgstr "Infos sur l'action" #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs2 msgid "My Jobs Propositions to Review" -msgstr "" +msgstr "Mes propositions d'emploi à revoir" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my msgid "My Leads" -msgstr "" +msgstr "Mes affaires" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor1 msgid "All Open Opportunities" -msgstr "" +msgstr "Toutes les opportunités ouvertes" #. module: crm_configuration #: view:crm.case:0 @@ -275,37 +276,37 @@ msgstr "Infos" #: selection:report.crm.case.section.categ.stage,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my1 msgid "My Open Bugs" -msgstr "" +msgstr "Mes bugs ouverts" #. module: crm_configuration #: field:crm.case.category2,section_id:0 #: field:crm.case.stage,section_id:0 msgid "Case Section" -msgstr "" +msgstr "Section du cas" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all5 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all5 msgid "All Cancelled Leads" -msgstr "" +msgstr "Toutes les affaires annulées" #. module: crm_configuration #: view:crm.case:0 msgid "Proposed Salary" -msgstr "" +msgstr "Salaire proposé" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_stage_tree #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_stage_tree_month #: view:report.crm.case.section.stage:0 msgid "Cases by Section and Stage" -msgstr "" +msgstr "Cas par section et étape" #. module: crm_configuration #: field:report.crm.case.section.categ2,section_id:0 @@ -313,7 +314,7 @@ msgstr "" #: field:report.crm.case.section.categ.stage,section_id:0 #: field:report.crm.case.section.stage,section_id:0 msgid "Section" -msgstr "" +msgstr "Section" #. module: crm_configuration #: view:crm.case:0 @@ -324,12 +325,12 @@ msgstr "Dates" #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f4 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f4 msgid "Pending Feature Requests" -msgstr "" +msgstr "Demande de fonctionnalités en attente" #. module: crm_configuration #: view:crm.case:0 msgid "Priority" -msgstr "" +msgstr "Priorité" #. module: crm_configuration #: field:report.crm.case.section.categ2,state:0 @@ -337,17 +338,17 @@ msgstr "" #: field:report.crm.case.section.categ.stage,state:0 #: field:report.crm.case.section.stage,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: crm_configuration #: view:crm.case:0 msgid "Version" -msgstr "" +msgstr "Version" #. module: crm_configuration #: view:crm.case:0 msgid "Location" -msgstr "" +msgstr "Emplacement" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ_categ2 @@ -356,63 +357,63 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_categ2_tree_month #: view:report.crm.case.section.categ.categ2:0 msgid "Cases by Section, Category and Category2" -msgstr "" +msgstr "Cas par section, catégorie et catégorie2" #. module: crm_configuration #: view:crm.case:0 msgid "Payment Mode" -msgstr "" +msgstr "Mode de paiement" #. module: crm_configuration #: field:report.crm.case.section.categ2,category2_id:0 #: field:report.crm.case.section.categ.categ2,category2_id:0 #: view:crm.case:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: crm_configuration #: view:crm.case:0 msgid "Email" -msgstr "" +msgstr "Email" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_stage msgid "Cases by Leads and Stage" -msgstr "" +msgstr "Cas par affaire et étape" #. module: crm_configuration #: view:crm.case:0 msgid "Meeting" -msgstr "" +msgstr "Rendez-vous" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs1 msgid "My Pending Jobs Requests" -msgstr "" +msgstr "Mes demandes d'emplois en attente" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my2 msgid "My Draft Leads" -msgstr "" +msgstr "Mes affaires en brouillon" #. module: crm_configuration #: model:ir.model,name:crm_configuration.model_report_crm_case_section_categ_categ2 msgid "Cases by section, Category and Category2" -msgstr "" +msgstr "Cas par section, catégorie et catégorie2" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all2 msgid "Open Bugs" -msgstr "" +msgstr "Bugs ouverts" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f3 msgid "Open Feature Requests" -msgstr "" +msgstr "Demande de fonctionnalités ouvertes" #. module: crm_configuration #: field:crm.case,stage_id:0 @@ -421,22 +422,22 @@ msgstr "" #: field:report.crm.case.section.categ.stage,stage_id:0 #: field:report.crm.case.section.stage,stage_id:0 msgid "Stage" -msgstr "" +msgstr "Étape" #. module: 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: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ msgid "Cases by Opportunities and Category2" -msgstr "" +msgstr "Cas par Opportunité et Catégorie2" #. module: crm_configuration #: field:crm.case,partner_name2:0 msgid "Employee Email" -msgstr "" +msgstr "Email de l'Employé" #. module: crm_configuration #: view:crm.case:0 @@ -447,27 +448,27 @@ msgstr "" #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all2 msgid "All Jobs Propositions" -msgstr "" +msgstr "Toutes les Propositions d'Emploi" #. module: crm_configuration #: view:crm.case:0 msgid "Contact" -msgstr "" +msgstr "Contact" #. module: crm_configuration #: field:crm.case,category2_id:0 msgid "Category Name" -msgstr "" +msgstr "Nom de la catégorie" #. module: crm_configuration #: view:crm.case:0 msgid "Cancel Meeting" -msgstr "" +msgstr "Annuler le Rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Resolution history" -msgstr "" +msgstr "Historique de la Résolution" #. module: crm_configuration #: view:crm.case:0 @@ -478,12 +479,12 @@ msgstr "Références" #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my2 msgid "My Bugs With Patches" -msgstr "" +msgstr "Mes Bugs avec Patches" #. module: crm_configuration #: view:crm.case:0 msgid "Bug Tracker Form" -msgstr "" +msgstr "Formulaire de Rapport de Bug" #. module: crm_configuration #: view:crm.case:0 @@ -494,12 +495,12 @@ msgstr "Estimer" #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all1 msgid "All Pending Jobs Requests" -msgstr "" +msgstr "Toutes les Demandes d'Emploi" #. module: crm_configuration #: view:crm.case:0 msgid "Funds Tree" -msgstr "" +msgstr "Arbre des Fonds" #. module: crm_configuration #: field:report.crm.case.section.categ2,name:0 @@ -507,14 +508,14 @@ msgstr "" #: field:report.crm.case.section.categ.stage,name:0 #: field:report.crm.case.section.stage,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead #: view:crm.case:0 msgid "Leads" -msgstr "" +msgstr "Affaires" #. module: crm_configuration #: selection:report.crm.case.section.categ2,state:0 @@ -522,12 +523,12 @@ msgstr "" #: selection:report.crm.case.section.categ.stage,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulé" #. module: crm_configuration #: view:crm.case:0 msgid "Job Info" -msgstr "" +msgstr "Information sur l'Emploi" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetall2 @@ -535,41 +536,41 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_meetall2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_meetmy2 msgid "Confirmed Meetings" -msgstr "" +msgstr "Rendez-vous Confirmés" #. module: crm_configuration #: view:crm.case:0 msgid "Funds" -msgstr "" +msgstr "Fonds" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor_my2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor_my2 msgid "My Pending Opportunities" -msgstr "" +msgstr "Mes Opportunités en Attente" #. module: crm_configuration #: view:crm.case:0 msgid "Jobs - Recruitment Tree" -msgstr "" +msgstr "Arbre des Emplois - Recrutements" #. module: crm_configuration #: view:crm.case:0 msgid "Jobs Description" -msgstr "" +msgstr "Description de l'Emploi" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all0 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all0 msgid "All Open Jobs Requests" -msgstr "" +msgstr "Toutes les Demandes d'Emploi Ouvertes" #. module: crm_configuration #: field:report.crm.case.section.categ.categ2,categ_id:0 #: field:report.crm.case.section.categ.stage,categ_id:0 #: field:report.crm.case.section.stage,categ_id:0 msgid "Category" -msgstr "" +msgstr "Catégorie" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ_stage @@ -578,19 +579,19 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_stage_tree_month #: view:report.crm.case.section.categ.stage:0 msgid "Cases by Section, Category and Stage" -msgstr "" +msgstr "Cas par section catégorie et étape" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all1 msgid "All Unclosed Leads" -msgstr "" +msgstr "Toutes les Affaires Non Fermées" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f0 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_f0 msgid "All Feature Request" -msgstr "" +msgstr "Toutes les Demandes de Fonctionalités" #. module: crm_configuration #: view:crm.case:0 @@ -600,7 +601,7 @@ msgstr "Faire une historique" #. module: crm_configuration #: field:crm.case,note:0 msgid "Note" -msgstr "" +msgstr "Note" #. module: crm_configuration #: field:report.crm.case.section.categ2,delay_close:0 @@ -608,13 +609,13 @@ msgstr "" #: field:report.crm.case.section.categ.stage,delay_close:0 #: field:report.crm.case.section.stage,delay_close:0 msgid "Delay Close" -msgstr "" +msgstr "Delai de fermeture" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all4 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all4 msgid "All Pending Leads" -msgstr "" +msgstr "Toutes les Affaires en Attente" #. module: crm_configuration #: selection:report.crm.case.section.categ2,state:0 @@ -622,19 +623,19 @@ msgstr "" #: selection:report.crm.case.section.categ.stage,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Closed" -msgstr "" +msgstr "Fermé" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all4 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all4 msgid "Bugs Not Fixed" -msgstr "" +msgstr "Bugs Non Clos" #. module: crm_configuration #: field:crm.case,partner_name:0 #: view:crm.case:0 msgid "Employee Name" -msgstr "" +msgstr "Nom de l'Employé" #. module: crm_configuration #: selection:report.crm.case.section.categ2,state:0 @@ -648,7 +649,7 @@ msgstr "En attente" #. module: crm_configuration #: view:crm.case:0 msgid "Status" -msgstr "" +msgstr "État" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all6 @@ -656,17 +657,17 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all6 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f5 msgid "Planned For Future Release" -msgstr "" +msgstr "Plannifié pour une Sortie Prochaine" #. module: crm_configuration #: view:crm.case:0 msgid "Degree" -msgstr "" +msgstr "Degré" #. module: crm_configuration #: view:crm.case:0 msgid "Meetings Tree" -msgstr "" +msgstr "Arbre des Rendez-vous" #. module: crm_configuration #: view:crm.case:0 @@ -676,24 +677,24 @@ msgstr "Escalader" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_meet msgid "All Meetings" -msgstr "" +msgstr "Tous les Rendez-vous" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all3 msgid "All Open Leads" -msgstr "" +msgstr "Toutes les Affaires Ouvertes" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f2 msgid "Feature Requests Waiting Approval" -msgstr "" +msgstr "Demande de Fonctionnalités en Attende de Confirmation" #. module: crm_configuration #: field:crm.case,partner_phone:0 msgid "Phone" -msgstr "" +msgstr "Téléphone" #. module: crm_configuration #: field:report.crm.case.section.categ2,user_id:0 @@ -701,62 +702,62 @@ msgstr "" #: field:report.crm.case.section.categ.stage,user_id:0 #: field:report.crm.case.section.stage,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ msgid "Cases by Leads and Category2" -msgstr "" +msgstr "Cas par Affaire et Catégorie2" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my0 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs0 msgid "My Open Jobs Requests" -msgstr "" +msgstr "Mes Demandes d'Emploi Ouvertes" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all5 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all5 msgid "Pending Bugs" -msgstr "" +msgstr "Bugs en Attente" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor_all2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor_all2 msgid "All Pending Opportunities" -msgstr "" +msgstr "Toutes les Opportunités en Attente" #. module: crm_configuration #: view:crm.case:0 msgid "Bugs" -msgstr "" +msgstr "Bugs" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my6 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_leads_my6 msgid "Calendar Of My Leads Meetings" -msgstr "" +msgstr "Calendrier des mes Rendez-vous d'Affaire" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all3 msgid "All Unclosed Requests" -msgstr "" +msgstr "Toutes les Demandes Non Fermées" #. module: crm_configuration #: view:crm.case:0 msgid "Jobs - Recruitment Form" -msgstr "" +msgstr "Formulaire Emplois - Recrutement" #. module: crm_configuration #: view:crm.case:0 msgid "Deadlines" -msgstr "" +msgstr "Dates Limites" #. module: crm_configuration #: view:crm.case:0 msgid "Resolution" -msgstr "" +msgstr "Résolution" #. module: crm_configuration #: view:crm.case:0 @@ -772,23 +773,23 @@ msgstr "" #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_act_new #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_act_new msgid "New Bug" -msgstr "" +msgstr "Nouveau Bug" #. module: crm_configuration #: model:ir.model,name:crm_configuration.model_crm_case_stage msgid "Stage of case" -msgstr "" +msgstr "Etape des cas" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my1 msgid "My Unclosed Leads" -msgstr "" +msgstr "Mes Affaires Non Fermées" #. module: crm_configuration #: model:ir.model,name:crm_configuration.model_report_crm_case_section_stage msgid "Cases by section and stage" -msgstr "" +msgstr "Cas par section et étape" #. module: crm_configuration #: view:crm.case:0 @@ -798,7 +799,7 @@ msgstr "Général" #. module: crm_configuration #: view:crm.case:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: crm_configuration #: view:crm.case:0 @@ -814,7 +815,7 @@ msgstr "Annuler" #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor11 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor11 msgid "All Opportunities" -msgstr "" +msgstr "Toutes les Opportunités" #. module: crm_configuration #: selection:report.crm.case.section.categ2,state:0 @@ -823,23 +824,26 @@ msgstr "" #: selection:report.crm.case.section.stage,state:0 #: view:crm.case:0 msgid "Open" -msgstr "Ouvrir" +msgstr "Ouvert" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all6 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all6 msgid "Calendar Of All Leads Meetings" -msgstr "" +msgstr "Calendrier de Tous les Rendez-vous d'Affaire" #. module: crm_configuration #: view:crm.case:0 msgid "Meetings Form" -msgstr "" +msgstr "Formulaire de Rendez-vous" #. module: crm_configuration #: 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_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all7 @@ -847,103 +851,103 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all7 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f6 msgid "Waiting For Reporter Response" -msgstr "" +msgstr "En Attente d'une réponse du Rapporteur" #. module: crm_configuration #: view:crm.case:0 msgid "Responsible" -msgstr "" +msgstr "Responsable" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_stage msgid "Cases by Opportunities and Stage" -msgstr "" +msgstr "Cas par opportunités et étape" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all msgid "All Leads" -msgstr "" +msgstr "Toutes les Affaires" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor2 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor2 msgid "My Open Opportunities" -msgstr "" +msgstr "Mes Opportunités Ouvertes" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all3 msgid "Bugs With Patches Waiting Approval" -msgstr "" +msgstr "Bugs avec Patches en Attente d'approbation" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my5 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my5 msgid "My Cancelled Leads" -msgstr "" +msgstr "Mes Cas Annulés" #. module: crm_configuration #: view:crm.case:0 msgid "Designation" -msgstr "" +msgstr "Désignation" #. module: crm_configuration #: view:crm.case:0 msgid "Meeting Duration" -msgstr "" +msgstr "Durée du Rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Internal Notes" -msgstr "" +msgstr "Notes Internes" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my3 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs3 msgid "My Unclosed Requests" -msgstr "" +msgstr "Mes Demandes Non Fermées" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_meetings msgid "Calendar of Meetings" -msgstr "" +msgstr "Calendrier des Rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Leads Form" -msgstr "" +msgstr "Fomrulaire des Affaires" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_job_req_main msgid "Jobs Requests" -msgstr "" +msgstr "Demandes d'Emplois" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor msgid "Opportunity" -msgstr "" +msgstr "Opportunité" #. module: crm_configuration #: view:crm.case:0 msgid "Availability (weeks)" -msgstr "" +msgstr "Disponibilité (semaines)" #. module: crm_configuration #: view:crm.case:0 msgid "Opportunities Tree" -msgstr "" +msgstr "Arbre des Opportunités" #. module: crm_configuration #: view:crm.case:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: crm_configuration #: view:crm.case:0 msgid "Sales Stage" -msgstr "" +msgstr "Etape de vente" #. module: crm_configuration #: view:crm.case:0 @@ -953,33 +957,33 @@ msgstr "Envoi le partenaire et ajoute à l'historique" #. module: crm_configuration #: view:crm.case:0 msgid "Funds by Categories" -msgstr "" +msgstr "Fonds par Catégorie" #. module: crm_configuration #: view:crm.case:0 msgid "Next Meeting" -msgstr "" +msgstr "Prochain Rendez-vous" #. module: crm_configuration #: view:crm.case:0 msgid "Meeting With Future Employees" -msgstr "" +msgstr "Rendez-vous avec les Futurs Employés" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all8 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all8 msgid "Old Bugs" -msgstr "" +msgstr "Anciens Bugs" #. module: crm_configuration #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_bug_track msgid "Bug Tracking" -msgstr "" +msgstr "Suivi des Bugs" #. module: crm_configuration #: view:crm.case:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_alljobs @@ -987,12 +991,12 @@ msgstr "" #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_alljobs #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_myjobs msgid "Calendar Of Jobs Meetings" -msgstr "" +msgstr "Calendrier des Rendez-vous d'Emploi" #. module: crm_configuration #: view:crm.case:0 msgid "Quality" -msgstr "" +msgstr "Qualité" #. module: crm_configuration #: view:crm.case:0 @@ -1002,22 +1006,21 @@ msgstr "Actions" #. module: crm_configuration #: field:crm.case,duration:0 msgid "Duration" -msgstr "" +msgstr "Durée" #. module: crm_configuration #: view:crm.case:0 msgid "Bugs Tree" -msgstr "" +msgstr "Arbre des Bugs" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f1 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_f1 msgid "New Feature Request" -msgstr "" +msgstr "Nouvelle Demande de Fonctionalité" #. module: crm_configuration #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my4 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my4 msgid "My Pending Leads" -msgstr "" - +msgstr "Mes Affaires en Attente" diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml new file mode 100644 index 00000000000..b7fa5202017 --- /dev/null +++ b/addons/crm_configuration/process/crm_configuration_process.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <!-- + Process + --> + + <record id="process_process_contractworkflow0" model="process.process"> + <field eval=""""Contracts flow for services companies."""" name="note"/> + <field eval="1" name="active"/> + <field eval=""""Contract Workflow"""" name="name"/> + </record> + + <!-- + Process Node + --> + + <record id="process_node_leads0" model="process.node"> + <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_leads_all"/> + <field name="model_id" ref="crm.model_crm_case"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Leads"""" name="name"/> + <field eval=""""Premier Contact Leads"""" name="note"/> + <field name="process_id" ref="process_process_contractworkflow0"/> + <field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_opportunities0" model="process.node"> + <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_oppor11"/> + <field name="model_id" ref="crm.model_crm_case"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Opportunities"""" name="name"/> + <field eval=""""Business Opportunities"""" name="note"/> + <field name="process_id" ref="process_process_contractworkflow0"/> + <field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_accord0" model="process.node"> + <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_leads_all"/> + <field name="model_id" ref="crm.model_crm_case"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Accord"""" name="name"/> + <field eval=""""Accord Client Contract"""" name="note"/> + <field name="process_id" ref="process_process_contractworkflow0"/> + <field eval=""""object.state=='done'"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_contractanalytic0" model="process.node"> + <field name="menu_id" ref="account.account_analytic_def_account"/> + <field name="model_id" ref="account.model_account_analytic_account"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Contract Analytic"""" name="name"/> + <field eval=""""Analytic accounts"""" name="note"/> + <field name="process_id" ref="process_process_contractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_contractpricelist0" model="process.node"> + <field name="menu_id" ref="product.menu_product_pricelist_action2"/> + <field name="model_id" ref="product.model_product_pricelist"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Contract Pricelist"""" name="name"/> + <field eval=""""Contract Volume (pricelist)"""" name="note"/> + <field name="process_id" ref="process_process_contractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <!-- + Process Transition + --> + + <record id="process_transition_leadopportunity0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Lead Opportunity"""" name="name"/> + <field eval=""""Creating business opportunities from leads"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/> + <field model="process.node" name="source_node_id" ref="process_node_leads0"/> + </record> + + <record id="process_transition_opportunitiesaccord0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Opportunities Accord"""" name="name"/> + <field eval=""""When leads are confirmed"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_accord0"/> + <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/> + </record> + + <record id="process_transition_accordanalytic0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Accord Analytic"""" name="name"/> + <field eval=""""Goes into the Analytic"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/> + <field model="process.node" name="source_node_id" ref="process_node_accord0"/> + </record> + + <record id="process_transition_accordpricelist0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Accord Pricelist"""" name="name"/> + <field eval=""""Goes into the Pricelist"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/> + <field model="process.node" name="source_node_id" ref="process_node_accord0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/crm_configuration/security/ir.model.access.csv b/addons/crm_configuration/security/ir.model.access.csv index 2697ccbdfe1..fd579c8cef4 100644 --- a/addons/crm_configuration/security/ir.model.access.csv +++ b/addons/crm_configuration/security/ir.model.access.csv @@ -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 diff --git a/addons/crm_profiling/i18n/fr_FR.po b/addons/crm_profiling/i18n/fr_FR.po index 42628f8d217..f07f644538b 100644 --- a/addons/crm_profiling/i18n/fr_FR.po +++ b/addons/crm_profiling/i18n/fr_FR.po @@ -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" diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv index 5b8fcad458e..a52b8fd4e7b 100644 --- a/addons/crm_profiling/security/ir.model.access.csv +++ b/addons/crm_profiling/security/ir.model.access.csv @@ -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 diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 07dec155ddf..a29fdde7ac8 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -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> diff --git a/addons/delivery/i18n/fr_FR.po b/addons/delivery/i18n/fr_FR.po index cb61f1b3c61..e91d7302733 100644 --- a/addons/delivery/i18n/fr_FR.po +++ b/addons/delivery/i18n/fr_FR.po @@ -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,18 +23,16 @@ 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 @@ -41,19 +40,14 @@ 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 @@ -61,20 +55,9 @@ 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 @@ -82,44 +65,31 @@ 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 @@ -140,11 +110,6 @@ 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" msgstr "Grille" @@ -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 @@ -207,11 +174,6 @@ 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" msgstr "Pays" @@ -246,6 +208,11 @@ 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" msgstr "Fixe" @@ -261,15 +228,9 @@ 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 @@ -331,31 +293,11 @@ 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" msgstr "Transporteur" @@ -367,12 +309,6 @@ 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" - diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv index b69c00a80aa..948a85c35c7 100644 --- a/addons/delivery/security/ir.model.access.csv +++ b/addons/delivery/security/ir.model.access.csv @@ -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 diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index d76b711e8d8..5ac19b1c0e4 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -83,23 +83,14 @@ class stock_picking(osv.osv): account_id = picking.carrier_id.product_id.categ_id\ .property_account_income_categ.id - taxes = self.pool.get('account.tax').browse(cursor, user, - [x.id for x in picking.carrier_id.product_id.taxes_id]) - taxep = None + taxes = picking.carrier_id.product_id.taxes_id + partner_id=picking.address_id.partner_id and picking.address_id.partner_id.id or False + taxes_ids = [x.id for x in picking.carrier_id.product_id.taxes_id] 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) - if not taxep or not taxep.id: - taxes_ids = [x.id for x in picking.carrier_id.product_id.taxes_id] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - taxes_ids = res5 - + partner = picking.address_id.partner_id + account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id) + taxes_ids = self.pool.get('account.fiscal.position').map_tax(cursor, user, partner, taxes) invoice_line_obj.create(cursor, user, { 'name': picking.carrier_id.name, diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py index 54a48f4ac54..ca630ddcf4f 100644 --- a/addons/delivery/wizard/delivery_sale_order.py +++ b/addons/delivery/wizard/delivery_sale_order.py @@ -68,23 +68,9 @@ def _delivery_set(self, cr, uid, data, context): grid_obj=pooler.get_pool(cr.dbname).get('delivery.grid') grid = grid_obj.browse(cr, uid, [grid_id])[0] - taxes = pooler.get_pool(cr.dbname).get('account.tax').browse(cr, uid, - [x.id for x in grid.carrier_id.product_id.taxes_id]) - 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) - if not taxep or not taxep.id: - taxes_ids = [x.id for x in grid.carrier_id.product_id.taxes_id] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - taxes_ids = res5 - + taxes = grid.carrier_id.product_id.taxes_id + taxes_ids = pooler.get_pool(cr.dbname).get('account.fiscal.position').map_tax(cr, uid, order.partner_id, taxes) + line_obj.create(cr, uid, { 'order_id': order.id, 'name': grid.carrier_id.name, diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index 0e1c845cff6..aafdbebdb1a 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -12,9 +12,14 @@ * User Authentification * Document Indexation """, - "depends" : ["base", "process"], + "depends" : ["base", "process", "hr"], "init_xml" : ["document_data.xml"], - "update_xml" : ["document_view.xml"], + "update_xml" : [ + "document_view.xml", + "security/document_security.xml", + "security/ir.model.access.csv", + "process/document_process.xml" + ], "demo_xml" : ["document_demo.xml"], "active": False, "installable": True diff --git a/addons/document/document.py b/addons/document/document.py index deb830a6d7c..d7904d31285 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -1,7 +1,9 @@ -############################################################################# +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # -# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers <fp@tiny.Be> +# $Id$ # # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential @@ -597,8 +599,8 @@ class document_file(osv.osv): return super(document_file, self).unlink(cr, uid, ids, context) document_file() -class auto_configuration(osv.osv_memory): - _name='auto.configuration' +class document_configuration_wizard(osv.osv_memory): + _name='document.configuration.wizard' _rec_name = 'Auto Directory configuration' _columns = { } @@ -687,4 +689,4 @@ class auto_configuration(osv.osv_memory): doc_obj.create(cr,uid,res) return True -auto_configuration()
\ No newline at end of file +document_configuration_wizard() diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index dfc3cc4c85a..6b15382af63 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -67,11 +67,13 @@ <field name="res_model">document.directory</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - </record> + </record> + <menuitem name="Configuration" id="menu_document_configuration" parent="menu_document"/> <menuitem - name="Document Management/Configuration/Directories" + name="Directories" action="action_document_directory_form" - id="menu_document_directories"/> + id="menu_document_directories" + parent="menu_document_configuration"/> <record model="ir.actions.act_window" id="action_document_directory_tree"> <field name="type">ir.actions.act_window</field> @@ -80,9 +82,10 @@ <field name="domain">[('ressource_parent_type_id','=',False),('parent_id','=',False)]</field> </record> <menuitem - name="Document Management/Directorie's Structure" + name="Directorie's Structure" action="action_document_directory_tree" - id="menu_document_directories_tree"/> + id="menu_document_directories_tree" + parent="menu_document"/> <record model="ir.ui.view" id="view_document_file_form"> @@ -141,9 +144,10 @@ <field name="view_type">form</field> </record> <menuitem - name="Document Management/Search a File" + name="Search a File" action="action_document_file_form" - id="menu_document_files"/> + id="menu_document_files" + parent="menu_document"/> <record model="ir.actions.act_window" id="action_document_file_directory_form"> <field name="type">ir.actions.act_window</field> @@ -201,21 +205,31 @@ <record id="view_auto_config_form" model="ir.ui.view"> <field name="name">Auto Configure Directory</field> - <field name="model">auto.configuration</field> + <field name="model">document.configuration.wizard</field> <field name="type">form</field> <field name="arch" type="xml"> <form string="Auto Configure"> - <label string="" colspan="2"/> + <separator string="Connect to Document Management System." colspan="4"/> + <label align="0.0" string="You can use ftp://admin:admin@localhost:8021 " colspan="4"/> + <separator string="Configure Ressources Directory :" colspan="4"/> <newline/> - <label string="Do you want to configure Directory Automatically ?" colspan="2"/> + <label string="'All Sales Order' -> sale.order" align="0.0" colspan="4"/> + <label string="'Sales by Salesman' -> res.users" align="0.0" colspan="4"/> + <label string="'Personnal Folders' -> res.users" align="0.0" colspan="4"/> + <label string="'Projects' -> account.analytic.account with ressource tree" align="0.0" colspan="4"/> + <separator string="New Directories." colspan="4"/> + <label string="'Sales' -> sale.order which is link directory of 'res.users' model" align="0.0" colspan="4"/> + <label align="0.0" string="'Quotation','Meetings','Analysis Reports' -> static directories which are link directories of 'account.analytic.account' model" colspan="4"/> <newline/> <newline/> + <separator string="" colspan="4"/> + <label string="" colspan="2"/> <group col="4" colspan="2"> <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/> <button name="action_config" string="Configure" icon='gtk-ok' type="object"/> </group> <newline/> - <label string="You Can use ftp://admin:admin@localhost:8021 " colspan="2"/> + </form> </field> </record> @@ -223,7 +237,7 @@ <record id="action_config_auto_directory" model="ir.actions.act_window"> <field name="name">Auto Configure Directory</field> <field name="type">ir.actions.act_window</field> - <field name="res_model">auto.configuration</field> + <field name="res_model">document.configuration.wizard</field> <field name="view_type">form</field> <field name="view_mode">form</field> <field name="target">new</field> @@ -232,6 +246,7 @@ <record model="ir.actions.todo" id="config_auto_directory"> <field name="name">Auto Configure Directory</field> + <field name="note">This wizard will be configure directory for ressource model.</field> <field name="action_id" ref="action_config_auto_directory"/> <field name="state">open</field> </record> diff --git a/addons/document/process/document_process.xml b/addons/document/process/document_process.xml new file mode 100644 index 00000000000..3c37c793ab4 --- /dev/null +++ b/addons/document/process/document_process.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="process_node_papers0" model="process.node"> + <field name="menu_id" ref="document.menu_document_directories"/> + <field name="model_id" ref="document.model_document_directory"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Papers"""" name="name"/> + <field eval=""""Employee get papers and matrieal"""" name="note"/> + <field name="process_id" ref="hr.process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_transition_papersandmaterials0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Papers and materials"""" name="name"/> + <field eval=""""Employee get papers and necessary materials"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_papers0"/> + <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml new file mode 100644 index 00000000000..4cef19d31ed --- /dev/null +++ b/addons/document/security/document_security.xml @@ -0,0 +1,14 @@ +<?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> + + <record id="menu_document_configuration" model="ir.ui.menu"> + <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/> + </record> + +</data> +</openerp> diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv new file mode 100644 index 00000000000..dfe882e49d8 --- /dev/null +++ b/addons/document/security/ir.model.access.csv @@ -0,0 +1,9 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0 +"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1 +"access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1 +"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0 +"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1 +"access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1 +"access_document_configuation_wizard","document.configuration.wizard document manager","model_document_configuration_wizard","group_document_manager",1,1,1,1 +"access_document_configuation_wizard_sytem","document.configuration.wizard group system","model_document_configuration_wizard","base.group_system",1,1,1,1 diff --git a/addons/event/i18n/fr_FR.po b/addons/event/i18n/fr_FR.po index e4f3d91286c..7e17a0929c6 100644 --- a/addons/event/i18n/fr_FR.po +++ b/addons/event/i18n/fr_FR.po @@ -4,113 +4,114 @@ # 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:31+0000\n" +"PO-Revision-Date: 2008-10-13 11:02+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:24+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: event #: field:event.event,date_end:0 #: field:report.event.registration,date_end:0 msgid "Ending date" -msgstr "" +msgstr "Date de Fin" #. module: event #: field:event.event,register_min:0 msgid "Minimum Registrations" -msgstr "" +msgstr "Inscriptions Minimum" #. module: event #: model:ir.model,name:event.model_event_registration msgid "Event Registration" -msgstr "" +msgstr "Inscription de l'Évenement" #. module: event #: model:ir.actions.wizard,name:event.event_reg_invoice msgid "Make Invoice" -msgstr "" +msgstr "Créer facture" #. module: event #: field:report.event.type.registration,draft_state:0 msgid "Draft Registrations" -msgstr "" +msgstr "Inscriptions Brouillon" #. module: event #: view:report.event.registration:0 msgid "Event on Registration" -msgstr "" +msgstr "Évènement à l'Inscription" #. module: event #: wizard_button:event.reg_make_invoice,init,end:0 #: wizard_button:event.project,init,done:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: event #: field:event.registration,partner_invoice_id:0 msgid "Partner Invoice" -msgstr "" +msgstr "Facture Partenaire" #. module: event #: model:ir.actions.act_window,name:event.action_registration #: model:ir.actions.wizard,name:event.wizard_event_registration #: view:event.event:0 msgid "Registrations" -msgstr "" +msgstr "Inscriptions" #. module: event #: wizard_field:event.project,init,project_id:0 #: model:ir.actions.wizard,name:event.event_wiz #: field:event.event,project_id:0 msgid "Project" -msgstr "" +msgstr "Projet" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_rejected:0 msgid "Invoice Rejected" -msgstr "" +msgstr "Facture Rejetée" #. module: event #: view:event.event:0 msgid "Confirm Event" -msgstr "" +msgstr "Confirmez l'Évènement" #. module: event #: field:report.event.registration,draft_state:0 msgid "Draft Registration" -msgstr "" +msgstr "Inscription Brouillon" #. module: event #: field:event.registration,tobe_invoiced:0 msgid "To be Invoice" -msgstr "" +msgstr "à Facturer" #. module: event #: wizard_view:event.reg_make_invoice,init:0 msgid "Create Invoices" -msgstr "" +msgstr "Créer les Factures" #. module: event #: view:event.registration:0 msgid "Extra Info" -msgstr "" +msgstr "Infos Complémentaires" #. module: event #: view:event.registration:0 msgid "Registration" -msgstr "" +msgstr "Inscription" #. module: event #: model:ir.model,name:event.model_event_type #: field:event.type,name:0 msgid "Event type" -msgstr "" +msgstr "Type d'Évènement" #. module: event #: wizard_view:event.project,init:0 @@ -118,29 +119,29 @@ msgstr "" #: field:report.event.registration,name:0 #: view:event.event:0 msgid "Event" -msgstr "" +msgstr "Évènement" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_created:0 msgid "Invoice Created" -msgstr "" +msgstr "Facture créée" #. module: event #: view:event.event:0 msgid "Statistics" -msgstr "" +msgstr "Statistiques" #. module: event #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: event #: model:ir.actions.act_window,name:event.action_registration_confirm #: field:event.event,register_current:0 #: model:ir.ui.menu,name:event.menu_action_registration_confirm msgid "Confirmed Registrations" -msgstr "" +msgstr "Inscriptions Confirmées" #. module: event #: field:event.event,mail_auto_registr:0 @@ -150,12 +151,12 @@ msgstr "" #. module: event #: field:event.event,type:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: event #: field:event.event,section_id:0 msgid "Case section" -msgstr "" +msgstr "Section de cas" #. module: event #: field:event.event,mail_confirm:0 @@ -165,7 +166,7 @@ msgstr "" #. module: event #: model:ir.ui.menu,name:event.menu_event_event msgid "All Events" -msgstr "" +msgstr "Tous les évènements" #. module: event #: model:ir.ui.menu,name:event.menu_report_event @@ -175,34 +176,34 @@ msgstr "Reporting" #. module: event #: view:event.event:0 msgid "Remaining Tasks" -msgstr "" +msgstr "Tâches Restantes" #. module: event #: view:event.registration:0 msgid "Cancel Registration" -msgstr "" +msgstr "Annuler l'Inscription" #. module: event #: model:ir.ui.menu,name:event.menu_action_event_categories msgid "Events by Categories" -msgstr "" +msgstr "Évènements par Catégorie" #. module: event #: field:report.event.type.registration,confirm_state:0 msgid "Confirm Registrations" -msgstr "" +msgstr "Confirmez les Inscriptions" #. module: event #: view:event.registration:0 msgid "References" -msgstr "" +msgstr "Références" #. module: event #: model:ir.actions.act_window,name:event.action_event_type_registration #: model:ir.ui.menu,name:event.menu_report_event_type_registration #: view:report.event.type.registration:0 msgid "Registration By Event Types" -msgstr "" +msgstr "Inscriptions par Types d'Évènements" #. module: event #: model:ir.ui.menu,name:event.menu_event_config @@ -212,37 +213,39 @@ msgstr "Configuration" #. module: event #: view:event.registration:0 msgid "Dates" -msgstr "" +msgstr "Dates" #. module: event #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" msgstr "" +"Erreur: l'unité de vente doit appartenir à une catégorie différente que " +"l'unité de mesure" #. module: event #: view:event.registration:0 msgid "Registration Invoiced" -msgstr "" +msgstr "Inscriptions Facturées" #. module: event #: field:event.event,budget_id:0 msgid "Budget" -msgstr "" +msgstr "Budget" #. module: event #: field:report.event.type.registration,nbevent:0 msgid "Number Of Events" -msgstr "" +msgstr "Nombre d'Évènements" #. module: event #: view:event.event:0 msgid "Cancel Event" -msgstr "" +msgstr "Annuler l'Évènement" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0 msgid "Error Messages" -msgstr "" +msgstr "Messages d'erreur" #. module: event #: view:event.event:0 @@ -252,100 +255,103 @@ msgstr "" #. module: event #: model:product.template,name:event.event_product_0_product_template msgid "Ticket for Concert" -msgstr "" +msgstr "Ticket de Concert" #. module: event #: model:ir.actions.act_window,name:event.action_registration_draft #: field:event.event,register_prospect:0 #: model:ir.ui.menu,name:event.menu_action_registration_draft msgid "Unconfirmed Registrations" -msgstr "" +msgstr "Inscriptions Non Confirmées" #. module: event #: model:ir.actions.wizard,name:event.wizard_event_task msgid "Tasks" -msgstr "" +msgstr "Tâches" #. module: event #: view:event.registration:0 msgid "Communication history" -msgstr "" +msgstr "Historique de la communication" #. module: event #: help:event.event,mail_auto_registr:0 msgid "A mail is send when the registration is confirmed" -msgstr "" +msgstr "Un Message est envoyé lorsque l'inscription est confirmée" #. module: event #: help:event.event,mail_auto_confirm:0 msgid "A mail is send when the event is confimed" -msgstr "" +msgstr "Un Message est envoyé lorsque l'évènement est confirmé" #. module: event #: selection:event.event,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulé" #. module: event #: view:event.event:0 msgid "Event Done" -msgstr "" +msgstr "Évènement Effectué" #. module: event #: field:event.registration,badge_name:0 msgid "Badge Name" -msgstr "" +msgstr "Nom du Badge" #. module: event #: model:ir.actions.act_window,name:event.action_event_registration #: model:ir.ui.menu,name:event.menu_report_event_registration msgid "Events On Registrations" -msgstr "" +msgstr "Évènements à l'Inscription" #. module: event #: view:event.event:0 msgid "Tasks management" -msgstr "" +msgstr "Gestion des Tâches" #. module: event #: view:event.event:0 msgid "Category" -msgstr "" +msgstr "Catégorie" #. module: event #: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: event #: selection:event.event,state:0 msgid "Confirmed" -msgstr "" +msgstr "Confirmé" #. module: event #: view:event.registration:0 msgid "Action Information" -msgstr "" +msgstr "Infos sur l'action" #. module: event #: selection:event.event,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: event #: view:event.event:0 msgid "Event description" -msgstr "" +msgstr "Description de l'Évènement" #. module: event #: model:ir.model,name:event.model_report_event_type_registration msgid "Event type on registration" -msgstr "" +msgstr "Type d'Évènement à l'Inscription" #. module: event #: field:event.registration,badge_title:0 msgid "Badge Title" -msgstr "" +msgstr "Titre du Badge" #. module: event #: field:event.registration,event_id:0 @@ -356,33 +362,33 @@ msgstr "" #: model:ir.actions.act_window,name:event.action_event_view #: view:event.event:0 msgid "Events" -msgstr "" +msgstr "Évènements" #. module: event #: field:event.registration,nb_register:0 msgid "Number of Registration" -msgstr "" +msgstr "Nombre d'Inscription" #. module: event #: field:event.event,state:0 #: view:event.event:0 msgid "Status" -msgstr "" +msgstr "État" #. module: event #: model:ir.actions.act_window,name:event.action_event_categories msgid "Events by section" -msgstr "" +msgstr "Évènements par section" #. module: event #: model:ir.ui.menu,name:event.menu_action_registration msgid "All Registrations" -msgstr "" +msgstr "Toutes les Inscriptions" #. module: event #: field:event.registration,partner_order_id:0 msgid "Partner Order" -msgstr "" +msgstr "Ordre du Partenaire" #. module: event #: field:event.event,mail_registr:0 @@ -392,95 +398,98 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Set To Draft" -msgstr "" +msgstr "Mettre à l'état Brouillon" #. module: event #: field:report.event.registration,confirm_state:0 #: view:event.registration:0 msgid "Confirm Registration" -msgstr "" +msgstr "Confirmer l'Inscription" #. module: event #: view:event.registration:0 msgid "History" -msgstr "" +msgstr "Historique" #. module: event #: model:ir.ui.menu,name:event.menu_event_type msgid "Types of Events" -msgstr "" +msgstr "Types d'Évènements" #. module: event #: view:event.registration:0 msgid "General" -msgstr "" +msgstr "Général" #. module: event #: view:event.registration:0 msgid "Send Reminder" -msgstr "" +msgstr "Envoyer un rappel" #. module: event #: selection:event.event,state:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: event #: field:event.event,date_begin:0 #: field:report.event.registration,date_begin:0 msgid "Beginning date" -msgstr "" +msgstr "Date de début" #. module: event #: field:event.registration,invoice_id:0 msgid "Invoice" -msgstr "" +msgstr "Facture" #. module: event #: model:ir.model,name:event.model_report_event_registration msgid "Events on registrations" -msgstr "" +msgstr "Évènements à l'Inscription" #. module: event #: wizard_button:event.project,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: event #: wizard_button:event.reg_make_invoice,init,open:0 msgid "Open" -msgstr "" +msgstr "Ouvert" #. module: event #: view:event.event:0 msgid "Information" -msgstr "" +msgstr "Information" #. module: event #: 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: event #: model:ir.actions.act_window,name:event.action_new_event_form #: model:ir.ui.menu,name:event.menu_event_new_event msgid "New event" -msgstr "" +msgstr "Nouvel évènement" #. module: event #: view:event.event:0 msgid "All tasks" -msgstr "" +msgstr "Toutes les tâches" #. module: event #: field:event.registration,unit_price:0 msgid "Unit Price" -msgstr "" +msgstr "Prix unitaire" #. module: event #: view:event.event:0 msgid "Create Retro-Planning" -msgstr "" +msgstr "Générer le retro planning" #. module: event #: field:event.registration,badge_partner:0 @@ -491,43 +500,43 @@ msgstr "" #: model:ir.actions.act_window,name:event.action_event_view_confirm #: model:ir.ui.menu,name:event.menu_event_event_confirm msgid "Confirmed Events" -msgstr "" +msgstr "Évènements Confirmés" #. module: event #: field:event.event,register_max:0 #: field:report.event.registration,register_max:0 msgid "Maximum Registrations" -msgstr "" +msgstr "Inscriptions Maximum" #. module: event #: view:event.registration:0 msgid "Badge" -msgstr "" +msgstr "Badge" #. module: event #: model:product.template,name:event.event_product_2_product_template msgid "Ticket for Conference" -msgstr "" +msgstr "Ticket de Conférence" #. module: event #: field:event.event,task_ids:0 msgid "Project tasks" -msgstr "" +msgstr "Tâches du projet" #. module: event #: field:event.registration,case_id:0 msgid "Case" -msgstr "" +msgstr "Cas" #. module: event #: view:event.event:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: event #: field:event.event,product_id:0 msgid "Product" -msgstr "" +msgstr "Produit" #. module: event #: field:event.registration,invoice_label:0 @@ -537,13 +546,13 @@ msgstr "" #. module: event #: view:event.registration:0 msgid "Payments" -msgstr "" +msgstr "Paiements" #. module: event #: field:report.event.type.registration,name:0 #: view:event.type:0 msgid "Event Type" -msgstr "" +msgstr "Type d'évènement" #. module: event #: field:event.event,mail_auto_confirm:0 @@ -554,36 +563,35 @@ msgstr "" #: model:ir.actions.act_window,name:event.action_event_view_draft #: model:ir.ui.menu,name:event.menu_event_event_draft msgid "Draft Events" -msgstr "" +msgstr "Évènements Brouillon" #. module: event #: model:product.template,name:event.event_product_1_product_template msgid "Ticket for Opera" -msgstr "" +msgstr "Ticket d'Opera" #. module: event #: model:ir.ui.menu,name:event.menu_event_main msgid "Events Organisation" -msgstr "" +msgstr "Organisation des Évènements" #. module: event #: view:event.registration:0 msgid "Actions" -msgstr "" +msgstr "Actions" #. module: event #: model:ir.actions.wizard,name:event.wizard_event_reg_partners msgid "List Register Partners" -msgstr "" +msgstr "Lister les Partenaires Inscrits" #. module: event #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Erreur: code EAN invalide" #. module: event #: help:event.event,mail_confirm:0 #: help:event.event,mail_registr:0 msgid "Template for the mail" -msgstr "" - +msgstr "Patron pour le Message" diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index e7668f30c38..126c78ea6ad 100644 --- a/addons/event/security/ir.model.access.csv +++ b/addons/event/security/ir.model.access.csv @@ -1,6 +1,7 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event_type,event.type,model_event_type,crm.group_crm_user,1,1,1,1 -access_event_event,event.event,model_event_event,crm.group_crm_user,1,1,1,1 -access_event_registration,event.registration,model_event_registration,crm.group_crm_user,1,1,1,1 -access_report_event_registration,report.event.registration,model_report_event_registration,crm.group_crm_user,1,1,1,1 -access_report_event_type_registration,report.event.type.registration,model_report_event_type_registration,crm.group_crm_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_event_type","event.type","model_event_type","crm.group_crm_user",1,1,1,1 +"access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1 +"access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1 +"access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0 +"access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0 +"access_project_project_crm_user","project.project crm user","project.model_project_project","crm.group_crm_user",1,0,0,0 diff --git a/addons/google_map/i18n/fr_FR.po b/addons/google_map/i18n/fr_FR.po index 69cca2d908f..7ead04c08b0 100644 --- a/addons/google_map/i18n/fr_FR.po +++ b/addons/google_map/i18n/fr_FR.po @@ -4,31 +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:23+0000\n" +"PO-Revision-Date: 2008-10-11 07:06+0000\n" +"Last-Translator: Christophe Chauvet <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 15:08+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: google_map #: view:res.partner.address:0 #: view:res.partner:0 msgid "Map" -msgstr "" +msgstr "Carte" #. module: google_map #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: google_map #: view:res.partner.address:0 #: view:res.partner:0 msgid "Street2 : " -msgstr "" - +msgstr "Adresse suite " diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index 7da1af96772..1e5c9ff7e12 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -40,7 +40,7 @@ Different reports are also provided, mainly for attendance statistics. """, - "depends" : ["base", "process"], + "depends" : ["base", "crm_configuration", "process"], "init_xml" : [], "demo_xml" : [ "hr_demo.xml", @@ -52,6 +52,7 @@ "hr_view.xml", "hr_wizard.xml", "hr_department_view.xml", + "process/hr_process.xml" ], "active": False, "installable": True diff --git a/addons/hr/i18n/fr_FR.po b/addons/hr/i18n/fr_FR.po index af72274ae8f..0e17e256282 100644 --- a/addons/hr/i18n/fr_FR.po +++ b/addons/hr/i18n/fr_FR.po @@ -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: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:32+0000\n" +"PO-Revision-Date: 2008-10-13 11: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-13 11:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr #: model:ir.actions.act_window,name:hr.edit_workgroup #: model:ir.ui.menu,name:hr.menu_edit_workgroup msgid "Working Time Categories" -msgstr "" +msgstr "Catégories de Temps de Travail" #. module: hr #: constraint:hr.department:0 msgid "Error! You can not create recursive departments." -msgstr "" +msgstr "Erreur! Vous ne pouvez pas créer de départements récursifs." #. module: hr #: field:hr.employee,sinid:0 @@ -55,20 +56,15 @@ msgid "Department" msgstr "département" #. module: hr -#: model:ir.actions.act_window,name:hr.action2 -msgid "Hierarchical view of this employee" -msgstr "Vue hiérarchisée de cet employé" - -#. module: hr #: field:hr.employee,work_email:0 msgid "Work Email" -msgstr "" +msgstr "Adresse électronique professionnelle" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_list_my #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my msgid "My Employees" -msgstr "" +msgstr "Mes Employés" #. module: hr #: field:hr.timesheet.group,name:0 @@ -97,12 +93,6 @@ msgid "Reason" msgstr "Motifs de pointage" #. module: hr -#, python-format -#: code:addons/hr/wizard/sign_in_out.py:0 -msgid "The sign-out date must be in the past" -msgstr "" - -#. module: hr #: rml:hr.timesheet.attendance.error:0 msgid "Date Signed" msgstr "Date signée" @@ -151,26 +141,18 @@ msgstr "Présent depuis" #. module: hr #: wizard_view:hr.si_so,so_ask_si:0 -msgid "You did not signed in the last time. Please enter the date and time you signed in." -msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes arrivé(e)" +msgid "" +"You did not signed in the last time. Please enter the date and time you " +"signed in." +msgstr "" +"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure " +"à laquelle vous êtes arrivé(e)" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_attendance_reason #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason msgid "Attendance Reasons" -msgstr "" - -#. module: hr -#, python-format -#: code:addons/hr/hr.py:0 -msgid "You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances." -msgstr "" - -#. module: hr -#, python-format -#: code:addons/hr/wizard/sign_in_out.py:0 -msgid "UserError" -msgstr "" +msgstr "Raisons d'assistance" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_configuration @@ -194,15 +176,9 @@ msgid "Sunday" msgstr "Dimanche" #. module: hr -#, python-format -#: code:addons/hr/hr.py:0 -msgid "Warning" -msgstr "" - -#. module: hr #: selection:hr.employee,gender:0 msgid "Female" -msgstr "" +msgstr "Féminin" #. module: hr #: rml:hr.timesheet.attendance.error:0 @@ -210,15 +186,9 @@ msgid "Operation" msgstr "Opération" #. module: hr -#: view:hr.timesheet.group:0 -msgid "Working Time Category" -msgstr "" - -#. module: hr -#, python-format -#: code:addons/hr/wizard/sign_in_out.py:0 -msgid "A sign-in must be right after a sign-out !" -msgstr "" +#: rml:hr.timesheet.attendance.error:0 +msgid "Date Printed:" +msgstr "Date Imprimée :" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_tree @@ -249,7 +219,7 @@ msgstr "Sociétés" #. module: hr #: field:hr.employee,work_phone:0 msgid "Work Phone" -msgstr "" +msgstr "Téléphone professionnel" #. module: hr #: wizard_field:hr.timesheet.attendance.report,init,max_delay:0 @@ -259,7 +229,7 @@ msgstr "Délais max (Min)" #. module: hr #: field:hr.employee,work_location:0 msgid "Office Location" -msgstr "" +msgstr "Localisation du Bureau" #. module: hr #: model:ir.model,name:hr.model_hr_employee @@ -301,9 +271,18 @@ msgid "Action's type" msgstr "Type d'action" #. module: hr +#: rml:hr.timesheet.attendance.error:0 +msgid "Report" +msgstr "Rapport" + +#. module: hr #: wizard_view:hr.si_so,si_ask_so:0 -msgid "You did not signed out the last time. Please enter the date and time you signed out." -msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes parti(e)" +msgid "" +"You did not signed out the last time. Please enter the date and time you " +"signed out." +msgstr "" +"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure " +"à laquelle vous êtes parti(e)" #. module: hr #: model:ir.actions.report.xml,name:hr.attendance_error_report @@ -319,17 +298,12 @@ msgstr "Date de début" #. module: hr #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr #: selection:hr.employee,marital:0 msgid "Divorced" -msgstr "" - -#. module: hr -#: rml:hr.timesheet.attendance.error:0 -msgid "Min Delay" -msgstr "" +msgstr "Divorcé(e)" #. module: hr #: view:hr.attendance:0 @@ -353,7 +327,7 @@ msgstr "Pointer l'entrée" #. module: hr #: selection:hr.employee,marital:0 msgid "Maried" -msgstr "" +msgstr "Marié(e)" #. module: hr #: field:hr.timesheet,tgroup_id:0 @@ -363,18 +337,13 @@ msgstr "Groupe de feuille de présence" #. module: hr #: selection:hr.employee,gender:0 msgid "Male" -msgstr "" - -#. module: hr -#, python-format -#: code:addons/hr/wizard/sign_in_out.py:0 -msgid "The Sign-in date must be in the past" -msgstr "" +msgstr "Masculin" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Unmaried" -msgstr "" +#: model:ir.actions.act_window,name:hr.open_view_categ_form +#: model:ir.ui.menu,name:hr.menu_view_employee_category_form +msgid "Categories of Employee" +msgstr "Catégories d'Employés" #. module: hr #: model:ir.model,name:hr.model_hr_employee_category @@ -404,8 +373,11 @@ msgstr "" #. module: hr #: rml:hr.timesheet.attendance.error:0 -msgid "(*) A negative delay means that the employee worked more than encoded." -msgstr "(*) Un retard négatif signifie que l'employé à travaillé plus que ce qui est encodé." +msgid "" +"(*) A negative delay means that the employee worked more than encoded." +msgstr "" +"(*) Un retard négatif signifie que l'employé à travaillé plus que ce qui est " +"encodé." #. module: hr #: field:hr.employee,category_id:0 @@ -428,12 +400,6 @@ msgid "Note" msgstr "Note" #. module: hr -#, python-format -#: code:addons/hr/hr.py:0 -msgid "You tried to sign in with a date anterior to another event !\nTry to contact the administrator to correct attendances." -msgstr "" - -#. module: hr #: model:ir.model,name:hr.model_hr_attendance #: field:hr.employee,state:0 msgid "Attendance" @@ -442,7 +408,7 @@ msgstr "Pointage" #. module: hr #: view:hr.employee:0 msgid "Contact Information" -msgstr "" +msgstr "Informations sur le contact" #. module: hr #: model:ir.actions.wizard,name:hr.print_week @@ -450,9 +416,14 @@ msgid "Print Timesheet by week" msgstr "Présences par semaine" #. module: hr +#: selection:hr.employee,marital:0 +msgid "Other" +msgstr "Autre" + +#. module: hr #: view:hr.employee:0 msgid "Status" -msgstr "" +msgstr "État" #. module: hr #: field:hr.employee,address_id:0 @@ -460,6 +431,11 @@ msgid "Contact address" msgstr "Adresse" #. module: hr +#: rml:hr.timesheet.attendance.error:0 +msgid "Avg Delay" +msgstr "Délai Moyen" + +#. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Monday" msgstr "Lundi" @@ -473,13 +449,7 @@ msgstr "Structure des catégories" #. module: hr #: view:hr.employee:0 msgid "Job Information" -msgstr "" - -#. module: hr -#, python-format -#: code:addons/hr/wizard/sign_in_out.py:0 -msgid "A sign-out must be right after a sign-in !" -msgstr "" +msgstr "Information sur l'Emploi" #. module: hr #: field:hr.timesheet,dayofweek:0 @@ -497,6 +467,11 @@ msgid "Date" msgstr "Date" #. module: hr +#: rml:hr.timesheet.attendance.error:0 +msgid "To:" +msgstr "À :" + +#. module: hr #: wizard_button:hr.si_so,si_ask_so,si:0 #: wizard_button:hr.si_so,init,si_test:0 #: selection:hr.action.reason,action_type:0 @@ -519,10 +494,9 @@ msgid "Active" msgstr "Actif" #. module: hr -#: model:ir.actions.act_window,name:hr.open_view_categ_form -#: model:ir.ui.menu,name:hr.menu_view_employee_category_form -msgid "Categories of Employee" -msgstr "" +#: selection:hr.employee,marital:0 +msgid "Unmaried" +msgstr "Non Marié(e)" #. module: hr #: rml:hr.timesheet.attendance.error:0 @@ -541,12 +515,6 @@ msgid "Starting date" msgstr "Date début" #. module: hr -#, python-format -#: code:addons/hr/hr.py:0 -msgid "You tried to sign out with a date anterior to another event !\nTry to contact the administrator to correct attendances." -msgstr "" - -#. module: hr #: wizard_view:hr.print_week,init:0 msgid "Select a starting and a end date" msgstr "Sélectionner une date de début et de fin" @@ -559,12 +527,12 @@ msgstr "Catégorie parents" #. module: hr #: field:hr.employee,marital:0 msgid "Marital Status" -msgstr "" +msgstr "État matrimonial" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Other" -msgstr "" +#: model:ir.actions.act_window,name:hr.action2 +msgid "Hierarchical view of this employee" +msgstr "Vue hiérarchisée de cet employé" #. module: hr #: wizard_button:hr.print_month,init,end:0 @@ -584,24 +552,30 @@ msgstr "Ligne de feuille d'heures" #. module: hr #: view:hr.employee:0 msgid "Personal Information" -msgstr "" +msgstr "Informations personnelles" #. module: hr #: 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: hr #: rml:hr.timesheet.attendance.error:0 -msgid "(*) A positive delay means that the employee worked less than recorded." -msgstr "(*) Un retard positif signifie que les employés ont travaillé moins que ce qui est enregistré." +msgid "" +"(*) A positive delay means that the employee worked less than recorded." +msgstr "" +"(*) Un retard positif signifie que les employés ont travaillé moins que ce " +"qui est enregistré." #. module: hr #: model:ir.model,name:hr.model_hr_timesheet_group #: field:hr.timesheet.group,timesheet_id:0 #: view:hr.timesheet:0 msgid "Working Time" -msgstr "" +msgstr "Temps de Travail" #. module: hr #: selection:hr.timesheet,dayofweek:0 @@ -681,7 +655,7 @@ msgstr "département" #. module: hr #: field:hr.employee,country_id:0 msgid "Nationality" -msgstr "" +msgstr "Nationalité" #. module: hr #: view:hr.action.reason:0 @@ -689,11 +663,21 @@ msgid "Define attendance reason" msgstr "Définir les motifs de pointage" #. module: hr +#: rml:hr.timesheet.attendance.error:0 +msgid "From:" +msgstr "De :" + +#. module: hr #: field:hr.employee,otherid:0 msgid "Other ID" msgstr "" #. module: hr +#: view:hr.timesheet.group:0 +msgid "Working Time Category" +msgstr "Catégorie de Temps de Travail" + +#. module: hr #: field:hr.timesheet,name:0 msgid "Name" msgstr "Nom" @@ -701,14 +685,14 @@ msgstr "Nom" #. module: hr #: field:hr.employee,gender:0 msgid "Gender" -msgstr "" +msgstr "Genre" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_list #: model:ir.ui.menu,name:hr.menu_open_view_employee_list #: view:hr.employee:0 msgid "Employees" -msgstr "" +msgstr "Employés" #. module: hr #: field:hr.department,name:0 @@ -724,7 +708,7 @@ msgstr "Explication de la tâche" #. module: hr #: field:hr.employee,birthday:0 msgid "Started on" -msgstr "" +msgstr "Débuté en" #. module: hr #: wizard_view:hr.timesheet.attendance.report,init:0 @@ -756,5 +740,4 @@ msgstr "Samedi" #: model:ir.actions.act_window,name:hr.open_view_employee_new #: model:ir.ui.menu,name:hr.menu_open_view_employee_new msgid "New Employee" -msgstr "" - +msgstr "Nouvel employé" diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml new file mode 100644 index 00000000000..bfb0ad21f2a --- /dev/null +++ b/addons/hr/process/hr_process.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <!-- + Process + --> + + <record id="process_process_employeecontractworkflow0" model="process.process"> + <field eval=""""Employee Contract flow for services companies."""" name="note"/> + <field eval="1" name="active"/> + <field eval=""""Employee Contract Workflow"""" name="name"/> + </record> + + <!-- + Process Node + --> + + <record id="process_node_jobshiring0" model="process.node"> + <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act11"/> + <field name="model_id" ref="crm.model_crm_case"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Jobs hiring"""" name="name"/> + <field eval=""""Jobs hiring to new employees"""" name="note"/> + <field name="process_id" ref="process_process_employeecontractworkflow0"/> + <field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_employee0" model="process.node"> + <field name="menu_id" ref="hr.menu_open_view_employee_list"/> + <field name="model_id" ref="hr.model_hr_employee"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Employee"""" name="name"/> + <field eval=""""Employee Complete Form"""" name="note"/> + <field name="process_id" ref="process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_employeecontact0" model="process.node"> + <field name="menu_id" ref="hr.menu_open_view_employee_list"/> + <field name="model_id" ref="hr.model_hr_employee"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Employee Contact"""" name="name"/> + <field eval=""""Fill up employee's contact information"""" name="note"/> + <field name="process_id" ref="process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_openerpuser0" model="process.node"> + <field name="menu_id" ref="base.menu_users"/> + <field name="model_id" ref="base.model_res_users"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Openerp user"""" name="name"/> + <field eval=""""Create OpenERP User"""" name="note"/> + <field name="process_id" ref="process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <!-- + Process Transition + --> + + <record id="process_transition_employeejob0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Employee Job"""" name="name"/> + <field eval=""""After confirming job, he will be a employee"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_employee0"/> + <field model="process.node" name="source_node_id" ref="process_node_jobshiring0"/> + </record> + + <record id="process_transition_contactofemployee0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Contact of employee"""" name="name"/> + <field eval=""""Fill up contact information"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/> + <field model="process.node" name="source_node_id" ref="process_node_employee0"/> + </record> + + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 743cbce21c2..d6e8f812590 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -1,9 +1,10 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_timesheet_group,hr.timesheet.group,model_hr_timesheet_group,hr.group_hr_user,1,0,0,0 -access_hr_employee_category,hr.employee.category,model_hr_employee_category,hr.group_hr_user,1,0,0,0 -access_hr_employee,hr.employee,model_hr_employee,hr.group_hr_user,1,1,1,1 -access_hr_timesheet,hr.timesheet,model_hr_timesheet,hr.group_hr_user,1,1,1,1 -access_hr_department,hr.department,model_hr_department,hr.group_hr_user,1,0,0,0 -access_hr_timesheet_group_manager,hr.timesheet.group.manager,model_hr_timesheet_group,hr.group_hr_manager,1,1,1,1 -access_hr_employee_category_manager,hr.employee.category.manager,model_hr_employee_category,hr.group_hr_manager,1,1,1,1 -access_hr_department_manager,hr.department.manager,model_hr_department,hr.group_hr_manager,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_timesheet_group","hr.timesheet.group","model_hr_timesheet_group","hr.group_hr_user",1,0,0,0 +"access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0 +"access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1 +"access_hr_timesheet_manager","hr.timesheet manager","model_hr_timesheet","hr.group_hr_manager",1,1,1,1 +"access_hr_timesheet","hr.timesheet","model_hr_timesheet","hr.group_hr_user",1,1,1,1 +"access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0 +"access_hr_timesheet_group_manager","hr.timesheet.group.manager","model_hr_timesheet_group","hr.group_hr_manager",1,1,1,1 +"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1 +"access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1 diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py index 0dd9eff1013..c6a6162bcf9 100644 --- a/addons/hr_attendance/__terp__.py +++ b/addons/hr_attendance/__terp__.py @@ -9,7 +9,8 @@ "update_xml" : [ "hr_attendance_view.xml", "hr_attendance_wizard.xml", - "hr_attendance_report.xml" + "hr_attendance_report.xml", + "security/ir.model.access.csv", ], "active": False, "installable": True, diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv new file mode 100644 index 00000000000..b96c0e6be0d --- /dev/null +++ b/addons/hr_attendance/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_user",1,1,1,1 +"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr.group_hr_user",1,1,1,1 diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py index a03f8140f72..c07e6c55a5a 100644 --- a/addons/hr_contract/__terp__.py +++ b/addons/hr_contract/__terp__.py @@ -46,7 +46,7 @@ "demo_xml" : [], "update_xml" : [ "security/hr_contract_security.xml", -# "security/ir.model.access.csv", + "security/ir.model.access.csv", "hr_contract_view.xml", ], "active": False, diff --git a/addons/hr_contract/i18n/fr_FR.po b/addons/hr_contract/i18n/fr_FR.po index 01606b1ab15..3d3d3dbcf2a 100644 --- a/addons/hr_contract/i18n/fr_FR.po +++ b/addons/hr_contract/i18n/fr_FR.po @@ -4,147 +4,151 @@ # 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:25+0000\n" +"PO-Revision-Date: 2008-10-13 11: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" +"X-Launchpad-Export-Date: 2008-10-13 11:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_contract #: field:hr.contract,wage:0 msgid "Wage" -msgstr "" +msgstr "Salaire" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Gross" -msgstr "" +msgstr "Brut" #. module: hr_contract #: 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: hr_contract #: view:hr.contract:0 #: view:hr.employee:0 msgid "Generalities" -msgstr "" +msgstr "Généralités" #. module: hr_contract #: field:hr.employee,children:0 msgid "Number of children" -msgstr "" +msgstr "Nombre d'Enfants" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 msgid "Factor for hour cost" -msgstr "" +msgstr "Facteur pour le coût horaire" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Wage Types" -msgstr "" +msgstr "Types de Salaire" #. module: hr_contract #: field:hr.employee,soc_security:0 msgid "Social security number" -msgstr "" +msgstr "Numéro de Sécurité Sociale" #. module: hr_contract #: field:hr.contract,employee_id:0 msgid "Employee" -msgstr "" +msgstr "Employé" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Net" -msgstr "" +msgstr "Net" #. module: hr_contract #: field:hr.contract.wage.type,type:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: hr_contract #: field:hr.contract.wage.type.period,factor_days:0 msgid "Hours in the period" -msgstr "" +msgstr "# d'Heures dans la période" #. module: hr_contract #: field:hr.contract,function:0 msgid "Function" -msgstr "" +msgstr "Fonction" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type msgid "Contract Wage Type" -msgstr "" +msgstr "Type de COntrat Salarial" #. module: hr_contract #: view:hr.employee:0 msgid "Miscelleanous" -msgstr "" +msgstr "Divers" #. module: hr_contract #: field:hr.employee,contract_ids:0 #: view:hr.contract:0 #: view:hr.employee:0 msgid "Contracts" -msgstr "" +msgstr "Contrats" #. module: hr_contract #: model:ir.model,name:hr_contract.model_hr_contract_wage_type #: field:hr.contract,wage_type_id:0 #: view:hr.contract.wage.type:0 msgid "Wage Type" -msgstr "" +msgstr "Type de salaire" #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 msgid "Period Name" -msgstr "" +msgstr "Nom de la Période" #. module: hr_contract #: model:ir.model,name:hr_contract.model_hr_employee_marital_status msgid "Employee Marital Status" -msgstr "" +msgstr "État Matrimonial de l'Employé" #. module: hr_contract #: field:hr.employee,medic_exam:0 msgid "Medical examination date" -msgstr "" +msgstr "Date de l'Examen Médical" #. module: hr_contract #: field:hr.contract.wage.type,name:0 msgid "Wage Type Name" -msgstr "" +msgstr "Nom du Type de Salaire" #. module: hr_contract #: field:hr.contract,working_hours_per_day:0 msgid "Working hours per day" -msgstr "" +msgstr "Heures de Travail par Jour" #. module: hr_contract #: view:hr.employee:0 msgid "Salary" -msgstr "" +msgstr "Salaire" #. module: hr_contract #: field:hr.contract,date_end:0 msgid "End Date" -msgstr "" +msgstr "Date de fin" #. module: hr_contract #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_contract #: field:hr.contract,notes:0 @@ -160,28 +164,28 @@ msgstr "Notes" #: view:hr.contract:0 #: view:hr.employee:0 msgid "Contract" -msgstr "" +msgstr "Contrat" #. module: hr_contract #: view:hr.contract.type:0 msgid "Contract Type" -msgstr "" +msgstr "Type de Contrat" #. module: hr_contract #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period #: field:hr.contract.wage.type,period_id:0 msgid "Wage Period" -msgstr "" +msgstr "Période Salariale" #. module: hr_contract #: field:hr.employee,nationality:0 msgid "Nationality" -msgstr "" +msgstr "Nationalité" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Hourly cost computation" -msgstr "" +msgstr "Calcul du côut horaire" #. module: hr_contract #: field:hr.employee,audiens_num:0 @@ -191,12 +195,12 @@ msgstr "" #. module: hr_contract #: view:hr.contract:0 msgid "Remuneration" -msgstr "" +msgstr "Rémuneration" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Name" -msgstr "" +msgstr "Nom du Contrat" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status @@ -205,49 +209,52 @@ msgstr "" #: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status #: view:hr.employee.marital.status:0 msgid "Marital Status" -msgstr "" +msgstr "État matrimonial" #. module: hr_contract #: field:hr.employee,place_of_birth:0 msgid "Place of Birth" -msgstr "" +msgstr "Lieu de Naissance" #. module: hr_contract #: field:hr.employee,manager:0 msgid "Manager" -msgstr "" +msgstr "Gestionnaire" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period #: view:hr.contract.wage.type.period:0 msgid "Wage period" -msgstr "" +msgstr "Période Salariale" #. module: hr_contract #: help:hr.contract.wage.type,factor_type:0 #: help:hr.contract.wage.type.period,factor_days:0 -msgid "This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee" +msgid "" +"This field is used by the timesheet system to compute the price of an hour " +"of work wased on the contract of the employee" msgstr "" +"Ce champ est utilisé par le système de feuille de temps pour calculer le " +"prix d'une heure de travail basé sur le contrat de l'employé" #. module: hr_contract #: field:hr.contract,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Date de début" #. module: hr_contract #: view:hr.contract:0 #: view:hr.employee:0 msgid "Contract Duration" -msgstr "" +msgstr "Durée du Contrat" #. module: hr_contract #: field:hr.employee.marital.status,description:0 msgid "Status Description" -msgstr "" +msgstr "Description du Statut" #. module: hr_contract #: field:hr.employee,birth_date:0 msgid "Birth Date" -msgstr "" - +msgstr "Date de naissance" diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv index a9a7e3d5219..053b5c42ecd 100644 --- a/addons/hr_contract/security/ir.model.access.csv +++ b/addons/hr_contract/security/ir.model.access.csv @@ -1,5 +1,11 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_employee_marital_status,hr.employee.marital.status,model_hr_employee_marital_status,hr.group_hr_user,1,1,1,1 -access_hr_contract_wage_type_period,hr.contract.wage.type.period,model_hr_contract_wage_type_period,hr.group_hr_manager,1,1,1,1 -access_hr_contract_wage_type,hr.contract.wage.type,model_hr_contract_wage_type,hr.group_hr_manager,1,1,1,1 -access_hr_contract,hr.contract,model_hr_contract,group_hr_contract,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1 +"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period user","model_hr_contract_wage_type_period","hr.group_hr_user",1,0,0,0 +"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","hr.group_hr_manager",1,1,1,1 +"access_hr_contract_wage_type_user","hr.contract.wage.type user","model_hr_contract_wage_type","hr.group_hr_user",1,0,0,0 +"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","hr.group_hr_manager",1,1,1,1 +"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","group_hr_contract",1,1,1,1 +"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","group_hr_contract",1,1,1,1 +"access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0 +"access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1 +"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0 diff --git a/addons/hr_expense/i18n/fr_FR.po b/addons/hr_expense/i18n/fr_FR.po index 6529569c4ce..bf065f55e63 100644 --- a/addons/hr_expense/i18n/fr_FR.po +++ b/addons/hr_expense/i18n/fr_FR.po @@ -4,375 +4,366 @@ # 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:25+0000\n" +"PO-Revision-Date: 2008-10-13 11: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-13 11:52+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Accounting data" -msgstr "" +msgstr "Données Comptables" #. module: hr_expense #: rml:hr.expense:0 msgid "Employee:" -msgstr "" +msgstr "Employé:" #. module: hr_expense #: 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: hr_expense #: model:ir.model,name:hr_expense.model_hr_expense_line msgid "Expense Line" -msgstr "" +msgstr "Ligne de dépense" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Other Info" -msgstr "" +msgstr "Autre information" #. module: hr_expense #: rml:hr.expense:0 msgid "Date:" -msgstr "" +msgstr "Date :" #. module: hr_expense #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_all_draft #: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft msgid "Draft expenses" -msgstr "" +msgstr "Dépenses Brouillon" #. module: hr_expense #: field:hr.expense.expense,note:0 msgid "Note" -msgstr "" +msgstr "Note" #. module: hr_expense #: field:hr.expense.expense,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: hr_expense #: field:hr.expense.line,unit_amount:0 msgid "Unit Price" -msgstr "" +msgstr "Prix unitaire" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_all_confirm #: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm msgid "Expenses waiting validation" -msgstr "" +msgstr "Dépenses en attende de validation" #. module: hr_expense #: field:hr.expense.expense,date_valid:0 msgid "Date Valided" -msgstr "" +msgstr "Date de la Validation" #. module: hr_expense #: field:hr.expense.expense,employee_id:0 msgid "Employee" -msgstr "" +msgstr "Employé" #. module: hr_expense #: field:hr.expense.expense,date_confirm:0 msgid "Date Confirmed" -msgstr "" +msgstr "Date de la Confirmation" #. module: hr_expense #: field:hr.expense.line,analytic_account:0 msgid "Analytic account" -msgstr "" +msgstr "Compte analytique" #. module: hr_expense #: model:ir.ui.menu,name:hr_expense.next_id_49 #: view:hr.expense.expense:0 msgid "Expenses" -msgstr "" +msgstr "Dépenses" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Waiting confirmation" -msgstr "" +msgstr "En Attente de Confirmation" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_all_valid #: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid msgid "Expenses waiting invoice" -msgstr "" +msgstr "Dépenses attendant la facture" #. module: hr_expense #: field:hr.expense.line,product_id:0 msgid "Product" -msgstr "" +msgstr "Produit" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Validation" -msgstr "" - -#. module: hr_expense -#, python-format -#: code:addons/hr_expense/hr_expense.py:0 -msgid "Error !" -msgstr "" +msgstr "Validation" #. module: hr_expense #: field:hr.expense.line,description:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_my #: model:ir.ui.menu,name:hr_expense.menu_expense_my msgid "My Expenses" -msgstr "" +msgstr "Mes Dépenses" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulé" #. module: hr_expense #: field:hr.expense.expense,name:0 #: view:hr.expense.expense:0 msgid "Expense Sheet" -msgstr "" +msgstr "Feuille de Dépense" #. module: hr_expense #: rml:hr.expense:0 #: field:hr.expense.line,unit_quantity:0 msgid "Quantities" -msgstr "" +msgstr "Quantités" #. module: hr_expense #: field:hr.expense.expense,amount:0 msgid "Total Amount" -msgstr "" +msgstr "Montant Total" #. module: hr_expense #: field:hr.expense.expense,id:0 msgid "Sheet ID" -msgstr "" +msgstr "ID de la feuille" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Set to Draft" -msgstr "" +msgstr "Mettre au brouillon" #. module: hr_expense #: field:hr.expense.expense,journal_id:0 msgid "Force Journal" -msgstr "" +msgstr "Forcer le Journal" #. module: hr_expense #: field:hr.expense.expense,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_my_confirm #: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm msgid "My expenses waiting validation" -msgstr "" +msgstr "Mes Dépenses en attende de validation" #. module: hr_expense #: rml:hr.expense:0 #: field:hr.expense.expense,date:0 #: field:hr.expense.line,date_value:0 msgid "Date" -msgstr "" +msgstr "Date" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Accepted" -msgstr "" +msgstr "Accepté" #. module: hr_expense #: model:ir.ui.menu,name:hr_expense.menu_expense_all msgid "All expenses" -msgstr "" +msgstr "Toutes les Dépenses" #. module: hr_expense #: rml:hr.expense:0 msgid "Reference:" -msgstr "" +msgstr "Réference :" #. module: hr_expense #: rml:hr.expense:0 msgid "(Date and signature)" -msgstr "" +msgstr "(Date et Signature)" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Refuse" -msgstr "" +msgstr "Refuser" #. module: hr_expense #: rml:hr.expense:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: hr_expense #: rml:hr.expense:0 msgid "Total:" -msgstr "" +msgstr "Total:" #. module: hr_expense #: field:hr.expense.line,name:0 msgid "Short Description" -msgstr "" +msgstr "Brève Description" #. module: hr_expense #: rml:hr.expense:0 msgid "HR Expenses" -msgstr "" - -#. module: hr_expense -#, python-format -#: code:addons/hr_expense/hr_expense.py:0 -msgid "The employee must have a contact address" -msgstr "" +msgstr "Dépense HR" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Reimbursed" -msgstr "" +msgstr "Remboursée" #. module: hr_expense #: field:hr.expense.expense,account_move_id:0 msgid "Account Move" -msgstr "" +msgstr "Mouvement de Compte" #. module: hr_expense #: model:ir.model,name:hr_expense.model_hr_expense_expense #: field:hr.expense.line,expense_id:0 msgid "Expense" -msgstr "" +msgstr "Dépense" #. module: hr_expense #: field:hr.expense.expense,line_ids:0 #: view:hr.expense.expense:0 #: view:hr.expense.line:0 msgid "Expense Lines" -msgstr "" +msgstr "Ligne de Dépense" #. module: hr_expense #: rml:hr.expense:0 msgid "This document must be dated and signed for reimbursment" -msgstr "" +msgstr "Ce document doit être daté et signé pour remboursement" #. module: hr_expense #: rml:hr.expense:0 #: field:hr.expense.expense,ref:0 #: field:hr.expense.line,ref:0 msgid "Reference" -msgstr "" +msgstr "Référence" #. module: hr_expense #: field:hr.expense.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Séquence" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Expenses Sheet" -msgstr "" +msgstr "Feuille de Dépense" #. module: hr_expense #: rml:hr.expense:0 msgid "Certified honest and conform," -msgstr "" +msgstr "Certifié honête et conforme," #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced #: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced msgid "Expenses waiting payment" -msgstr "" +msgstr "Dépenses en attente d'un paiement" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Accept" -msgstr "" +msgstr "Accepter" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_my_draft #: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft msgid "My Draft expenses" -msgstr "" +msgstr "Mes dépenses Brouillon" #. module: hr_expense #: field:hr.expense.expense,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Devise" #. module: hr_expense #: rml:hr.expense:0 msgid "Unit price" -msgstr "" +msgstr "Prix Unitaire" #. module: hr_expense #: field:hr.expense.line,uom_id:0 msgid "UoM" -msgstr "" +msgstr "UdM" #. module: hr_expense #: field:hr.expense.expense,invoice_id:0 #: view:hr.expense.expense:0 msgid "Invoice" -msgstr "" +msgstr "Facture" #. module: hr_expense #: field:hr.expense.expense,user_valid:0 msgid "Validation User" -msgstr "" +msgstr "Utilisateur pour la Validation" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: hr_expense #: rml:hr.expense:0 #: field:hr.expense.line,total_amount:0 msgid "Total" -msgstr "" +msgstr "Total" #. module: hr_expense #: model:ir.actions.report.xml,name:hr_expense.hr_expenses msgid "Print HR expenses" -msgstr "" +msgstr "Imprimer les Dépenses HR" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Invoiced" -msgstr "" - +msgstr "Facturée" diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index 7ab564bf011..82321f43dec 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -59,6 +59,14 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/> + <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"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/> </blockTableStyle> <blockTableStyle id="Table_Final_total"> <blockAlignment value="LEFT"/> @@ -104,6 +112,7 @@ <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_9_bold_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_italic_8" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> <images/> <story> @@ -201,6 +210,46 @@ <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para> </td> </tr> + <tr> + <td> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_italic_8">[[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]]</para> + </td> + <td> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_Right_9"> + <font color="white"> </font> + </para> + </td> + </tr> </blockTable> </section> <blockTable colWidths="57.0,171.0,171.0,32.0,71.0,21.0" style="Table_Final_total"> @@ -248,4 +297,4 @@ </para> <para style="terp_default_9">This document must be dated and signed for reimbursment</para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index ea8c924ddb6..aa00dab4fa1 100644 --- a/addons/hr_expense/security/ir.model.access.csv +++ b/addons/hr_expense/security/ir.model.access.csv @@ -1,3 +1,3 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_expense_expense,hr.expense.expense,model_hr_expense_expense,base.group_user,1,1,1,1 -access_hr_expense_line,hr.expense.line,model_hr_expense_line,base.group_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1 +"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1 diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index 6f3188d6acf..982b5624c19 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -32,7 +32,7 @@ "hr_view.xml", "hr_holidays_report.xml", "hr_holidays_wizard.xml", -# "process/hr_holidays_process.xml" + "process/hr_holidays_process.xml" ], # "demo_xml" : ["hr_bel_holidays_2008.xml",], "demo_xml" : [], diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml index 85c4f69649e..2d89b467c26 100644 --- a/addons/hr_holidays/hr_holidays_report.xml +++ b/addons/hr_holidays/hr_holidays_report.xml @@ -9,17 +9,6 @@ auto="False" menu="False"/> - <!--<wizard id="wizard_hr_holidays_summary" - string="Summary Of Holidays" - model="hr.holidays" - name="hr.holidays.holidays_summary" - menu="False"/> - - <menuitem - name="Human Resources/Holidays Request/Print Summary Of Holidays" - action="wizard_hr_holidays_summary" - type="wizard" - id="menu_wizard_hr_holidays_summary"/>--> - </data> </openerp> + diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index 325768afbef..475da254cdf 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -10,6 +10,11 @@ type="wizard" id="menu_holidays_summary"/> + <!-- restrict menu access to HR Manager --> + <record model='ir.ui.menu' id="menu_holidays_summary"> + <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/> + </record> + <wizard string="Print Summary of Employee's Holidays" model="hr.employee" name="hr.holidays.summary.employee" keyword="client_print_multi" id="wizard_holidays_summary" /> diff --git a/addons/hr_holidays/i18n/fr_FR.po b/addons/hr_holidays/i18n/fr_FR.po index 9811de832e5..d0e47845b9e 100644 --- a/addons/hr_holidays/i18n/fr_FR.po +++ b/addons/hr_holidays/i18n/fr_FR.po @@ -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 16:30+0000\n" +"PO-Revision-Date: 2008-10-13 11:55+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 12:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays #: view:hr.holidays.status:0 @@ -23,18 +24,18 @@ msgstr "Définir les types de congés" #. module: hr_holidays #: wizard_view:hr.holidays.summary,notify:0 msgid "You have to select atleast 1 Department. Try again." -msgstr "" +msgstr "Vous devez sélectionner au moins 1 département. Essayez à nouveau." #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "Confirmed" -msgstr "" +msgstr "Confirmé" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,date_from:0 #: wizard_field:hr.holidays.summary.employee,init,date_from:0 msgid "From" -msgstr "" +msgstr "De" #. module: hr_holidays #: view:hr.holidays:0 @@ -44,28 +45,28 @@ msgstr "Congés" #. module: hr_holidays #: view:hr.holidays:0 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #. module: hr_holidays #: wizard_view:hr.holidays.summary,notify:0 #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "Notification" -msgstr "" +msgstr "Notification" #. module: hr_holidays #: field:hr.holidays.status,section_id:0 msgid "Section" -msgstr "" +msgstr "Section" #. module: hr_holidays #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Coral" -msgstr "" +msgstr "Corail clair" #. module: hr_holidays #: field:hr.holidays,employee_id:0 @@ -77,124 +78,127 @@ msgstr "Employé" #: model:ir.actions.wizard,name:hr_holidays.holidays_summary #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary msgid "Print Summary of Holidays" -msgstr "" +msgstr "Imprimer le résumé des Vacances" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available msgid "My Available Holidays" -msgstr "" +msgstr "Mes Vacances Disponibles" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Black" -msgstr "" +msgstr "Noir" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse msgid "My Refused Holidays Requests" -msgstr "" +msgstr "Mes Demandes de Vacances Refusées" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting msgid "My Awaiting Confirmation Holidays Requests" -msgstr "" +msgstr "Mes Demandes de Vacances en attende de Confirmation" #. module: hr_holidays #: wizard_button:hr.holidays.summary,init,checkdept:0 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0 msgid "Print" -msgstr "" +msgstr "Imprimer" #. module: hr_holidays #: 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: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" -msgstr "" +msgstr "Demandes en attende de Validation" #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "Refused" -msgstr "" +msgstr "Refusée" #. module: hr_holidays #: field:hr.holidays.per.user,max_leaves:0 msgid "Maximum Leaves Allowed" -msgstr "" +msgstr "Nombre Maximum de Congés Permis" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Blue" -msgstr "" +msgstr "Bleu clair" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Red" -msgstr "" +msgstr "Rouge" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,depts:0 msgid "Department(s)" -msgstr "" +msgstr "Département(s)" #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Brown" -msgstr "" +msgstr "Brun" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Salmon" -msgstr "" +msgstr "Saumon clair" #. module: hr_holidays #: view:hr.holidays.per.user:0 msgid "Holidays Allowed" -msgstr "" +msgstr "Vacances Permises" #. module: hr_holidays -#: xsl:holidays.summary:0 +#: xsl:hr.holidays.holidays_summary:0 msgid "of the" -msgstr "" +msgstr "du" #. module: hr_holidays -#: xsl:holidays.summary:0 +#: xsl:hr.holidays.holidays_summary:0 msgid "Off-Days' Summary" -msgstr "" +msgstr "Résumé des Congés" #. module: hr_holidays #: field:hr.holidays.per.user,leaves_taken:0 msgid "Leaves Already Taken" -msgstr "" +msgstr "Congés déjà pris" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday msgid "My Holidays Request" -msgstr "" +msgstr "Mes Demandes de Congés" #. module: hr_holidays #: field:hr.holidays.status,color_name:0 msgid "Color of the status" -msgstr "" +msgstr "Couleur du Statut" #. module: hr_holidays #: view:hr.holidays:0 msgid "Number of Days" -msgstr "" +msgstr "Nombre de jour" #. module: hr_holidays #: view:hr.holidays:0 msgid "Set to Draft" -msgstr "" +msgstr "Mettre au brouillon" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays @@ -202,75 +206,75 @@ msgid "Holidays" msgstr "Vacances" #. module: hr_holidays -#: xsl:holidays.summary:0 +#: xsl:hr.holidays.holidays_summary:0 msgid "to" -msgstr "" +msgstr "à" #. module: hr_holidays -#: xsl:holidays.summary:0 +#: xsl:hr.holidays.holidays_summary:0 msgid "holidays." -msgstr "" +msgstr "Vacances" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Cyan" -msgstr "" +msgstr "Cyan clair" #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "draft" -msgstr "" +msgstr "brouillon" #. module: hr_holidays #: field:hr.holidays.per.user,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Green" -msgstr "" +msgstr "Vert clair" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,holiday_type:0 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0 msgid "Select Holiday Type" -msgstr "" +msgstr "Sélectionnez le Type de Vacances" #. module: hr_holidays #: selection:hr.holidays,state:0 #: view:hr.holidays:0 msgid "Validate" -msgstr "" +msgstr "Valider" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status #: field:hr.holidays.status,name:0 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status msgid "Holiday Status" -msgstr "" +msgstr "Statut des Vacances" #. module: hr_holidays #: field:hr.holidays,notes:0 #: field:hr.holidays.per.user,notes:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: hr_holidays #: wizard_view:hr.holidays.summary,init:0 #: wizard_view:hr.holidays.summary.employee,init:0 msgid "Report Options" -msgstr "" +msgstr "Options du Rapport" #. module: hr_holidays #: field:hr.holidays,case_id:0 msgid "Case" -msgstr "" +msgstr "Cas" #. module: hr_holidays #: view:hr.holidays:0 msgid "Refuse" -msgstr "" +msgstr "Refuser" #. module: hr_holidays #: field:hr.holidays,user_id:0 @@ -281,27 +285,27 @@ msgstr "" #: wizard_button:hr.holidays.summary,notify,end:0 #: wizard_button:hr.holidays.summary.employee,notify,end:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft msgid "My Draft Holidays Requests" -msgstr "" +msgstr "Mes Demandes de Vacances Brouillon" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday msgid "My Holidays Requests" -msgstr "" +msgstr "Mes Demandes de Vacances" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting msgid "My Holidays Request Waiting confirmation" -msgstr "" +msgstr "Mes Demandes de Vacances en attente de Confirmation" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Violet" -msgstr "" +msgstr "Violet" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 @@ -312,49 +316,49 @@ msgstr "Type de congés" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Ivory" -msgstr "" +msgstr "Ivoire" #. module: hr_holidays #: field:hr.holidays,manager_id:0 msgid "Holiday manager" -msgstr "" +msgstr "Gestionnaire de Vacances" #. module: hr_holidays -#: xsl:holidays.summary:0 +#: xsl:hr.holidays.holidays_summary:0 msgid "Analyze from" -msgstr "" +msgstr "Analyser de" #. module: hr_holidays #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary msgid "Summary Of Holidays" -msgstr "" +msgstr "Résumé des Vacances" #. module: hr_holidays #: wizard_field:hr.holidays.summary.employee,init,emp:0 msgid "Employee(s)" -msgstr "" +msgstr "Employés" #. module: hr_holidays #: field:hr.holidays,number_of_days:0 msgid "Number of Days in this Holiday Request" -msgstr "" +msgstr "Nombre de Jours dans cette Demande de Congé" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user #: view:hr.holidays.per.user:0 msgid "Holidays Per Employee" -msgstr "" +msgstr "Congés par Employé" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Wheat" -msgstr "" +msgstr "Blé" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft msgid "My Holidays Request Draft" -msgstr "" +msgstr "Mes Demandes de Vacances Brouillon" #. module: hr_holidays #: view:hr.holidays.status:0 @@ -364,7 +368,7 @@ msgstr "Types de congés" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate msgid "My Holidays Request Validated" -msgstr "" +msgstr "Mes Demandes de Vacances Validée" #. module: hr_holidays #: field:hr.holidays,name:0 @@ -374,27 +378,27 @@ msgstr "Description" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays msgid "Holidays Request" -msgstr "" +msgstr "Demandes de Vacances" #. module: hr_holidays #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "You have to select at least 1 Employee. Try again." -msgstr "" +msgstr "Vous devez sélectionner au moins 1 employé. Veuillez réessayez." #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting msgid "Holidays Requests Awaiting for Validation" -msgstr "" +msgstr "Demandes de Vacances en attente de Validation" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate msgid "My Validated Holidays Requests" -msgstr "" +msgstr "Mes Demandes de Vacances Validée" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Yellow" -msgstr "" +msgstr "Jaune clair" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_status @@ -404,7 +408,7 @@ msgstr "Statut des vacances" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Pink" -msgstr "" +msgstr "Rose clair" #. module: hr_holidays #: field:hr.holidays,date_to:0 @@ -414,7 +418,7 @@ msgstr "Fin du congé" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Lavender" -msgstr "" +msgstr "Lavande" #. module: hr_holidays #: field:hr.holidays,date_from:0 @@ -424,12 +428,12 @@ msgstr "Début du congé" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday msgid "All Holidays Requests" -msgstr "" +msgstr "Toutes les Demandes de Vacances" #. module: hr_holidays #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary msgid "Print Summary of Employee's Holidays" -msgstr "" +msgstr "Imprimer un Résumé des Vacances de l'employé" #. module: hr_holidays #: wizard_button:hr.holidays.summary,init,end:0 @@ -437,20 +441,19 @@ msgstr "" #: selection:hr.holidays,state:0 #: view:hr.holidays:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Magenta" -msgstr "" +msgstr "Magenta" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse msgid "My Holidays Request Refused" -msgstr "" +msgstr "Mes Demandes de Vacances Refusée" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user msgid "Holidays Per User" -msgstr "" - +msgstr "Vacnaces par Utilisateur" diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml new file mode 100644 index 00000000000..4cbddc9c423 --- /dev/null +++ b/addons/hr_holidays/process/hr_holidays_process.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="process_node_secretariatsocial0" model="process.node"> + <field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/> + <field name="model_id" ref="hr_holidays.model_hr_holidays"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Secretariat Social"""" name="name"/> + <field eval=""""Secretariat social"""" name="note"/> + <field name="process_id" ref="hr.process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_holidays0" model="process.node"> + <field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/> + <field name="model_id" ref="hr_holidays.model_hr_holidays"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Holidays"""" name="name"/> + <field eval=""""Employee Get holidays"""" name="note"/> + <field name="process_id" ref="hr.process_process_employeecontractworkflow0"/> + <field eval=""""object.state in ('draft', 'validate', 'confirm', 'refuse', 'cancel')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_transition_employeesocial0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Employee Social"""" name="name"/> + <field eval=""""Social Activity"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_secretariatsocial0"/> + <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/> + </record> + + <record id="process_transition_employeeholidays0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Employee Holidays"""" name="name"/> + <field eval=""""Employee get holidays"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_holidays0"/> + <field model="process.node" name="source_node_id" ref="process_node_secretariatsocial0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 69619dde43d..b095b8bf50d 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,2 +1,4 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_holidays_per_user,hr.holidays.per.user,model_hr_holidays_per_user,base.group_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1 +"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1 +"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1 diff --git a/addons/hr_timesheet/i18n/fr_FR.po b/addons/hr_timesheet/i18n/fr_FR.po index bf3a595b844..fda6d1ca2da 100644 --- a/addons/hr_timesheet/i18n/fr_FR.po +++ b/addons/hr_timesheet/i18n/fr_FR.po @@ -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 16:28+0000\n" +"PO-Revision-Date: 2008-10-13 15:49+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:51+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet #: wizard_view:hr.analytical.timesheet,init:0 @@ -23,15 +24,18 @@ msgstr "Choisissez le mois" #. module: hr_timesheet #: 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: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet msgid "Employee timesheet" -msgstr "Feuille de temps de l'employé" +msgstr "Feuille de présence de l'employé" #. module: hr_timesheet #: model:ir.actions.wizard,name:hr_timesheet.si_so @@ -50,12 +54,6 @@ msgid "Sign in / Sign out" msgstr "Pointer l'entrée / Pointer la sortie" #. module: hr_timesheet -#, python-format -#: code:addons/hr_timesheet/wizard/sign_in_out.py:0 -msgid "No employee defined for your user !" -msgstr "" - -#. module: hr_timesheet #: wizard_button:hr.analytical.timesheet,init,report:0 #: wizard_button:hr.analytical.timesheet.my,init,report:0 #: wizard_button:hr.analytical.timesheet_users,init,report:0 @@ -88,18 +86,6 @@ msgid "Current Server Date" msgstr "Date du serveur" #. module: hr_timesheet -#, python-format -#: code:addons/hr_timesheet/wizard/sign_in_out.py:0 -msgid "No cost unit defined for this employee !" -msgstr "" - -#. module: hr_timesheet -#, python-format -#: code:addons/hr_timesheet/hr_timesheet.py:0 -msgid "No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal." -msgstr "" - -#. module: hr_timesheet #: field:hr.employee,product_id:0 msgid "Product" msgstr "Produit" @@ -113,7 +99,7 @@ msgstr "Journal analytique" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my msgid "My Working Hours of The Day" -msgstr "" +msgstr "Mes Heures de Travail du Jour" #. module: hr_timesheet #: view:account.analytic.account:0 @@ -145,7 +131,7 @@ msgstr "Timesheet" #. module: hr_timesheet #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Erreur: code EAN invalide" #. module: hr_timesheet #: wizard_field:hr.analytical.timesheet,init,user_id:0 @@ -162,7 +148,7 @@ msgstr "Pointer l'entrée" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form msgid "Working Hours of The Day" -msgstr "" +msgstr "Heures de Travail du Jour" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_out:0 @@ -188,7 +174,7 @@ msgstr "Date de clôture" #. module: hr_timesheet #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0 @@ -204,6 +190,8 @@ msgstr "Résumé analyse" #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" msgstr "" +"Erreur: l'unité de vente doit appartenir à une catégorie différente que " +"l'unité de mesure" #. module: hr_timesheet #: wizard_view:hr.analytical.timesheet_users,init:0 @@ -212,8 +200,11 @@ msgstr "Choisir les utilisateurs" #. module: hr_timesheet #: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 @@ -254,7 +245,7 @@ msgstr "Nom de l'employé" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form msgid "My Working Hours" -msgstr "" +msgstr "Mes Heures de Travail" #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet @@ -269,12 +260,6 @@ msgid "Stop Working" msgstr "Arrêter le travail" #. module: hr_timesheet -#, python-format -#: code:addons/hr_timesheet/wizard/sign_in_out.py:0 -msgid "UserError" -msgstr "" - -#. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 msgid "(Keep empty for current_time)" msgstr "(Garder vide pour la date actuelle)" @@ -282,7 +267,7 @@ msgstr "(Garder vide pour la date actuelle)" #. module: hr_timesheet #: view:hr.employee:0 msgid "Timesheets" -msgstr "" +msgstr "Feuilles de présence" #. module: hr_timesheet #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0 @@ -310,7 +295,7 @@ msgstr "Statistiques par mois" #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form msgid "Working Hours" -msgstr "" +msgstr "Heures de travail" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0 @@ -372,13 +357,6 @@ msgid "Change Work" msgstr "Changer de travail" #. module: hr_timesheet -#, python-format -#: code:addons/hr_timesheet/hr_timesheet.py:0 -msgid "ValidateError" -msgstr "" - -#. module: hr_timesheet #: view:account.analytic.account:0 msgid "To be invoiced" msgstr "A facturer" - diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv index 6a9a08f28c0..a718d2bd4ae 100644 --- a/addons/hr_timesheet/security/ir.model.access.csv +++ b/addons/hr_timesheet/security/ir.model.access.csv @@ -1,2 +1,2 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1 diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml index 2ae672635a5..794c38abc06 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml @@ -1,15 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - + <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/> - + <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/> - - <report auto="False" id="report_analytical_profit" menu="False" model="account.analytic.line" name="account.analytic.profit" rml="hr_timesheet_invoice/report/account_analytic_profit.rml" string="Timesheet profit"/> - - <wizard id="account_analytic_profit" menu="False" model="account.analytic.line" name="account.analytic.profit" string="Timesheet profit"/> + + <report + auto="False" + id="report_analytical_profit" + menu="False" + model="account.analytic.line" + name="account.analytic.profit" + rml="hr_timesheet_invoice/report/account_analytic_profit.rml" + string="Timesheet Profit"/> + + <wizard + id="account_analytic_profit" + menu="False" + model="account.analytic.line" + name="account.analytic.profit" + string="Timesheet profit" + groups="account.group_account_manager"/> + <menuitem action="account_analytic_profit" id="print_account_analytic_profit" parent="hr.menu_hr_reporting" type="wizard"/> - + </data> </openerp> diff --git a/addons/hr_timesheet_invoice/i18n/fr_FR.po b/addons/hr_timesheet_invoice/i18n/fr_FR.po index 44e5f0ada21..be09f6d127c 100644 --- a/addons/hr_timesheet_invoice/i18n/fr_FR.po +++ b/addons/hr_timesheet_invoice/i18n/fr_FR.po @@ -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: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:22+0000\n" +"PO-Revision-Date: 2008-10-13 12:01+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 12:20+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,date_from:0 @@ -44,12 +45,6 @@ msgid "Invoicing" msgstr "Facturation" #. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0 -msgid "At least on line have no product !" -msgstr "" - -#. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Income" msgstr "Revenus" @@ -111,8 +106,11 @@ msgstr "Devise" #. module: hr_timesheet_invoice #: 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: hr_timesheet_invoice #: field:account.analytic.account,pricelist_id:0 @@ -133,7 +131,7 @@ msgstr "Choisissez les comptes que vous désirez facturer" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Total (" -msgstr "Total " +msgstr "Total" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.create,init,product:0 @@ -158,7 +156,7 @@ msgstr "Période de début" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid ")" -msgstr "" +msgstr ")" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 @@ -190,18 +188,6 @@ msgid "to" msgstr "à" #. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0 -msgid "Error" -msgstr "" - -#. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0 -msgid "Balance product needed" -msgstr "" - -#. module: hr_timesheet_invoice #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create msgid "Invoice analytic lines" msgstr "Facturation des lignes analytiques" @@ -216,7 +202,7 @@ msgstr "Date" #. module: hr_timesheet_invoice #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts msgid "Draft Analytic Accounts" -msgstr "Comptes analytiques brouillon" +msgstr "Compte analytique brouiilon" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 @@ -248,7 +234,7 @@ msgstr "Créer des factures" #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view msgid "Types of Invoicing" -msgstr "" +msgstr "Types de Facture" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.final.invoice.create,init,time:0 @@ -269,18 +255,18 @@ msgstr "Types de facturation" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Theorical" -msgstr "" +msgstr "Théorique" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my msgid "My Uninvoiced Entries" -msgstr "" +msgstr "Mes Entrées Non Facturées" #. module: hr_timesheet_invoice #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_timesheet_invoice #: view:hr_timesheet_invoice.factor:0 @@ -288,12 +274,6 @@ msgid "Type of invoicing" msgstr "Type de facturation" #. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0 -msgid "Please fill a Balance product in the wizard" -msgstr "" - -#. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts msgid "Pending Analytic Accounts" @@ -320,13 +300,6 @@ msgid "Invoice rate" msgstr "Taux de facture" #. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0 -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0 -msgid "Analytic account incomplete" -msgstr "" - -#. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0 msgid "End of period" msgstr "Fin de période" @@ -339,13 +312,7 @@ msgstr "Nom interne" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Balance" -msgstr "Balance " - -#. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0 -msgid "Error !" -msgstr "" +msgstr "Balance" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0 @@ -359,12 +326,6 @@ msgid "Name of entry" msgstr "Nom de l'entrée" #. module: hr_timesheet_invoice -#, python-format -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0 -msgid "You can not modify an invoiced analytic line!" -msgstr "" - -#. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Code" msgstr "Code" @@ -378,7 +339,7 @@ msgstr "à" #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts msgid "Unclosed Invoiceable Accounts" -msgstr "" +msgstr "Comptes Facturables Non Cloturés" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.create,init:0 @@ -429,7 +390,7 @@ msgstr "Factures finales" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Total" -msgstr "Total " +msgstr "Total" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,journal_ids:0 @@ -444,5 +405,4 @@ msgstr "Montant de la balance" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Invoice rate by user" -msgstr "" - +msgstr "Taux Facturable par Utilisateur" diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv index f849d88fbcb..c56f26ab3ee 100644 --- a/addons/hr_timesheet_invoice/security/ir.model.access.csv +++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv @@ -1,3 +1,3 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_timesheet_invoice_factor,hr_timesheet_invoice.factor,model_hr_timesheet_invoice_factor,base.group_user,1,0,0,0 -access_hr_timesheet_invoice_factor,hr_timesheet_invoice.factor,model_hr_timesheet_invoice_factor,account.group_account_invoice,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.factor","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0 +"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.factor","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1 diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py index fbf625be1be..7e8a9ff3887 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py @@ -108,15 +108,7 @@ class final_invoice_create(wizard.interface): price = 0.0 taxes = product.taxes_id - taxep = account.partner_id.property_account_tax - if not taxep.id: - tax = [x.id for x in taxes or []] - else: - tax = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - tax.append(t.id) - + tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes) account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id curr_line = { @@ -165,15 +157,8 @@ class final_invoice_create(wizard.interface): taxes = product.taxes_id else: taxes = [] - taxep = account.partner_id.property_account_tax - if not taxep.id: - tax = [x.id for x in taxes or []] - else: - tax = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - tax.append(t.id) + tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes) curr_line = { 'price_unit': -amount, 'quantity': 1.0, @@ -194,15 +179,7 @@ class final_invoice_create(wizard.interface): product = pool.get('product.product').browse(cr, uid, data['form']['balance_product'], context2) taxes = product.taxes_id - taxep = account.partner_id.property_account_tax - if not taxep.id: - tax = [x.id for x in taxes or []] - else: - tax = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - tax.append(t.id) - + tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes) account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id curr_line = { diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index 52cb8387aa4..1e7c328f9dd 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -113,15 +113,7 @@ class invoice_create(wizard.interface): price = 0.0 taxes = product.taxes_id - taxep = account.partner_id.property_account_tax - if not taxep.id: - tax = [x.id for x in taxes or []] - else: - tax = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - tax.append(t.id) - + tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes) account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id curr_line = { diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py index 06922784d56..e3c24de5ea0 100644 --- a/addons/hr_timesheet_project/__terp__.py +++ b/addons/hr_timesheet_project/__terp__.py @@ -34,7 +34,9 @@ "description": """Auto-complete timesheet based on tasks made on the project management module.""", "website" : "http://tinyerp.com/module_hr.html", "depends" : ["project", "hr_timesheet_sheet"], - "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"], + "update_xml" : ["hr_timesheet_project_view.xml", + "process/hr_timesheet_project_process.xml", + ], "active": False, "installable": True } diff --git a/addons/hr_timesheet_project/i18n/fr_FR.po b/addons/hr_timesheet_project/i18n/fr_FR.po index 902bf0ae07c..f483483c7f5 100644 --- a/addons/hr_timesheet_project/i18n/fr_FR.po +++ b/addons/hr_timesheet_project/i18n/fr_FR.po @@ -4,24 +4,24 @@ # 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:09+0000\n" +"PO-Revision-Date: 2008-10-13 12:02+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 12:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_project #: model:ir.actions.wizard,name:hr_timesheet_project.encode_hour_tss msgid "Import Hours From Tasks" -msgstr "" +msgstr "Importer les Heures des Tâches" #. module: hr_timesheet_project #: model:ir.ui.menu,name:hr_timesheet_project.menu_act_hr_timesheet_line_me_today_project_form msgid "Hours From Tasks" -msgstr "" - +msgstr "Heures des Tâches" diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index d514b14bf17..0cc7032602d 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -58,7 +58,7 @@ <field eval=""""Task encoding"""" name="name"/> <field eval=""""Encode how much time u spent on your task"""" name="note"/> <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheetline0"/> - <field model="process.node" name="source_node_id" ref="project.process_node_taskwork0"/> + <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/> </record> <record id="process_transition_tasktimesheet0" model="process.transition"> diff --git a/addons/hr_timesheet_sheet/i18n/fr_FR.po b/addons/hr_timesheet_sheet/i18n/fr_FR.po index d95a163341f..9b5c9328e75 100644 --- a/addons/hr_timesheet_sheet/i18n/fr_FR.po +++ b/addons/hr_timesheet_sheet/i18n/fr_FR.po @@ -4,21 +4,24 @@ # 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:25+0000\n" +"PO-Revision-Date: 2008-10-13 12:10+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 12:40+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#~ msgid "Configuration" +#~ msgstr "Configuration" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Timesheet by Accounts" -msgstr "" +msgstr "Feuille de Feuilles de Présence" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 @@ -32,8 +35,11 @@ msgstr "Présence" #. module: hr_timesheet_sheet #: 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: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -66,13 +72,7 @@ msgstr "Feuilles de présence non-validées" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Timesheet by Days" -msgstr "" - -#. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "You can not sign out from an other date than today" -msgstr "" +msgstr "Feuille de Feuilles de Présence" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 @@ -80,10 +80,8 @@ msgid "Draft" msgstr "Brouillon" #. module: hr_timesheet_sheet -#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form #: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60 -#: view:res.company:0 #: view:hr_timesheet_sheet.sheet:0 msgid "Timesheets" msgstr "Timesheets" @@ -92,7 +90,7 @@ msgstr "Timesheets" #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm msgid "Timesheets To Confirm" -msgstr "" +msgstr "Feuille de Feuilles de Présence" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm @@ -106,7 +104,7 @@ msgstr "Mes feuilles de présence à confirmer" #: field:hr_timesheet_sheet.sheet.account,sheet_id:0 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0 msgid "Sheet" -msgstr "Feuille " +msgstr "Feuille" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -126,13 +124,7 @@ msgstr "Aujourd'hui" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,state:0 msgid "Status" -msgstr "" - -#. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "Please verify that the total difference of the sheet is lower than %.2f !" -msgstr "" +msgstr "État" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance @@ -142,11 +134,9 @@ msgid "Attendances" msgstr "Présences" #. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -#: code:addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py:0 -msgid "Error !" -msgstr "" +#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0 +msgid "Invoice rate" +msgstr "Taux de facturation" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,name:0 @@ -166,18 +156,12 @@ msgstr "Accepter" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet msgid "Timesheet Lines" -msgstr "" - -#. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py:0 -msgid "No employee defined for your user !" -msgstr "" +msgstr "Lignes des Feuilles de Présence" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Current Status" -msgstr "" +msgstr "État actuel" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -192,17 +176,17 @@ msgstr "Semaine" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_to:0 msgid "Date to" -msgstr "Date de " +msgstr "Date de" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,user_id:0 msgid "User" -msgstr "Utilisateur " +msgstr "Utilisateur" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day msgid "Timesheet by Account" -msgstr "" +msgstr "Feuilles de Présence par Compte" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 @@ -218,7 +202,7 @@ msgstr "Date" #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current msgid "My Current Timesheet" -msgstr "" +msgstr "Ma Feuille de Présence actuelle" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.day,total_difference:0 @@ -240,7 +224,7 @@ msgstr "Présent" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_from:0 msgid "Date from" -msgstr "Date de " +msgstr "Date de" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet @@ -255,39 +239,22 @@ msgstr "Absent" #. module: hr_timesheet_sheet #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "UserError" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Daily View" -msgstr "" - -#. module: hr_timesheet_sheet -#: constraint:hr_timesheet_sheet.sheet:0 -msgid "You must select a Current date wich is in the timesheet dates !" -msgstr "" +msgstr "Vue Journalière" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "By Day" -msgstr "" - -#. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "You can not sign in from an other date than today" -msgstr "" +msgstr "Par Jour" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Difference" -msgstr "" +msgstr "Différence Totale" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account @@ -296,14 +263,10 @@ msgid "Timesheets by period" msgstr "Feuilles de présence par période" #. module: hr_timesheet_sheet -#: view:hr_timesheet_sheet.sheet:0 -msgid "Go to:" -msgstr "Aller à :" - -#. module: hr_timesheet_sheet -#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0 -msgid "Invoice rate" -msgstr "Taux de facturation" +#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid +#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid +msgid "Timesheets To Validate" +msgstr "Feuilles de Présence à Valider" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -311,12 +274,6 @@ msgid "Sign In" msgstr "Pointer l'entrée" #. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "You can not modify an entry in a confirmed timesheet !" -msgstr "" - -#. module: hr_timesheet_sheet #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate @@ -327,20 +284,18 @@ msgid "My department's timesheet" msgstr "Les feuilles de présence de mon département" #. module: hr_timesheet_sheet -#, python-format -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0 -msgid "Warning !" -msgstr "" - -#. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Timesheet by accounts" msgstr "Feuille de présence par compte" #. module: hr_timesheet_sheet #: help:res.company,timesheet_max_difference:0 -msgid "Allowed difference between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control." -msgstr "La différence permise entre le sign in/out and le calcul de la timesheet pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle." +msgid "" +"Allowed difference between the sign in/out and the timesheet computation for " +"one sheet. Set this to 0 if you do not want any control." +msgstr "" +"La différence permise entre le sign in/out and le calcul de la timesheet " +"pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle." #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,account_ids:0 @@ -348,9 +303,9 @@ msgid "Analytic accounts" msgstr "Compte analytique" #. module: hr_timesheet_sheet -#: view:res.company:0 -msgid "Configuration" -msgstr "Configuration" +#: view:hr_timesheet_sheet.sheet:0 +msgid "Go to:" +msgstr "Aller à :" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my @@ -384,7 +339,7 @@ msgstr "Période" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Timesheet" -msgstr "Feuille de présence " +msgstr "Feuille de présence" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 @@ -412,12 +367,6 @@ msgid "Current date" msgstr "Date actuelle" #. module: hr_timesheet_sheet -#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid -#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid -msgid "Timesheets To Validate" -msgstr "" - -#. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Year" msgstr "Année" @@ -425,10 +374,9 @@ msgstr "Année" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Total" -msgstr "" +msgstr "Total" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account msgid "Timesheet by Day" -msgstr "" - +msgstr "Feuilles de Présence par Jour" diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 24374c2a810..6917812bedb 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -89,6 +89,7 @@ <field eval=""""Timesheet"""" name="name"/> <field eval=""""Defines the task work entry into timesheet line"""" name="note"/> <field name="process_id" ref="process_process_hrtimesheetworkflow0"/> + <field name="subflow_id" ref="hr_timesheet.process_process_timesheetworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -140,6 +141,14 @@ <!-- Process Transition --> + + <record id="res_roles_hr0" model="res.roles"> + <field eval=""""HR"""" name="name"/> + </record> + + <record id="hr_timesheet_sheet.t1" model="workflow.transition"> + <field name="role_id" ref="res_roles_hr0"/> + </record> <record id="process_transition_attendance0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -166,6 +175,7 @@ <field eval=""""timesheet is confirmed at the end of the week / month"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/> <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/> + <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/> </record> <record id="process_transition_validatetimesheet0" model="process.transition"> @@ -222,5 +232,38 @@ <field model="process.node" name="source_node_id" ref="process_node_review0"/> </record> + <!-- + Process Action + --> + + <record id="process_transition_action_draftconfirmtimesheet0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmtimesheet0"/> + </record> + + <record id="process_transition_action_validatetimesheet0" model="process.transition.action"> + <field eval=""""write({'state':'done'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Validate"""" name="name"/> + <field name="transition_id" ref="process_transition_validatetimesheet0"/> + </record> + + <record id="process_transition_action_refusetimesheet0" model="process.transition.action"> + <field eval=""""write({'state':'draft'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Refuse"""" name="name"/> + <field name="transition_id" ref="process_transition_validatetimesheet0"/> + </record> + + <record id="process_transition_action_reviewtimesheet0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Review"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmtimesheetsheet0"/> + </record> + + </data> </openerp>
\ No newline at end of file diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index be9d927f9a4..5b7cf40a379 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -1,4 +1,4 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_timesheet_sheet_sheet,hr_timesheet_sheet.sheet,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1 -access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,1 -access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1 +"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1 +"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1 diff --git a/addons/idea/i18n/fr_FR.po b/addons/idea/i18n/fr_FR.po index adca5caadee..78245fbe6c0 100644 --- a/addons/idea/i18n/fr_FR.po +++ b/addons/idea/i18n/fr_FR.po @@ -4,65 +4,69 @@ # 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 16:48+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 17:12+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: idea #: field:idea.category,name:0 #: field:idea.idea,category_id:0 msgid "Category" -msgstr "" +msgstr "Catégorie" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Very Good" -msgstr "" +msgstr "Très bien" #. module: idea #: field:idea.idea,stat_vote_ids:0 #: view:idea.idea:0 msgid "Statistics" -msgstr "" +msgstr "Statistiques" #. module: idea #: 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: idea #: selection:idea.idea,state:0 msgid "Opened" -msgstr "" +msgstr "Ouvert" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Not Voted" -msgstr "" +msgstr "Pas de vote" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my msgid "My Open Ideas" -msgstr "" +msgstr "Mes Idées Ouvertes" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea #: model:ir.ui.menu,name:idea.menu_ideas #: model:ir.ui.menu,name:idea.menu_ideas1 msgid "Ideas" -msgstr "" +msgstr "Idées" #. module: idea #: model:ir.model,name:idea.model_idea_comment @@ -70,82 +74,82 @@ msgstr "" #: view:idea.comment:0 #: view:idea.idea:0 msgid "Comments" -msgstr "" +msgstr "Commentaires" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Very Bad" -msgstr "" +msgstr "Très mauvais" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Bad" -msgstr "" +msgstr "Mauvais" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_category_tree #: model:ir.ui.menu,name:idea.menu_idea_category_tree msgid "Ideas by Categories" -msgstr "" +msgstr "Idées par Catégorie" #. module: idea #: field:idea.vote,score:0 #: field:idea.vote.stat,score:0 msgid "Score" -msgstr "" +msgstr "Score" #. module: idea #: selection:idea.idea,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_vote msgid "Idea's vote" -msgstr "" +msgstr "Vote de l'Idée" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_vote_stat msgid "Statistics on Votes" -msgstr "" +msgstr "Statistiques sur les Votes" #. module: idea #: model:ir.model,name:idea.model_idea_category msgid "Category for an idea" -msgstr "" +msgstr "Catégorie d'une Idée" #. module: idea #: view:idea.category:0 msgid "Category of ideas" -msgstr "" +msgstr "Catégories d'Idée" #. module: idea #: field:idea.idea,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Good" -msgstr "" +msgstr "Bon" #. module: idea #: field:idea.idea,description:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Normal" -msgstr "" +msgstr "Normal" #. module: idea #: model:ir.ui.menu,name:idea.menu_reporting @@ -155,12 +159,12 @@ msgstr "Reporting" #. module: idea #: view:idea.idea:0 msgid "Close" -msgstr "" +msgstr "Fermer" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat msgid "Idea Votes Statistics" -msgstr "" +msgstr "Statistiques des Votes d'Idée" #. module: idea #: model:ir.model,name:idea.model_idea_vote @@ -171,17 +175,17 @@ msgstr "" #: field:idea.comment,user_id:0 #: field:idea.vote,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: idea #: view:idea.idea:0 msgid "Your comment" -msgstr "" +msgstr "Votre commentaire" #. module: idea #: selection:idea.idea,state:0 msgid "Accepted" -msgstr "" +msgstr "Accepté" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_category @@ -196,23 +200,23 @@ msgstr "" #. module: idea #: field:idea.idea,my_vote:0 msgid "My Vote" -msgstr "" +msgstr "Mes Votes" #. module: idea #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: idea #: view:idea.vote:0 msgid "Votes" -msgstr "" +msgstr "Votes" #. module: idea #: field:idea.comment,create_date:0 #: field:idea.idea,create_date:0 msgid "Creation date" -msgstr "" +msgstr "Date de création" #. module: idea #: field:idea.idea,count_votes:0 @@ -222,7 +226,7 @@ msgstr "" #. module: idea #: field:idea.vote.stat,nbr:0 msgid "Number of Votes" -msgstr "" +msgstr "Nombre de Votes" #. module: idea #: model:ir.model,name:idea.model_idea_idea @@ -232,29 +236,29 @@ msgstr "" #. module: idea #: field:idea.category,summary:0 msgid "Summary" -msgstr "" +msgstr "Résumé" #. module: idea #: view:idea.idea:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea msgid "My Ideas" -msgstr "" +msgstr "Mes Idées" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_idea #: view:idea.idea:0 msgid "All Ideas" -msgstr "" +msgstr "Toutes les Idées" #. module: idea #: field:idea.category,child_ids:0 msgid "Child Categories" -msgstr "" +msgstr "Catégories filles" #. module: idea #: field:idea.idea,count_comments:0 @@ -264,22 +268,22 @@ msgstr "" #. module: idea #: field:idea.idea,title:0 msgid "Idea Summary" -msgstr "" +msgstr "Résumé de l'Idée" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_vote_stat msgid "Vote Statistics" -msgstr "" +msgstr "Statistiques des Votes" #. module: idea #: view:idea.idea:0 msgid "New Idea" -msgstr "" +msgstr "Nouvelle Idée" #. module: idea #: field:idea.idea,vote_avg:0 msgid "Average Score" -msgstr "" +msgstr "Moyenne des scores" #. module: idea #: view:idea.idea:0 @@ -292,7 +296,7 @@ msgstr "" #: view:idea.comment:0 #: view:idea.idea:0 msgid "Comment" -msgstr "" +msgstr "Commentaire" #. module: idea #: model:ir.ui.menu,name:idea.menu_config @@ -302,17 +306,17 @@ msgstr "Configuration" #. module: idea #: field:idea.category,parent_id:0 msgid "Parent Categories" -msgstr "" +msgstr "Catégorie Parente" #. module: idea #: field:idea.idea,user_id:0 msgid "Creator" -msgstr "" +msgstr "Créateur" #. module: idea #: view:idea.idea:0 msgid "Open" -msgstr "" +msgstr "Ouvert" #. module: idea #: field:idea.comment,idea_id:0 @@ -320,43 +324,42 @@ msgstr "" #: field:idea.vote.stat,idea_id:0 #: view:idea.idea:0 msgid "Idea" -msgstr "" +msgstr "Idée" #. module: idea #: selection:idea.idea,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulée" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_vote msgid "All Votes" -msgstr "" +msgstr "Tous les Votes" #. module: idea #: field:idea.idea,vote_ids:0 msgid "Vote" -msgstr "" +msgstr "Vote" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my msgid "My Draft Ideas" -msgstr "" +msgstr "Mes Idées Brouillon" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open #: model:ir.actions.act_window,name:idea.action_idea_idea_open #: model:ir.ui.menu,name:idea.menu_idea_idea_open msgid "Open Ideas" -msgstr "" +msgstr "Idées Ouvertes" #. module: idea #: model:ir.ui.menu,name:idea.menu_tools msgid "Tools" -msgstr "" +msgstr "Outils" #. module: idea #: help:idea.idea,description:0 msgid "Content of the idea" -msgstr "" - +msgstr "Contenu de l'Idée" diff --git a/addons/l10n_be/account.report.report.csv b/addons/l10n_be/account.report.report.csv index 0ae4993b5de..8bf965c741c 100644 --- a/addons/l10n_be/account.report.report.csv +++ b/addons/l10n_be/account.report.report.csv @@ -1,21 +1,21 @@ -expression,note,parent_id,sequence,expression_status,style,type,code,name
-0,,,,0,1,indicator,BILAN,Bilan
-"report('BIMMO','BSTOCK','BREAL','BDISPO')",,BILAN,,0,2,fiscal,Actif,Actif
-balance('2'),,Actif,,0,3,indicator,BIMMO,Valeurs immobilisées
-balance('3'),,Actif,2,0,3,indicator,BSTOCK,Stocks
-balance('4'),,Actif,3,0,3,indicator,BREAL,Réalisable
-balance('5'),,Actif,4,0,3,fiscal,BDISPO,Disponible
-report('BCAP') + report('BRESNET'),,BILAN,1,0,2,fiscal,PASSIF,Passif
-balance('1'),,PASSIF,1,0,5,indicator,BCAP,Capitaux propores
--balance('7')+balance('6'),,PASSIF,,0,3,fiscal,BRESNET,Résultat net
-0,,,,0,1,fiscal,CRES,Compte des résultats
-"report('CCHAR','CBENEF')",,CRES,,0,2,fiscal,CRESACTIF,Résultat Actif
-balance('6'),,CRESACTIF,,0,2,fiscal,CCHAR,Total des charges
-report('CRESPROD'),,CRES,,0,2,fiscal,CRESPASSIF,Résultat Passif
--balance('7'),,CRESPASSIF,,0,2,fiscal,CRESPROD,Total des produits
--balance('7')+balance('6'),,CRESACTIF,,0,2,fiscal,CBENEF,Résultat (Bénéfice)
-0,,,,0,3,indicator,IIMMO,Immobilisations
-"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.",IIMMO,,"balance('1')/balance(map(str(range(21,29)))) - 1",3,indicator,CIMMO,Couverture des immobilisations
-0,,,,0,2,indicator,ITRE,Trésorerie
-"balance('3','4','5') / balance('101','13','15','16','17','18')",Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme,ITRE,,"balance('3','4','5') / balance('101','13','15','16','17','18')",3,indicator,IFR,Indice du fond de roulement
-"balance('4','5') / balance('101','13','15','16','17','18')",,ITRE,,"balance('4','5') / balance('101','13','15','16','17','18')",5,indicator,RTRE,Ratio de trésorerie
+"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" +0,,,,0,1,"indicator","BILAN","Bilan" +"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" +"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +0,,,,0,1,"fiscal","CRES","Compte des résultats" +"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +0,,,,0,1,"indicator","IIMMO","Immobilisations" +"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +0,,,,0,1,"indicator","ITRE","Trésorerie" +"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index d7252313333..1951975d618 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -59,7 +59,6 @@ <field name="close_method">none</field> </record> - <!-- Chart template of l10n_be --> <!-- Account template definition --> <record id="a_root" model="account.account.template"> @@ -6434,7 +6433,7 @@ <!-- Tax Code Configuration --> <record id="vat_code_chart_root" model="account.tax.code.template"> - <field name="name">Plan de Taxe Belge</field> + <field name="name">Plan de Taxes Belge</field> </record> <record id="vat_code_op_base" model="account.tax.code.template"> <field name="name">I. Valeur des operations</field> diff --git a/addons/l10n_be/i18n/fr_FR.po b/addons/l10n_be/i18n/fr_FR.po index e5438c16365..4968f890d53 100644 --- a/addons/l10n_be/i18n/fr_FR.po +++ b/addons/l10n_be/i18n/fr_FR.po @@ -4,79 +4,24 @@ # 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:24+0000\n" +"PO-Revision-Date: 2008-10-13 12:11+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 12:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_produit -msgid "Produit" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_tiers -msgid "Tiers" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_view -msgid "Vue" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_stock -msgid "Stock et Encours" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_immo -msgid "Immobilisation" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_tax -msgid "Tax" -msgstr "Impôts et taxes" +#: constraint:account.tax.code:0 +msgid "Error ! You can not create recursive accounts." +msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs." #. module: l10n_be #: model:ir.ui.menu,name:l10n_be.account_wizard_vat_declaration msgid "VAT Declaration" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_tiers_receiv -msgid "Tiers - Recevable" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_charge -msgid "Charge" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_financiers -msgid "Financier" -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_capitaux -msgid "Capital" -msgstr "" - -#. module: l10n_be -#: constraint:account.tax.code.template:0 -msgid "Error ! You can not create recursive Tax Codes." -msgstr "" - -#. module: l10n_be -#: model:account.account.type,name:l10n_be.user_type_tiers_payable -msgid "Tiers - Payable" -msgstr "" - +msgstr "Déclaration TVA" diff --git a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po index 37b4a250448..e363fa287cd 100644 --- a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po +++ b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po @@ -4,19 +4,19 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" -"POT-Creation-Date: 2008-09-04 08:35:53+0000" -"PO-Revision-Date: 2008-09-04 08:35:53+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:31+0000\n" +"PO-Revision-Date: 2008-10-14 13: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 14:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: l10n_chart_uk_minimal #: constraint:account.tax.code:0 msgid "Error ! You can not create recursive accounts." -msgstr "" - +msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs." diff --git a/addons/l10n_fr/i18n/fr_FR.po b/addons/l10n_fr/i18n/fr_FR.po index cb1f7eaaa9c..9124295c3a5 100644 --- a/addons/l10n_fr/i18n/fr_FR.po +++ b/addons/l10n_fr/i18n/fr_FR.po @@ -4,32 +4,33 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" -"POT-Creation-Date: 2008-09-04 08:35:53+0000" -"PO-Revision-Date: 2008-09-04 08:35:53+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:45+0000\n" +"PO-Revision-Date: 2008-10-14 13: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 13:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: l10n_fr #: model:account.account.type,name:l10n_fr.account_type_dettes msgid "dettes long terme" -msgstr "" +msgstr "dettes long terme" #. module: l10n_fr #: model:ir.actions.wizard,name:l10n_fr.wizard_chart_report #: model:ir.ui.menu,name:l10n_fr.menu_fr_chart_report msgid "Account Report" -msgstr "" +msgstr "Rapport de compte" #. module: l10n_fr #: wizard_field:account.chart.report,init,company_id:0 msgid "Company" -msgstr "" +msgstr "Société" #. module: l10n_fr #: wizard_button:account.chart.report,init,pdf:0 @@ -39,45 +40,44 @@ msgstr "" #. module: l10n_fr #: wizard_field:account.chart.report,init,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "Année fiscale" #. module: l10n_fr #: model:account.account.type,name:l10n_fr.account_type_immobilisations msgid "immobilisations" -msgstr "" +msgstr "immobilisations" #. module: l10n_fr #: wizard_view:account.chart.report,init:0 msgid "Aged Trial Balance" -msgstr "" +msgstr "Echéancier" #. module: l10n_fr #: model:account.journal,name:l10n_fr.operations_journal msgid "Journal des opérations diverses" -msgstr "" +msgstr "Journal des opérations diverses" #. module: l10n_fr #: model:account.journal,name:l10n_fr.bilan_journal msgid "Journal d'ouverture" -msgstr "" +msgstr "Journal d'ouverture" #. module: l10n_fr #: wizard_button:account.chart.report,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: l10n_fr #: model:account.account.type,name:l10n_fr.account_type_cloture msgid "Cloture" -msgstr "" +msgstr "Cloture" #. module: l10n_fr #: model:account.account.type,name:l10n_fr.account_type_stocks msgid "stocks" -msgstr "" +msgstr "stocks" #. module: l10n_fr #: wizard_field:account.chart.report,init,target_move:0 msgid "Target Moves" -msgstr "" - +msgstr "Mouvements Cibles" diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py new file mode 100644 index 00000000000..c185005c878 --- /dev/null +++ b/addons/l10n_lu/__init__.py @@ -0,0 +1,4 @@ +# +# Generated by the Tiny ERP module recorder ! +# +import wizard diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py new file mode 100644 index 00000000000..49761b3fdb5 --- /dev/null +++ b/addons/l10n_lu/__terp__.py @@ -0,0 +1,24 @@ +{ + "name" : "Luxembourg - Plan Comptable Minimum Normalise", + "version" : "1.0", + "author" : "Tiny", + "website" : "http://openerp.com", + "category" : "Localisation/Account Charts", + "description": """ +This module install: + + *the KLUWER Chart of Accounts, + *the Tax Code Chart for Luxembourg + *the main taxes used in Luxembourg""", + "depends" : ["account","account_report","base_vat","base_iban"], + "init_xml" : [ ], + "demo_xml" : ["account.report.report.csv"], + "update_xml" : [ + "account.tax.code.template.csv", + "l10n_lu_data.xml", + "account.tax.template.csv", + "l10n_lu_wizard.xml", + "l10n_lu_report.xml", + ], + "installable": True +} diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv new file mode 100644 index 00000000000..8bf965c741c --- /dev/null +++ b/addons/l10n_lu/account.report.report.csv @@ -0,0 +1,21 @@ +"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" +0,,,,0,1,"indicator","BILAN","Bilan" +"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" +"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +0,,,,0,1,"fiscal","CRES","Compte des résultats" +"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +0,,,,0,1,"indicator","IIMMO","Immobilisations" +"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +0,,,,0,1,"indicator","ITRE","Trésorerie" +"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" diff --git a/addons/l10n_lu/account.tax.code.template.csv b/addons/l10n_lu/account.tax.code.template.csv new file mode 100644 index 00000000000..eea68172e6c --- /dev/null +++ b/addons/l10n_lu/account.tax.code.template.csv @@ -0,0 +1,90 @@ +"parent_id:id","code","sign","id","name" +,,1,"account_tax_code_template_1","Plan de Taxes Luxembourgeois" +"account_tax_code_template_1",76,1,"account_tax_code_template_73","Solde à verser" +"account_tax_code_template_1",10,-1,"account_tax_code_template_8","Prestations de services (art 26)" +"account_tax_code_template_1",46,1,"account_tax_code_template_37","Total Base intracommunautaire" +"account_tax_code_template_1",52,1,"account_tax_code_template_50","Acquisition triangulaire" +"account_tax_code_template_1",61,1,"account_tax_code_template_63","Total Base Importation" +"account_tax_code_template_1",74,1,"account_tax_code_template_71","Excédent de taxe" +"account_tax_code_template_1",9,1,"account_tax_code_template_2","Total du chiffre d'affaires" +"account_tax_code_template_2",5,1,"account_tax_code_template_5","Prélèvements privés de services (art 16)" +"account_tax_code_template_2",4,1,"account_tax_code_template_4","Prélèvements privés de biens (art 13 a)" +"account_tax_code_template_2",8,1,"account_tax_code_template_7","Point 5" +"account_tax_code_template_2",3,1,"account_tax_code_template_3","1. Ventes ou recettes" +"account_tax_code_template_2",6,1,"account_tax_code_template_6","Affectation de biens (art 13 b)" +"account_tax_code_template_3","Exo",1,"account_tax_code_template_90","Total Exoneration" +"account_tax_code_template_3",22,1,"account_tax_code_template_17","Chiffre d'affaires imposable (sans TVA)" +"account_tax_code_template_8",422,1,"account_tax_code_template_87","Base des prestations de services (art.26/1/c et d)" +"account_tax_code_template_8",92,1,"account_tax_code_template_78","Livraisons de biens (art. 26) 6%" +"account_tax_code_template_17",33,1,"account_tax_code_template_28","Base CA 6%" +"account_tax_code_template_17",32,1,"account_tax_code_template_27","Base CA 15%" +"account_tax_code_template_17",82,1,"account_tax_code_template_31","Base CA au taux indéfini" +"account_tax_code_template_17",35,1,"account_tax_code_template_30","Base CA 12%" +"account_tax_code_template_17",34,1,"account_tax_code_template_29","Base CA 3%" +"account_tax_code_template_37",44,1,"account_tax_code_template_40","Base intracom. 3%" +"account_tax_code_template_37",85,1,"account_tax_code_template_42","Base intracom. exonérée" +"account_tax_code_template_37",43,1,"account_tax_code_template_39","Base intracom. 6%" +"account_tax_code_template_37",42,1,"account_tax_code_template_38","Base intracom. 15%" +"account_tax_code_template_37",45,1,"account_tax_code_template_41","Base intracom. 12%" +"account_tax_code_template_73",97,1,"account_tax_code_template_82","Taxe livraisons de biens (art. 26) 6%" +"account_tax_code_template_90",19,1,"account_tax_code_template_16","Point 7" +"account_tax_code_template_90",17,1,"account_tax_code_template_15","Autres opérations réalisées à l'étranger" +"account_tax_code_template_90",13,1,"account_tax_code_template_11","Autres exonérations (art 43)" +"account_tax_code_template_90",14,1,"account_tax_code_template_12","Autres exonérations (art 44)" +"account_tax_code_template_90",11,1,"account_tax_code_template_9","Livraisons intracommunautaires de biens" +"account_tax_code_template_90",12,1,"account_tax_code_template_10","Exportations (art 43)" +"account_tax_code_template_90",15,1,"account_tax_code_template_13","Tabacs fabriqués" +"account_tax_code_template_90",16,1,"account_tax_code_template_14","Livraisons / aquisitions intracom." +"account_tax_code_template_71",73,-1,"account_tax_code_template_70","Taxe en amont déductible" +"account_tax_code_template_71",98,1,"account_tax_code_template_83","Total de la taxe à payer" +"account_tax_code_template_83",72,1,"account_tax_code_template_69","Total de la taxe" +"account_tax_code_template_70",31,1,"account_tax_code_template_26","Taxe en amont déductible" +"account_tax_code_template_26",27,1,"account_tax_code_template_22","Taxe déclarée comme débiteur" +"account_tax_code_template_26",28,1,"account_tax_code_template_23","Taxe acquittée comme caution solidaire" +"account_tax_code_template_26",29,-1,"account_tax_code_template_24","Taxe non déductible / op. exonérée" +"account_tax_code_template_26",30,-1,"account_tax_code_template_25","Taxe non déductible (art 50)" +"account_tax_code_template_26",23,1,"account_tax_code_template_18","Achat de B. et S. à l'intérieur du pays" +"account_tax_code_template_26",24,1,"account_tax_code_template_19","Acquisitions intracom. de biens" +"account_tax_code_template_26",26,1,"account_tax_code_template_21","Affectations de biens" +"account_tax_code_template_26",25,1,"account_tax_code_template_20","Importations de biens" +"account_tax_code_template_69",70,1,"account_tax_code_template_59","Total Taxe Importation (entr.)" +"account_tax_code_template_69",219,1,"account_tax_code_template_88","Taxe des prestations de services (art.26/1/c et d)" +"account_tax_code_template_69",87,1,"account_tax_code_template_44","Report" +"account_tax_code_template_44",86,1,"account_tax_code_template_43","A reporter" +"account_tax_code_template_43",51,1,"account_tax_code_template_49","Total Taxe intracom." +"account_tax_code_template_49",47,1,"account_tax_code_template_45","Taxe intracom. 15%" +"account_tax_code_template_49",81,1,"account_tax_code_template_53","Base à un taux exonéré" +"account_tax_code_template_49",59,1,"account_tax_code_template_62","Base Importation (privées) 3%" +"account_tax_code_template_49",50,1,"account_tax_code_template_48","Taxe intracom. 12%" +"account_tax_code_template_49",48,1,"account_tax_code_template_46","taxe intracom. 6%" +"account_tax_code_template_49",49,1,"account_tax_code_template_47","Taxe intracom. 3%" +"account_tax_code_template_49",65,1,"account_tax_code_template_58","Taxe Importation (entr.) 12%" +"account_tax_code_template_69",71,1,"account_tax_code_template_68","Total Taxe Importation (privées)" +"account_tax_code_template_58",63,1,"account_tax_code_template_84","Taxe importation (entr.) 6%" +"account_tax_code_template_58",64,1,"account_tax_code_template_57","Taxe Importation (entr.) 3%" +"account_tax_code_template_58",62,1,"account_tax_code_template_56","Taxe Importation (entr.) 15%" +"account_tax_code_template_63",58,1,"account_tax_code_template_61","Base Importation (privées) 6%" +"account_tax_code_template_63",54,1,"account_tax_code_template_52","Base Importation (entr.) 6%" +"account_tax_code_template_63",57,1,"account_tax_code_template_60","Base Importation (privées) 15%" +"account_tax_code_template_63",56,1,"account_tax_code_template_55","Base Importation (entr.) 12%" +"account_tax_code_template_63",55,1,"account_tax_code_template_54","Base Importation (entr.) 3%" +"account_tax_code_template_63",53,1,"account_tax_code_template_51","Base importation (entr.) 15%" +"account_tax_code_template_63",60,1,"account_tax_code_template_85","Base importation (privées.) 12%" +"account_tax_code_template_68",68,1,"account_tax_code_template_66","Taxe Importation (privées) 3%" +"account_tax_code_template_68",69,1,"account_tax_code_template_67","Taxe Importation (privées) 12%" +"account_tax_code_template_68",67,1,"account_tax_code_template_65","Taxe Importation (privées) 6%" +"account_tax_code_template_68",66,1,"account_tax_code_template_64","Taxe Importation (privées) 15%" +"account_tax_code_template_87",89,1,"account_tax_code_template_75","Prestations de services (art. 26) 6%" +"account_tax_code_template_87",88,1,"account_tax_code_template_74","Prestations de services (art. 26) 15%" +"account_tax_code_template_87",91,1,"account_tax_code_template_77","Prestations de services (art. 26) 12%" +"account_tax_code_template_87",90,1,"account_tax_code_template_76","Prestations de services (art. 26) 3%" +"account_tax_code_template_88",94,1,"account_tax_code_template_79","Taxe prestations de services (art. 26) 6%" +"account_tax_code_template_88",93,1,"account_tax_code_template_86","Taxe prestation de services (Art.26) 15%" +"account_tax_code_template_88",96,1,"account_tax_code_template_81","Taxe prestations de services (art. 26) 12%" +"account_tax_code_template_88",95,1,"account_tax_code_template_80","Taxe prestations de services (art. 26) 3%" +"account_tax_code_template_43",41,1,"account_tax_code_template_89",41 +"account_tax_code_template_89",40,1,"account_tax_code_template_35","Taxes CA 12%" +"account_tax_code_template_89",83,1,"account_tax_code_template_36","Taxe au taux indéfini" +"account_tax_code_template_89",39,1,"account_tax_code_template_34","Taxe CA 3%" +"account_tax_code_template_89",37,1,"account_tax_code_template_32","Taxe CA 15%" +"account_tax_code_template_89",38,1,"account_tax_code_template_33","Taxe CA 6%" diff --git a/addons/l10n_lu/account.tax.template.csv b/addons/l10n_lu/account.tax.template.csv new file mode 100644 index 00000000000..93b4aaa28ea --- /dev/null +++ b/addons/l10n_lu/account.tax.template.csv @@ -0,0 +1,35 @@ +"ref_base_code_id:id","ref_base_sign","name","ref_tax_code_id:id","account_collected_id:id","amount","chart_template_id:id","tax_code_id:id","child_depend","include_base_amount","parent_id:id","tax_sign","account_paid_id:id","base_code_id:id","id","ref_tax_sign" +"account_tax_code_template_9",-1,"Intra Travail à façon 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_1",1 +"account_tax_code_template_9",-1,"Intra Livraison avec installation 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_2",1 +"account_tax_code_template_9",-1,"Intra transfert de biens 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_3",1 +"account_tax_code_template_13",-1,"Vente de tabacs 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_13","account_tax_template_9",1 +"account_tax_code_template_10",-1,"Exportations 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_10","account_tax_template_10",1 +,1,"Achats frais généraux 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,,"account_tax_template_11",1 +"account_tax_code_template_29",-1,"Ventes 3%","account_tax_code_template_34","account_451000","0.0300","l10nlu_chart_template","account_tax_code_template_34",0,0,,1,"account_451000","account_tax_code_template_29","account_tax_template_5",-1 +"account_tax_code_template_28",-1,"Ventes 6%","account_tax_code_template_33","account_451000","0.0600","l10nlu_chart_template","account_tax_code_template_33",0,0,,1,"account_451000","account_tax_code_template_28","account_tax_template_6",-1 +"account_tax_code_template_30",-1,"Ventes 12%","account_tax_code_template_35","account_451000","0.1200","l10nlu_chart_template","account_tax_code_template_35",0,0,,1,"account_451000","account_tax_code_template_30","account_tax_template_7",-1 +"account_tax_code_template_27",-1,"Ventes 15%","account_tax_code_template_32","account_451000","0.1500","l10nlu_chart_template","account_tax_code_template_32",0,0,,1,"account_451000","account_tax_code_template_27","account_tax_template_8",-1 +,1,"Achats frais généraux 15%","account_tax_code_template_18","account_411000","0.1500","l10nlu_chart_template","account_tax_code_template_18",0,0,,1,"account_411000",,"account_tax_template_12",-1 +,1,"Achats Intra-Co",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_13",1 +,1,"Achats de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_18",1 +,1,"Ventes de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_21",1 +,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,,1,"account_411000","account_tax_code_template_38","account_tax_template_26",1 +,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,,-1,"account_451000",,"account_tax_template_25",1 +,1,"Importations a des fins de l'entreprise",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_30",1 +,1,"Importations a des fins privées",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_33",1 +,1,"Livraisons de Biens Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_36",1 +,1,"Livraison de Biens triangulaire",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_24",1 +,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_24",-1,"account_451000",,"account_tax_template_22",1 +,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_24",1,"account_411000","account_tax_code_template_38","account_tax_template_23",1 +,1,"Importations Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_56",0,0,"account_tax_template_30",-1,"account_411000","account_tax_code_template_51","account_tax_template_28",1 +,1,"Importations Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_30",1,"account_411000",,"account_tax_template_29",1 +,1,"Importations Fins Privées",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_64",0,0,"account_tax_template_33",-1,"account_411000","account_tax_code_template_60","account_tax_template_31",1 +,1,"Importations Fins Privées",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_33",1,"account_411000",,"account_tax_template_32",1 +,1,"Livraison de Biens Art26",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_36",-1,"account_451000",,"account_tax_template_34",1 +,1,"Livraisons de Biens Art26",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_82",0,0,"account_tax_template_36",1,"account_411000","account_tax_code_template_78","account_tax_template_35",1 +,1,"Achats Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_19",0,0,"account_tax_template_13",1,"account_411000","account_tax_code_template_38","account_tax_template_14",1 +,1,"Achats Intra-CO2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_13",-1,"account_411000",,"account_tax_template_15",1 +,1,"Services Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_18",-1,"account_411000",,"account_tax_template_17",1 +,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_18",1,"account_411000","account_tax_code_template_38","account_tax_template_16",1 +,1,"Services Intra-Co2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_21",-1,"account_451000",,"account_tax_template_19",1 +,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_86",0,0,"account_tax_template_21",1,"account_411000","account_tax_code_template_74","account_tax_template_20",1 diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml new file mode 100644 index 00000000000..ce071ad4cc5 --- /dev/null +++ b/addons/l10n_lu/l10n_lu_data.xml @@ -0,0 +1,3784 @@ +<?xml version="1.0" ?> +<openerp> + <data noupdate="1"> + <!-- + Account Type + --> + <record id="account_type_root" model="account.account.type"> + <field name="name">View</field> + <field name="code">view</field> + <field name="close_method">none</field> + </record> + <record id="account_type_asset" model="account.account.type"> + <field name="name">Asset</field> + <field name="code">asset</field> + <field name="close_method">balance</field> + </record> + <record id="account_type_liability" model="account.account.type"> + <field name="name">Liability</field> + <field name="code">liability</field> + <field name="close_method">balance</field> + </record> + <record id="account_type_creances" model="account.account.type"> + <field name="name">Créances</field> + <field name="code">creances</field> + <field name="close_method">balance</field> + </record> + <record id="account_type_cash_equity" model="account.account.type"> + <field name="name">Equity</field> + <field name="code">equity</field> + <field name="close_method">balance</field> + </record> + <record id="account_type_income" model="account.account.type"> + <field name="name">Income</field> + <field name="code">income</field> + <field name="close_method">unreconciled</field> + </record> + <record id="account_type_expense" model="account.account.type"> + <field name="name">Expense</field> + <field name="code">expense</field> + <field name="close_method">unreconciled</field> + </record> + <record id="account_type_cash_moves" model="account.account.type"> + <field name="name">Cash</field> + <field name="code">cash</field> + <field name="close_method">balance</field> + </record> + + + <!-- Account Templates --> +<record id="account_lu_0" model="account.account.template"> + <field name="code">0</field> + <field name="name">Plan KLUWER</field> + <field name="type" >view</field> + <field name="user_type" ref="account_type_root"/> +</record> + +<record id="account_1" model="account.account.template"> + <field name="code">1</field> + <field name="name">Fonds propres, prov. & dettes + d'1an</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_2" model="account.account.template"> + <field name="code">2</field> + <field name="name">Immobilis., dettes & créances à + d'1 an</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_3" model="account.account.template"> + <field name="code">3</field> + <field name="name">Stocks et commandes en cours d'exécution</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_4" model="account.account.template"> + <field name="code">4</field> + <field name="name">Créances et dettes à un an au plus</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_5" model="account.account.template"> + <field name="code">5</field> + <field name="name">Placements de trésorerie et disponible</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_6" model="account.account.template"> + <field name="code">6</field> + <field name="name">Charges</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type" >view</field> +</record> +<record id="account_7" model="account.account.template"> + <field name="code">7</field> + <field name="name">Produits</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_lu_0"/> + <field name="type">view</field> +</record> +<record id="account_10" model="account.account.template"> + <field name="code">10</field> + <field name="name">Capital</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_12" model="account.account.template"> + <field name="code">12</field> + <field name="name">Plus-values de réévaluation</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_13" model="account.account.template"> + <field name="code">13</field> + <field name="name">Réserves</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_14" model="account.account.template"> + <field name="code">14</field> + <field name="name">Résultat reporté</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_15" model="account.account.template"> + <field name="code">15</field> + <field name="name">Subsides en capital</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_16" model="account.account.template"> + <field name="code">16</field> + <field name="name">Provisions et impôts différés</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_17" model="account.account.template"> + <field name="code">17</field> + <field name="name">Dettes à plus d'un an</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type" >view</field> +</record> +<record id="account_20" model="account.account.template"> + <field name="code">20</field> + <field name="name">Frais d'établissement</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_21" model="account.account.template"> + <field name="code">21</field> + <field name="name">Immobilisations incorporelles</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_22" model="account.account.template"> + <field name="code">22</field> + <field name="name">Terrains et constructions</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_23" model="account.account.template"> + <field name="code">23</field> + <field name="name">Installations, machines et outillages</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_24" model="account.account.template"> + <field name="code">24</field> + <field name="name">Mobilier et matériel roulant</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_25" model="account.account.template"> + <field name="code">25</field> + <field name="name">Immobilisation détenues en loc.-fin.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_27" model="account.account.template"> + <field name="code">27</field> + <field name="name">Immobilis. corp. en cours & acptes versé</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_28" model="account.account.template"> + <field name="code">28</field> + <field name="name">Immobilisations financières</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_30" model="account.account.template"> + <field name="code">30</field> + <field name="name">Approvisionnements - matières premières</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_31" model="account.account.template"> + <field name="code">31</field> + <field name="name">Approvisionnements et fournitures</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_32" model="account.account.template"> + <field name="code">32</field> + <field name="name">En cours de fabrication</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_33" model="account.account.template"> + <field name="code">33</field> + <field name="name">Produits finis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_34" model="account.account.template"> + <field name="code">34</field> + <field name="name">Marchandises</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_36" model="account.account.template"> + <field name="code">36</field> + <field name="name">Acomptes versés sur achats pour stocks</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_3"/> + <field name="type" >view</field> +</record> +<record id="account_40" model="account.account.template"> + <field name="code">40</field> + <field name="name">Créances commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_41" model="account.account.template"> + <field name="code">41</field> + <field name="name">Autres créances à - d'un an</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_42" model="account.account.template"> + <field name="code">42</field> + <field name="name">Dettes à + d'1 an échéant dans l'année</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_43" model="account.account.template"> + <field name="code">43</field> + <field name="name">Dettes financières</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_44" model="account.account.template"> + <field name="code">44</field> + <field name="name">Dettes commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_45" model="account.account.template"> + <field name="code">45</field> + <field name="name">Dettes fiscales, salariales et sociales</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_47" model="account.account.template"> + <field name="code">47</field> + <field name="name">Dettes suite à l'affect. des résultats</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_48" model="account.account.template"> + <field name="code">48</field> + <field name="name">Dettes diverses</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_49" model="account.account.template"> + <field name="code">49</field> + <field name="name">Comptes de régularisation et cptes d'att</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_4"/> + <field name="type" >view</field> +</record> +<record id="account_51" model="account.account.template"> + <field name="code">51</field> + <field name="name">Actions et parts</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_52" model="account.account.template"> + <field name="code">52</field> + <field name="name">Titres à revenu fixe</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_53" model="account.account.template"> + <field name="code">53</field> + <field name="name">Dépôts à terme</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_55" model="account.account.template"> + <field name="code">55</field> + <field name="name">Etablissements de crédit</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_56" model="account.account.template"> + <field name="code">56</field> + <field name="name">Ccp</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_57" model="account.account.template"> + <field name="code">57</field> + <field name="name">Caisses</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type" >view</field> +</record> +<record id="account_60" model="account.account.template"> + <field name="code">60</field> + <field name="name">Approvisionnements et marchandises</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_61" model="account.account.template"> + <field name="code">61</field> + <field name="name">Services et biens divers</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_62" model="account.account.template"> + <field name="code">62</field> + <field name="name">Rémunérations, charges soc. et pensions</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_64" model="account.account.template"> + <field name="code">64</field> + <field name="name">Autres charges d'exploitation</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_65" model="account.account.template"> + <field name="code">65</field> + <field name="name">Charges financières</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_66" model="account.account.template"> + <field name="code">66</field> + <field name="name">Charges exceptionnelles</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_67" model="account.account.template"> + <field name="code">67</field> + <field name="name">Impôts sur le résultat</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_70" model="account.account.template"> + <field name="code">70</field> + <field name="name">Chiffre d'affaires</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">view</field> +</record> +<record id="account_71" model="account.account.template"> + <field name="code">71</field> + <field name="name">Variation des stocks & comm. en cours</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">view</field> +</record> +<record id="account_74" model="account.account.template"> + <field name="code">74</field> + <field name="name">Autres produits d'exploitation</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">view</field> +</record> +<record id="account_75" model="account.account.template"> + <field name="code">75</field> + <field name="name">Produits financiers</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">view</field> +</record> +<record id="account_77" model="account.account.template"> + <field name="code">77</field> + <field name="name">Régul. d'impôts & reprises prov. fisc.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">view</field> +</record> +<record id="account_140" model="account.account.template"> + <field name="code">140</field> + <field name="name">Bénéfice reporté</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_14"/> + <field name="type" >view</field> +</record> +<record id="account_175" model="account.account.template"> + <field name="code">175</field> + <field name="name">Dettes commerciales</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type" >view</field> +</record> +<record id="account_200" model="account.account.template"> + <field name="code">200</field> + <field name="name">Frais de constitution et d'augm. capital</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_20"/> + <field name="type" >view</field> +</record> +<record id="account_201" model="account.account.template"> + <field name="code">201</field> + <field name="name">Frais d'augmentation de capital</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_20"/> + <field name="type" >view</field> +</record> +<record id="account_202" model="account.account.template"> + <field name="code">202</field> + <field name="name">Fr.d'emission d'empr,prime remboursement</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_20"/> + <field name="type" >view</field> +</record> +<record id="account_203" model="account.account.template"> + <field name="code">203</field> + <field name="name">Autres frais d'établissement</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_20"/> + <field name="type" >view</field> +</record> +<record id="account_204" model="account.account.template"> + <field name="code">204</field> + <field name="name">Frais de restructuration</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_20"/> + <field name="type" >view</field> +</record> +<record id="account_210" model="account.account.template"> + <field name="code">210</field> + <field name="name">Frais de recherche et de développement</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_21"/> + <field name="type" >view</field> +</record> +<record id="account_211" model="account.account.template"> + <field name="code">211</field> + <field name="name">Concessions, brevets et licences</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_21"/> + <field name="type" >view</field> +</record> +<record id="account_212" model="account.account.template"> + <field name="code">212</field> + <field name="name">Fonds de commerce</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_21"/> + <field name="type" >view</field> +</record> +<record id="account_220" model="account.account.template"> + <field name="code">220</field> + <field name="name">Terrains</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_22"/> + <field name="type" >view</field> +</record> +<record id="account_221" model="account.account.template"> + <field name="code">221</field> + <field name="name">Constructions</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_22"/> + <field name="type" >view</field> +</record> +<record id="account_222" model="account.account.template"> + <field name="code">222</field> + <field name="name">Terrains bâtis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_22"/> + <field name="type" >view</field> +</record> +<record id="account_223" model="account.account.template"> + <field name="code">223</field> + <field name="name">Autres droits réels sur des immeubles</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_22"/> + <field name="type" >view</field> +</record> +<record id="account_230" model="account.account.template"> + <field name="code">230</field> + <field name="name">Installations</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type" >view</field> +</record> +<record id="account_231" model="account.account.template"> + <field name="code">231</field> + <field name="name">Machines</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type" >view</field> +</record> +<record id="account_240" model="account.account.template"> + <field name="code">240</field> + <field name="name">Installation gen, agencements,..</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_24"/> + <field name="type" >view</field> +</record> +<record id="account_241" model="account.account.template"> + <field name="code">241</field> + <field name="name">Mobilier</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_24"/> + <field name="type" >view</field> +</record> +<record id="account_242" model="account.account.template"> + <field name="code">242</field> + <field name="name">Matériel roulant</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_24"/> + <field name="type" >view</field> +</record> +<record id="account_280" model="account.account.template"> + <field name="code">280</field> + <field name="name">Participation dans des entreprises liées</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_28"/> + <field name="type" >view</field> +</record> +<record id="account_281" model="account.account.template"> + <field name="code">281</field> + <field name="name">Créances sur des entreprises liées</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_28"/> + <field name="type" >view</field> +</record> +<record id="account_282" model="account.account.template"> + <field name="code">282</field> + <field name="name">Participations entr. avec lien particip.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_28"/> + <field name="type" >view</field> +</record> +<record id="account_283" model="account.account.template"> + <field name="code">283</field> + <field name="name">Créances / entrepr. avec lien particip.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_28"/> + <field name="type" >view</field> +</record> +<record id="account_290" model="account.account.template"> + <field name="code">290</field> + <field name="name">Créances commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_291" model="account.account.template"> + <field name="code">291</field> + <field name="name">Autres créances</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type" >view</field> +</record> +<record id="account_411" model="account.account.template"> + <field name="code">411</field> + <field name="name">T.v.a en amont</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type" >view</field> +</record> +<record id="account_425" model="account.account.template"> + <field name="code">425</field> + <field name="name">Dettes commerciales échéant ds l'année</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type" >view</field> +</record> +<record id="account_451" model="account.account.template"> + <field name="code">451</field> + <field name="name">T.v.a. en aval</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_45"/> + <field name="type" >view</field> +</record> +<record id="account_452" model="account.account.template"> + <field name="code">452</field> + <field name="name">Impôts et taxes à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_45"/> + <field name="type" >view</field> +</record> +<record id="account_512" model="account.account.template"> + <field name="code">512</field> + <field name="name">Actions & parts - options acquises</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_51"/> + <field name="type" >view</field> +</record> +<record id="account_550" model="account.account.template"> + <field name="code">550</field> + <field name="name">Comptes courants bancaires</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_55"/> + <field name="type" >view</field> +</record> +<record id="account_609" model="account.account.template"> + <field name="code">609</field> + <field name="name">Variation des stocks</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type" >view</field> +</record> +<record id="account_610" model="account.account.template"> + <field name="code">610</field> + <field name="name">Loyers et charges locatives</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type" >view</field> +</record> +<record id="account_612" model="account.account.template"> + <field name="code">612</field> + <field name="name">Fournitures faites à l'entreprise</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type" >view</field> +</record> +<record id="account_613" model="account.account.template"> + <field name="code">613</field> + <field name="name">Rétributions de tiers</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type" >view</field> +</record> +<record id="account_615" model="account.account.template"> + <field name="code">615</field> + <field name="name">publicités</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type" >view</field> +</record> +<record id="account_620" model="account.account.template"> + <field name="code">620</field> + <field name="name">Rémunérations et avantages soc. directs</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_62"/> + <field name="type" >view</field> +</record> +<record id="account_621" model="account.account.template"> + <field name="code">621</field> + <field name="name">Charges sociales</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_62"/> + <field name="type" >view</field> +</record> +<record id="account_624" model="account.account.template"> + <field name="code">624</field> + <field name="name">Pensions</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_62"/> +</record> +<record id="account_630" model="account.account.template"> + <field name="code">630</field> + <field name="name">Dotations aux corrections de val./immob.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_631" model="account.account.template"> + <field name="code">631</field> + <field name="name">Dotations aux correct. de val./stocks</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_632" model="account.account.template"> + <field name="code">632</field> + <field name="name">Dot. cor. val s/en-cours,pr fini</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_633" model="account.account.template"> + <field name="code">633</field> + <field name="name">Dotations correct. val./cr. comm. +1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_634" model="account.account.template"> + <field name="code">634</field> + <field name="name">Dotations correct. val./cr. comm. -1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_635" model="account.account.template"> + <field name="code">635</field> + <field name="name">Provisions pour pensions et oblig. sim.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_636" model="account.account.template"> + <field name="code">636</field> + <field name="name">Provisions pour grosses réparations</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_637" model="account.account.template"> + <field name="code">637</field> + <field name="name">Provisions pour autres risques & charges</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type" >view</field> +</record> +<record id="account_640" model="account.account.template"> + <field name="code">640</field> + <field name="name">Taxes et impôts directs</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_64"/> + <field name="type" >view</field> +</record> +<record id="account_651" model="account.account.template"> + <field name="code">651</field> + <field name="name">Réductions de valeur / actifs circulants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type" >view</field> +</record> +<record id="account_660" model="account.account.template"> + <field name="code">660</field> + <field name="name">Dotations aux corrections de val. except</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type" >view</field> +</record> +<record id="account_661" model="account.account.template"> + <field name="code">661</field> + <field name="name">Dotations aux corrections de val./financ</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type" >view</field> +</record> +<record id="account_662" model="account.account.template"> + <field name="code">662</field> + <field name="name">Provisions pour risques & charges except</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type" >view</field> +</record> +<record id="account_750" model="account.account.template"> + <field name="code">750</field> + <field name="name">Produits des immob. financières</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">view</field> +</record> +<record id="account_751" model="account.account.template"> + <field name="code">751</field> + <field name="name">Produits des actifs circulants</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">view</field> +</record> +<record id="account_1750" model="account.account.template"> + <field name="code">1750</field> + <field name="name">Fournisseurs - dettes en compte</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_175"/> + <field name="type">view</field> +</record> +<record id="account_1751" model="account.account.template"> + <field name="code">1751</field> + <field name="name">Effets à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_175"/> + <field name="type">view</field> +</record> +<record id="account_6120" model="account.account.template"> + <field name="code">6120</field> + <field name="name">Eau, gaz, électricité, carburants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_612"/> + <field name="type">view</field> +</record> +<record id="account_6123" model="account.account.template"> + <field name="code">6123</field> + <field name="name">Téléphone, télégrammes, frais post.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_612"/> + <field name="type">view</field> +</record> +<record id="account_100000" model="account.account.template"> + <field name="code">100000</field> + <field name="name">Capital souscrit</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_10"/> + <field name="type">other</field> +</record> +<record id="account_101000" model="account.account.template"> + <field name="code">101000</field> + <field name="name">Capital non appelé (-)</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_10"/> + <field name="type">other</field> +</record> +<record id="account_109000" model="account.account.template"> + <field name="code">109000</field> + <field name="name">Compte de l'exploitant</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_10"/> + <field name="type">other</field> +</record> +<record id="account_110000" model="account.account.template"> + <field name="code">110000</field> + <field name="name">Primes d'émission</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1"/> + <field name="type">other</field> +</record> +<record id="account_120000" model="account.account.template"> + <field name="code">120000</field> + <field name="name">Plus-values de rééval. sur immob. incorp</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_12"/> + <field name="type">other</field> +</record> +<record id="account_121000" model="account.account.template"> + <field name="code">121000</field> + <field name="name">Plus-values de rééval. sur immob. corp.</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_12"/> + <field name="type">other</field> +</record> +<record id="account_122000" model="account.account.template"> + <field name="code">122000</field> + <field name="name">Plus-values de rééval. sur immob. fin.</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_12"/> + <field name="type">other</field> +</record> +<record id="account_123000" model="account.account.template"> + <field name="code">123000</field> + <field name="name">Plus-values de réévaluation sur stocks</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_12"/> + <field name="type">other</field> +</record> +<record id="account_124000" model="account.account.template"> + <field name="code">124000</field> + <field name="name">Reprises de réd. de val./plac. de très.</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_12"/> + <field name="type">other</field> +</record> +<record id="account_130000" model="account.account.template"> + <field name="code">130000</field> + <field name="name">Réserve légale</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_13"/> + <field name="type">other</field> +</record> +<record id="account_131000" model="account.account.template"> + <field name="code">131000</field> + <field name="name">Réserves indisponibles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_13"/> + <field name="type">other</field> +</record> +<record id="account_132000" model="account.account.template"> + <field name="code">132000</field> + <field name="name">Réserves immunisées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_13"/> + <field name="type">other</field> +</record> +<record id="account_133000" model="account.account.template"> + <field name="code">133000</field> + <field name="name">Réserves disponibles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_13"/> + <field name="type">other</field> +</record> +<record id="account_134000" model="account.account.template"> + <field name="code">134000</field> + <field name="name">Autres reserves</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_13"/> + <field name="type">other</field> +</record> +<record id="account_140000" model="account.account.template"> + <field name="code">140000</field> + <field name="name">Résultats reportés</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_140"/> + <field name="type">other</field> +</record> +<record id="account_140100" model="account.account.template"> + <field name="code">140100</field> + <field name="name">Bénéfice de l'exercice</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_140"/> + <field name="type">other</field> +</record> +<record id="account_140200" model="account.account.template"> + <field name="code">140200</field> + <field name="name">Perte de l'exercice</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_140"/> + <field name="type">other</field> +</record> +<record id="account_141000" model="account.account.template"> + <field name="code">141000</field> + <field name="name">Perte reportée</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_14"/> + <field name="type">other</field> +</record> +<record id="account_150000" model="account.account.template"> + <field name="code">150000</field> + <field name="name">Subsides en cap. - montants obtenus</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_15"/> + <field name="type">other</field> +</record> +<record id="account_151000" model="account.account.template"> + <field name="code">151000</field> + <field name="name">Subsides-montants transf. aux résultats</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_15"/> + <field name="type">other</field> +</record> +<record id="account_160000" model="account.account.template"> + <field name="code">160000</field> + <field name="name">Provisions pour pensions</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_161000" model="account.account.template"> + <field name="code">161000</field> + <field name="name">Provisions pour charges fiscales</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_162000" model="account.account.template"> + <field name="code">162000</field> + <field name="name">Provisions pr grosses rép. & gros entr.</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_163000" model="account.account.template"> + <field name="code">163000</field> + <field name="name">Provisions pour rente viagère</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_164000" model="account.account.template"> + <field name="code">164000</field> + <field name="name">Provisions pr sûretés pers. et réelles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_165000" model="account.account.template"> + <field name="code">165000</field> + <field name="name">Provisions diverses</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_165400" model="account.account.template"> + <field name="code">165400</field> + <field name="name">Provisions pour autres risques & charges</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_166000" model="account.account.template"> + <field name="code">166000</field> + <field name="name">Provisions pour charges de commandes</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_168000" model="account.account.template"> + <field name="code">168000</field> + <field name="name">Impôts différés</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_169000" model="account.account.template"> + <field name="code">169000</field> + <field name="name">Autres provisions</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_16"/> + <field name="type">other</field> +</record> +<record id="account_170000" model="account.account.template"> + <field name="code">170000</field> + <field name="name">Emprunts convertibles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_171000" model="account.account.template"> + <field name="code">171000</field> + <field name="name">Emprunts obligataires non convertibles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_172000" model="account.account.template"> + <field name="code">172000</field> + <field name="name">Dettes de loc. - financ. et assimilées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_173000" model="account.account.template"> + <field name="code">173000</field> + <field name="name">Etablissements de crédit</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_174000" model="account.account.template"> + <field name="code">174000</field> + <field name="name">Autres emprunts</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_175000" model="account.account.template"> + <field name="code">175000</field> + <field name="name">Fournisseurs - entreprises apparentées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1750"/> + <field name="type">other</field> +</record> +<record id="account_175010" model="account.account.template"> + <field name="code">175010</field> + <field name="name">Dettes en cpte - fourniss. ordinaires</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1750"/> + <field name="type">other</field> +</record> +<record id="account_175100" model="account.account.template"> + <field name="code">175100</field> + <field name="name">Effets à payer - entreprises apparentées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1751"/> + <field name="type">other</field> +</record> +<record id="account_175110" model="account.account.template"> + <field name="code">175110</field> + <field name="name">Effets à payer - fournisseurs ordinaires</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_1751"/> + <field name="type">other</field> +</record> +<record id="account_176000" model="account.account.template"> + <field name="code">176000</field> + <field name="name">Acomptes reçus sur commandes</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_177100" model="account.account.template"> + <field name="code">177100</field> + <field name="name">Entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_177200" model="account.account.template"> + <field name="code">177200</field> + <field name="name">Lien de participation</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_178000" model="account.account.template"> + <field name="code">178000</field> + <field name="name">Cautionnements reçus en numéraire</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_179000" model="account.account.template"> + <field name="code">179000</field> + <field name="name">Dettes diverses</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_17"/> + <field name="type">other</field> +</record> +<record id="account_180000" model="account.account.template"> + <field name="code">180000</field> + <field name="name">Comptes de liaison établiss. & succurs.</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_1"/> + <field name="type">other</field> +</record> +<record id="account_200000" model="account.account.template"> + <field name="code">200000</field> + <field name="name">Frais de constitution</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_200"/> + <field name="type">other</field> +</record> +<record id="account_200900" model="account.account.template"> + <field name="code">200900</field> + <field name="name">Amort s/fr de constitution</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_200"/> + <field name="type">other</field> +</record> +<record id="account_201000" model="account.account.template"> + <field name="code">201000</field> + <field name="name">Frais d'augmentation de capital</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_201"/> + <field name="type">other</field> +</record> +<record id="account_201900" model="account.account.template"> + <field name="code">201900</field> + <field name="name">Amort s/fr d'augmentation du capital</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_201"/> + <field name="type">other</field> +</record> +<record id="account_202000" model="account.account.template"> + <field name="code">202000</field> + <field name="name">Fr.d'emission d'empr,prime remboursement</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_202"/> + <field name="type">other</field> +</record> +<record id="account_202900" model="account.account.template"> + <field name="code">202900</field> + <field name="name">Amort s/fr d'émission d'emprunts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_202"/> + <field name="type">other</field> +</record> +<record id="account_203000" model="account.account.template"> + <field name="code">203000</field> + <field name="name">Autres frais d'établissement</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_203"/> + <field name="type">other</field> +</record> +<record id="account_203900" model="account.account.template"> + <field name="code">203900</field> + <field name="name">Amort s/autres fr d'établissement</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_203"/> + <field name="type">other</field> +</record> +<record id="account_204000" model="account.account.template"> + <field name="code">204000</field> + <field name="name">Frais de restructuration</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_204"/> + <field name="type">other</field> +</record> +<record id="account_204900" model="account.account.template"> + <field name="code">204900</field> + <field name="name">Amort s/fr de restructuration</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_204"/> + <field name="type">other</field> +</record> +<record id="account_210000" model="account.account.template"> + <field name="code">210000</field> + <field name="name">Frais de recherche et développement</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_210"/> + <field name="type">other</field> +</record> +<record id="account_210900" model="account.account.template"> + <field name="code">210900</field> + <field name="name">Amort. s/fr de recherche et développemen</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_210"/> + <field name="type">other</field> +</record> +<record id="account_211100" model="account.account.template"> + <field name="code">211100</field> + <field name="name">Concessions, brevet à titre onéreux</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_211"/> + <field name="type">other</field> +</record> +<record id="account_211190" model="account.account.template"> + <field name="code">211190</field> + <field name="name">Amort. s/concession, brevet acquis</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_211"/> + <field name="type">other</field> +</record> +<record id="account_211200" model="account.account.template"> + <field name="code">211200</field> + <field name="name">Conc., brevets créés par l'entr. même</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_211"/> + <field name="type">other</field> +</record> +<record id="account_211290" model="account.account.template"> + <field name="code">211290</field> + <field name="name">Amort. s/concession, brevets créés</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_211"/> + <field name="type">other</field> +</record> +<record id="account_212000" model="account.account.template"> + <field name="code">212000</field> + <field name="name">Fonds de commerce</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_212"/> + <field name="type">other</field> +</record> +<record id="account_212900" model="account.account.template"> + <field name="code">212900</field> + <field name="name">Amort s/fonds de commerce</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_212"/> + <field name="type">other</field> +</record> +<record id="account_213000" model="account.account.template"> + <field name="code">213000</field> + <field name="name">Acomptes versés s/immob. incorp</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_21"/> + <field name="type">other</field> +</record> +<record id="account_214000" model="account.account.template"> + <field name="code">214000</field> + <field name="name">Surprix afférent à l'acquisit. d'1 part.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_21"/> + <field name="type">other</field> +</record> +<record id="account_220000" model="account.account.template"> + <field name="code">220000</field> + <field name="name">Terrains</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_220"/> + <field name="type">other</field> +</record> +<record id="account_220800" model="account.account.template"> + <field name="code">220800</field> + <field name="name">Plus-values actées sur terrains</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_220"/> + <field name="type">other</field> +</record> +<record id="account_220900" model="account.account.template"> + <field name="code">220900</field> + <field name="name">Réduction de valeur sur terrains</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_220"/> + <field name="type">other</field> +</record> +<record id="account_221800" model="account.account.template"> + <field name="code">221800</field> + <field name="name">Plus-values actées sur constructions</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_221"/> + <field name="type">other</field> +</record> +<record id="account_221900" model="account.account.template"> + <field name="code">221900</field> + <field name="name">Amort. sur constructions</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_221"/> + <field name="type">other</field> +</record> +<record id="account_222800" model="account.account.template"> + <field name="code">222800</field> + <field name="name">Plus-values actées s/terrains bâtis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_222"/> + <field name="type">other</field> +</record> +<record id="account_222900" model="account.account.template"> + <field name="code">222900</field> + <field name="name">Amort. sur terrains bâtis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_222"/> + <field name="type">other</field> +</record> +<record id="account_223800" model="account.account.template"> + <field name="code">223800</field> + <field name="name">+values actées s/autres droits</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_223"/> + <field name="type">other</field> +</record> +<record id="account_223900" model="account.account.template"> + <field name="code">223900</field> + <field name="name">Amort s/autres droits réels</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_223"/> + <field name="type">other</field> +</record> +<record id="account_230000" model="account.account.template"> + <field name="code">230000</field> + <field name="name">Installations techniques</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_230"/> + <field name="type">other</field> +</record> +<record id="account_230900" model="account.account.template"> + <field name="code">230900</field> + <field name="name">Amort s/installations techniques</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_230"/> + <field name="type">other</field> +</record> +<record id="account_231000" model="account.account.template"> + <field name="code">231000</field> + <field name="name">Machines</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_231"/> + <field name="type">other</field> +</record> +<record id="account_231900" model="account.account.template"> + <field name="code">231900</field> + <field name="name">Amortissement s/machines</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_231"/> + <field name="type">other</field> +</record> +<record id="account_232000" model="account.account.template"> + <field name="code">232000</field> + <field name="name">Outillage</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type">other</field> +</record> +<record id="account_233000" model="account.account.template"> + <field name="code">233000</field> + <field name="name">Pièces de rechange</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type">other</field> +</record> +<record id="account_238000" model="account.account.template"> + <field name="code">238000</field> + <field name="name">Plus-values actées sur i./m./o.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type">other</field> +</record> +<record id="account_239000" model="account.account.template"> + <field name="code">239000</field> + <field name="name">Amortissements sur i./m./o.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_23"/> + <field name="type">other</field> +</record> +<record id="account_240000" model="account.account.template"> + <field name="code">240000</field> + <field name="name">Installation gen, agencements,..</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_240"/> + <field name="type">other</field> +</record> +<record id="account_240900" model="account.account.template"> + <field name="code">240900</field> + <field name="name">Amort s/autres installations,outillage</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_240"/> + <field name="type">other</field> +</record> +<record id="account_241000" model="account.account.template"> + <field name="code">241000</field> + <field name="name">Mobilier</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_241"/> + <field name="type">other</field> +</record> +<record id="account_241900" model="account.account.template"> + <field name="code">241900</field> + <field name="name">Amort. sur mobilier</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_241"/> + <field name="type">other</field> +</record> +<record id="account_242000" model="account.account.template"> + <field name="code">242000</field> + <field name="name">Matériel roulant</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_242"/> + <field name="type">other</field> +</record> +<record id="account_242900" model="account.account.template"> + <field name="code">242900</field> + <field name="name">Amort. s/matériel roulant</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_242"/> + <field name="type">other</field> +</record> +<record id="account_243000" model="account.account.template"> + <field name="code">243000</field> + <field name="name">Matériel de bureau</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_24"/> + <field name="type">other</field> +</record> +<record id="account_243900" model="account.account.template"> + <field name="code">243900</field> + <field name="name">Amort. s/matériel de bureau</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_24"/> + <field name="type">other</field> +</record> +<record id="account_250000" model="account.account.template"> + <field name="code">250000</field> + <field name="name">Terrains et constructions en loc.-fin.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_25"/> + <field name="type">other</field> +</record> +<record id="account_251000" model="account.account.template"> + <field name="code">251000</field> + <field name="name">Install., machines & out. en loc.-fin.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_25"/> + <field name="type">other</field> +</record> +<record id="account_252000" model="account.account.template"> + <field name="code">252000</field> + <field name="name">Mobilier et mat. roulant en loc.-fin.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_25"/> + <field name="type">other</field> +</record> +<record id="account_260000" model="account.account.template"> + <field name="code">260000</field> + <field name="name">Autres immobilisations corporelles</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_2"/> + <field name="type">other</field> +</record> +<record id="account_270000" model="account.account.template"> + <field name="code">270000</field> + <field name="name">Immobilisations en cours</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_27"/> + <field name="type">other</field> +</record> +<record id="account_271000" model="account.account.template"> + <field name="code">271000</field> + <field name="name">Avances & acptes versés / immob.en cours</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_27"/> + <field name="type">other</field> +</record> +<record id="account_280000" model="account.account.template"> + <field name="code">280000</field> + <field name="name">Parts dans des entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_280"/> + <field name="type">other</field> +</record> +<record id="account_280100" model="account.account.template"> + <field name="code">280100</field> + <field name="name">Montants non appelés</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_280"/> + <field name="type">other</field> +</record> +<record id="account_280800" model="account.account.template"> + <field name="code">280800</field> + <field name="name">+values actées s/parts entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_280"/> + <field name="type">other</field> +</record> +<record id="account_280900" model="account.account.template"> + <field name="code">280900</field> + <field name="name">Réduction de valeur s/parts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_280"/> + <field name="type">other</field> +</record> +<record id="account_281000" model="account.account.template"> + <field name="code">281000</field> + <field name="name">Créances s/des entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_281"/> + <field name="type">other</field> +</record> +<record id="account_281100" model="account.account.template"> + <field name="code">281100</field> + <field name="name">Effets à recevoir</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_281"/> + <field name="type">other</field> +</record> +<record id="account_281700" model="account.account.template"> + <field name="code">281700</field> + <field name="name">Créances douteuses (entreprises liées)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_281"/> + <field name="type">other</field> +</record> +<record id="account_281900" model="account.account.template"> + <field name="code">281900</field> + <field name="name">Réduction de valeur s/cré. entre. liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_281"/> + <field name="type">other</field> +</record> +<record id="account_282000" model="account.account.template"> + <field name="code">282000</field> + <field name="name">Participations</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_282"/> + <field name="type">other</field> +</record> +<record id="account_282100" model="account.account.template"> + <field name="code">282100</field> + <field name="name">Montants non appelés</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_282"/> + <field name="type">other</field> +</record> +<record id="account_282800" model="account.account.template"> + <field name="code">282800</field> + <field name="name">+values actées s/participations</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_282"/> + <field name="type">other</field> +</record> +<record id="account_282900" model="account.account.template"> + <field name="code">282900</field> + <field name="name">Réduction de valeur s/participations</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_282"/> + <field name="type">other</field> +</record> +<record id="account_283000" model="account.account.template"> + <field name="code">283000</field> + <field name="name">Créances s/entrepr. lien de particip.</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_283"/> + <field name="type">other</field> +</record> +<record id="account_283100" model="account.account.template"> + <field name="code">283100</field> + <field name="name">Effets à recevoir</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_283"/> + <field name="type">other</field> +</record> +<record id="account_283200" model="account.account.template"> + <field name="code">283200</field> + <field name="name">Titres à revenu fixe</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_283"/> + <field name="type">other</field> +</record> +<record id="account_283700" model="account.account.template"> + <field name="code">283700</field> + <field name="name">Créances douteuses (s/participations)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_283"/> + <field name="type">other</field> +</record> +<record id="account_283900" model="account.account.template"> + <field name="code">283900</field> + <field name="name">Réductions de valeur s/cr particip.</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_283"/> + <field name="type">other</field> +</record> +<record id="account_284000" model="account.account.template"> + <field name="code">284000</field> + <field name="name">Titres à caractère d'immobilisation</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_28"/> + <field name="type">other</field> +</record> +<record id="account_285000" model="account.account.template"> + <field name="code">285000</field> + <field name="name">Autres prêts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_28"/> + <field name="type">other</field> +</record> +<record id="account_286000" model="account.account.template"> + <field name="code">286000</field> + <field name="name">Actions ou parts propres</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_28"/> + <field name="type">other</field> +</record> +<record id="account_288000" model="account.account.template"> + <field name="code">288000</field> + <field name="name">Cautionnements versés en numéraire</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_28"/> + <field name="type">other</field> +</record> +<record id="account_290000" model="account.account.template"> + <field name="code">290000</field> + <field name="name">Créances commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_290"/> + <field name="type">other</field> +</record> +<record id="account_290100" model="account.account.template"> + <field name="code">290100</field> + <field name="name">Effets à recevoir</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_290"/> + <field name="type">other</field> +</record> +<record id="account_290600" model="account.account.template"> + <field name="code">290600</field> + <field name="name">Acomptes versés</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_290"/> + <field name="type">other</field> +</record> +<record id="account_290700" model="account.account.template"> + <field name="code">290700</field> + <field name="name">Créances douteuses s/cr commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_290"/> + <field name="type">other</field> +</record> +<record id="account_290900" model="account.account.template"> + <field name="code">290900</field> + <field name="name">Réduction de valeur s/cr commerciales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_290"/> + <field name="type">other</field> +</record> +<record id="account_291000" model="account.account.template"> + <field name="code">291000</field> + <field name="name">Autres créances</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_291"/> + <field name="type">other</field> +</record> +<record id="account_291100" model="account.account.template"> + <field name="code">291100</field> + <field name="name">Effets à recevoir</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_291"/> + <field name="type">other</field> +</record> +<record id="account_291700" model="account.account.template"> + <field name="code">291700</field> + <field name="name">Créances douteuses s/autres créances</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_291"/> + <field name="type">other</field> +</record> +<record id="account_291900" model="account.account.template"> + <field name="code">291900</field> + <field name="name">Réduction de valeur s/autres créances</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_291"/> + <field name="type">other</field> +</record> +<record id="account_300000" model="account.account.template"> + <field name="code">300000</field> + <field name="name">Stocks matières premières val. d'acquis.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_30"/> + <field name="type">other</field> +</record> +<record id="account_309000" model="account.account.template"> + <field name="code">309000</field> + <field name="name">Réduction de valeur s/mat. premières</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_30"/> + <field name="type">other</field> +</record> +<record id="account_310000" model="account.account.template"> + <field name="code">310000</field> + <field name="name">Matières consommables</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_31"/> + <field name="type">other</field> +</record> +<record id="account_310600" model="account.account.template"> + <field name="code">310600</field> + <field name="name">Emballages commerciaux</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_31"/> + <field name="type">other</field> +</record> +<record id="account_319000" model="account.account.template"> + <field name="code">319000</field> + <field name="name">Réd. de val. - stocks fournitures (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_31"/> + <field name="type">other</field> +</record> +<record id="account_320000" model="account.account.template"> + <field name="code">320000</field> + <field name="name">En cours de fabrication - val. d'acquis.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_32"/> + <field name="type">other</field> +</record> +<record id="account_329000" model="account.account.template"> + <field name="code">329000</field> + <field name="name">Réductions de valeur / en cours (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_32"/> + <field name="type">other</field> +</record> +<record id="account_330000" model="account.account.template"> + <field name="code">330000</field> + <field name="name">Valeur d'acquisition des produits finis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_33"/> + <field name="type">other</field> +</record> +<record id="account_339000" model="account.account.template"> + <field name="code">339000</field> + <field name="name">Réduction de val. / produits finis (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_33"/> + <field name="type">other</field> +</record> +<record id="account_340000" model="account.account.template"> + <field name="code">340000</field> + <field name="name">Stocks marchandises - valeur d'acquis.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_34"/> + <field name="type">other</field> +</record> +<record id="account_349000" model="account.account.template"> + <field name="code">349000</field> + <field name="name">Réd. de val. / stocks marchandises (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_34"/> + <field name="type">other</field> +</record> +<record id="account_360000" model="account.account.template"> + <field name="code">360000</field> + <field name="name">Acomptes versés / achats pour stocks</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_36"/> + <field name="type">other</field> +</record> +<record id="account_369000" model="account.account.template"> + <field name="code">369000</field> + <field name="name">Réd. de val. / acptes versés stocks (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_36"/> + <field name="type">other</field> +</record> +<record id="account_400000" model="account.account.template"> + <field name="code">400000</field> + <field name="name">Clients</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">other</field> +</record> +<record id="account_401000" model="account.account.template"> + <field name="code">401000</field> + <field name="name">Effets à recevoir - clients</field> + <field name="user_type" ref="account_type_asset"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_40"/> + <field name="type">receivable</field> + +</record> +<record id="account_403000" model="account.account.template"> + <field name="code">403000</field> + <field name="name">Créances s/entreprises apparentées</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">receivable</field> +</record> +<record id="account_404000" model="account.account.template"> + <field name="code">404000</field> + <field name="name">Produits à recevoir (factures à établir)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">other</field> +</record> +<record id="account_406000" model="account.account.template"> + <field name="code">406000</field> + <field name="name">Acomptes versés aux fournisseurs</field> + <field name="user_type" ref="account_type_creances"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">payable</field> +</record> +<record id="account_407000" model="account.account.template"> + <field name="code">407000</field> + <field name="name">Créances commerciales douteuses</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">other</field> +</record> +<record id="account_408000" model="account.account.template"> + <field name="code">408000</field> + <field name="name">Ecarts de conversion de devises/créances</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">other</field> +</record> +<record id="account_409000" model="account.account.template"> + <field name="code">409000</field> + <field name="name">Réductions de valeur / créances comm.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_40"/> + <field name="type">other</field> +</record> +<record id="account_410000" model="account.account.template"> + <field name="code">410000</field> + <field name="name">Capital appelé, non versé</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_411000" model="account.account.template"> + <field name="code">411000</field> + <field name="name">T.v.a en amont</field> + <field name="user_type" ref="account_type_asset"/> + <field name="reconcile">True</field> + <field name="parent_id" ref="account_411"/> + <field name="type">other</field> +</record> +<record id="account_411100" model="account.account.template"> + <field name="code">411100</field> + <field name="name">T.v.a soumise à l'origine amont</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_411"/> + <field name="type">other</field> +</record> +<record id="account_411500" model="account.account.template"> + <field name="code">411500</field> + <field name="name">Compte courant tva</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_411"/> + <field name="type">other</field> +</record> +<record id="account_412000" model="account.account.template"> + <field name="code">412000</field> + <field name="name">Impots et vers. fiscaux à récupérer</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_413100" model="account.account.template"> + <field name="code">413100</field> + <field name="name">Autres créances sur entrepr. liées</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_413200" model="account.account.template"> + <field name="code">413200</field> + <field name="name">Autres créances / entrepr. apparentées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_414000" model="account.account.template"> + <field name="code">414000</field> + <field name="name">Produits à recevoir (non commerciaux)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_416000" model="account.account.template"> + <field name="code">416000</field> + <field name="name">Créances diverses</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_417000" model="account.account.template"> + <field name="code">417000</field> + <field name="name">Créances douteuses</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_418000" model="account.account.template"> + <field name="code">418000</field> + <field name="name">Cautionnements versés en numéraire</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_419000" model="account.account.template"> + <field name="code">419000</field> + <field name="name">Réductions de val. / autres créances (-)</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_41"/> + <field name="type">other</field> +</record> +<record id="account_420000" model="account.account.template"> + <field name="code">420000</field> + <field name="name">Emprunts obligataires convert.</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_421000" model="account.account.template"> + <field name="code">421000</field> + <field name="name">Emprunts oblig. non convertibles</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_422000" model="account.account.template"> + <field name="code">422000</field> + <field name="name">Dettes de location-financ. et assimilées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_423000" model="account.account.template"> + <field name="code">423000</field> + <field name="name">Etablissements de crédit</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_424000" model="account.account.template"> + <field name="code">424000</field> + <field name="name">Autres emprunts</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_425000" model="account.account.template"> + <field name="code">425000</field> + <field name="name">Fournisseurs</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_425"/> + <field name="type">other</field> +</record> +<record id="account_425100" model="account.account.template"> + <field name="code">425100</field> + <field name="name">Effets à payer</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_425"/> + <field name="type">other</field> +</record> +<record id="account_426000" model="account.account.template"> + <field name="code">426000</field> + <field name="name">Acomptes reçus / commandes éch. ds l'an</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_427100" model="account.account.template"> + <field name="code">427100</field> + <field name="name">Entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_427200" model="account.account.template"> + <field name="code">427200</field> + <field name="name">Lien de participation</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_428000" model="account.account.template"> + <field name="code">428000</field> + <field name="name">Cautionnements reçus en numéraire</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_429000" model="account.account.template"> + <field name="code">429000</field> + <field name="name">Dettes diverses échéant dans l'année</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_42"/> + <field name="type">other</field> +</record> +<record id="account_430000" model="account.account.template"> + <field name="code">430000</field> + <field name="name">Banques-emprunts en compte à terme fixe</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_43"/> + <field name="type">other</field> +</record> +<record id="account_431000" model="account.account.template"> + <field name="code">431000</field> + <field name="name">Banques-promesses</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_43"/> + <field name="type">other</field> +</record> +<record id="account_432000" model="account.account.template"> + <field name="code">432000</field> + <field name="name">Banques-crédit d'acceptation</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_43"/> + <field name="type">other</field> +</record> +<record id="account_433000" model="account.account.template"> + <field name="code">433000</field> + <field name="name">Banques-dettes en compte courant</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_43"/> + <field name="type">other</field> +</record> +<record id="account_438000" model="account.account.template"> + <field name="code">438000</field> + <field name="name">Autres emprunts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_43"/> + <field name="type">other</field> +</record> +<record id="account_440000" model="account.account.template"> + <field name="code">440000</field> + <field name="name">Fournisseurs</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_44"/> + <field name="type">other</field> +</record> +<record id="account_441000" model="account.account.template"> + <field name="code">441000</field> + <field name="name">Effets à payer</field> + <field name="user_type" ref="account_type_liability"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_44"/> + <field name="type">other</field> +</record> +<record id="account_442000" model="account.account.template"> + <field name="code">442000</field> + <field name="name">Factures à recevoir</field> + <field name="user_type" ref="account_type_root"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_44"/> + <field name="type">other</field> +</record> +<record id="account_443100" model="account.account.template"> + <field name="code">443100</field> + <field name="name">Entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_44"/> + <field name="type">other</field> +</record> +<record id="account_443200" model="account.account.template"> + <field name="code">443200</field> + <field name="name">Lien de participation</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_44"/> + <field name="type">other</field> +</record> +<record id="account_450000" model="account.account.template"> + <field name="code">450000</field> + <field name="name">Dettes fiscales estimées</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_451000" model="account.account.template"> + <field name="code">451000</field> + <field name="name">T.v.a en aval</field> + <field name="user_type" ref="account_type_liability"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_451"/> + <field name="type">other</field> +</record> +<record id="account_451100" model="account.account.template"> + <field name="code">451100</field> + <field name="name">T.v.a soumise à l'origine aval</field> + <field name="user_type" ref="account_type_root"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_451"/> + <field name="type">other</field> +</record> +<record id="account_451200" model="account.account.template"> + <field name="code">451200</field> + <field name="name">T.v.a intracom</field> + <field name="user_type" ref="account_type_root"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_451"/> + <field name="type">other</field> +</record> +<record id="account_451500" model="account.account.template"> + <field name="code">451500</field> + <field name="name">Compte courant tva</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_451"/> + <field name="type">other</field> +</record> +<record id="account_452000" model="account.account.template"> + <field name="code">452000</field> + <field name="name">Impôts et taxes à payer à l'état</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_452"/> + <field name="type">other</field> +</record> +<record id="account_452100" model="account.account.template"> + <field name="code">452100</field> + <field name="name">Impôts et taxes à payer aux adm commun</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_452"/> + <field name="type">other</field> +</record> +<record id="account_453000" model="account.account.template"> + <field name="code">453000</field> + <field name="name">Retenues s/salaires</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_454000" model="account.account.template"> + <field name="code">454000</field> + <field name="name">Cass (centre..de sécurite soc)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_455000" model="account.account.template"> + <field name="code">455000</field> + <field name="name">Personnel-rémuneration à payer</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_456000" model="account.account.template"> + <field name="code">456000</field> + <field name="name">Personnel-avances et acomptes</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_458000" model="account.account.template"> + <field name="code">458000</field> + <field name="name">Autres dettes sociales</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_45"/> + <field name="type">other</field> +</record> +<record id="account_460000" model="account.account.template"> + <field name="code">460000</field> + <field name="name">Acomptes reçus sur commandes</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_4"/> + <field name="type">other</field> +</record> +<record id="account_470000" model="account.account.template"> + <field name="code">470000</field> + <field name="name">Dividendes-tantièmes d'ex. ant. à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_47"/> + <field name="type">other</field> +</record> +<record id="account_471000" model="account.account.template"> + <field name="code">471000</field> + <field name="name">Dividendes de l'exercice à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_47"/> + <field name="type">other</field> +</record> +<record id="account_472000" model="account.account.template"> + <field name="code">472000</field> + <field name="name">Tantièmes de l'exercice à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_47"/> + <field name="type">other</field> +</record> +<record id="account_473000" model="account.account.template"> + <field name="code">473000</field> + <field name="name">Autres allocataires à payer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_47"/> + <field name="type">other</field> +</record> +<record id="account_480000" model="account.account.template"> + <field name="code">480000</field> + <field name="name">Obligations et coupons échus (dettes)</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_48"/> + <field name="type">other</field> +</record> +<record id="account_487000" model="account.account.template"> + <field name="code">487000</field> + <field name="name">Cautionnements reçus en numeraire</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_48"/> + <field name="type">other</field> +</record> +<record id="account_488000" model="account.account.template"> + <field name="code">488000</field> + <field name="name">Autres dettes diverses</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_48"/> + <field name="type">other</field> +</record> +<record id="account_490000" model="account.account.template"> + <field name="code">490000</field> + <field name="name">Charges à reporter (payées d'avance)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_491000" model="account.account.template"> + <field name="code">491000</field> + <field name="name">Produits acquis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_492000" model="account.account.template"> + <field name="code">492000</field> + <field name="name">Charges à imputer</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_493000" model="account.account.template"> + <field name="code">493000</field> + <field name="name">Produits à reporter</field> + <field name="user_type" ref="account_type_liability"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_499000" model="account.account.template"> + <field name="code">499000</field> + <field name="name">Comptes d'attente</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_499800" model="account.account.template"> + <field name="code">499800</field> + <field name="name">Solde équilibre en devises (hors pc)</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_49"/> + <field name="type">other</field> +</record> +<record id="account_500000" model="account.account.template"> + <field name="code">500000</field> + <field name="name">Actions propres</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type">other</field> +</record> +<record id="account_510000" model="account.account.template"> + <field name="code">510000</field> + <field name="name">Actions et parts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_51"/> + <field name="type">other</field> +</record> +<record id="account_510100" model="account.account.template"> + <field name="code">510100</field> + <field name="name">Montant non appelé s/action.part</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_51"/> + <field name="type">other</field> +</record> +<record id="account_510900" model="account.account.template"> + <field name="code">510900</field> + <field name="name">Réduction valeur s/action et parts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_51"/> + <field name="type">other</field> +</record> +<record id="account_512000" model="account.account.template"> + <field name="code">512000</field> + <field name="name">Parts dans entreprises liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_512"/> + <field name="type">other</field> +</record> +<record id="account_512100" model="account.account.template"> + <field name="code">512100</field> + <field name="name">Montant non appelé s/parts</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_512"/> + <field name="type">other</field> +</record> +<record id="account_512900" model="account.account.template"> + <field name="code">512900</field> + <field name="name">Réduction valeur s/part ent. liées</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_512"/> + <field name="type">other</field> +</record> +<record id="account_520000" model="account.account.template"> + <field name="code">520000</field> + <field name="name">Titres à rev. fixes - valeur d'acquis.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_52"/> + <field name="type">other</field> +</record> +<record id="account_529000" model="account.account.template"> + <field name="code">529000</field> + <field name="name">Titres à rev. fixes - réd. de val.</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_52"/> + <field name="type">other</field> +</record> +<record id="account_530000" model="account.account.template"> + <field name="code">530000</field> + <field name="name">Dépôts à terme</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_53"/> + <field name="type">other</field> +</record> +<record id="account_539000" model="account.account.template"> + <field name="code">539000</field> + <field name="name">Réductions de valeur / dépôts à terme</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_53"/> + <field name="type">other</field> +</record> +<record id="account_540000" model="account.account.template"> + <field name="code">540000</field> + <field name="name">Valeurs échues à l'encaissement</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type">other</field> +</record> +<record id="account_541000" model="account.account.template"> + <field name="code">541000</field> + <field name="name">Coupons à encaisser</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_5"/> + <field name="type">other</field> +</record> +<record id="account_550000" model="account.account.template"> + <field name="code">550000</field> + <field name="name">Ets de crédit-compte à vue</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_550"/> + <field name="type">other</field> +</record> +<record id="account_550100" model="account.account.template"> + <field name="code">550100</field> + <field name="name">Chèques et virements émis</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_550"/> + <field name="type">other</field> +</record> +<record id="account_550900" model="account.account.template"> + <field name="code">550900</field> + <field name="name">Réduction valeur s/cpte a vue</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_550"/> + <field name="type">other</field> +</record> +<record id="account_560000" model="account.account.template"> + <field name="code">560000</field> + <field name="name">Ccp - compte courant</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_56"/> + <field name="type">other</field> +</record> +<record id="account_561000" model="account.account.template"> + <field name="code">561000</field> + <field name="name">Ccp - chèques émis</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_56"/> + <field name="type">other</field> +</record> +<record id="account_570000" model="account.account.template"> + <field name="code">570000</field> + <field name="name">Caisses</field> + <field name="user_type" ref="account_type_asset"/> + + <field name="parent_id" ref="account_57"/> + <field name="type">other</field> +</record> +<record id="account_570900" model="account.account.template"> + <field name="code">570900</field> + <field name="name">Réduction valeur s/caisse</field> + <field name="user_type" ref="account_type_root"/> + + <field name="parent_id" ref="account_57"/> + <field name="type">other</field> +</record> +<record id="account_580000" model="account.account.template"> + <field name="code">580000</field> + <field name="name">Virements internes</field> + <field name="user_type" ref="account_type_root"/> + <field name="reconcile">True</field> + + <field name="parent_id" ref="account_5"/> + <field name="type">other</field> +</record> +<record id="account_600000" model="account.account.template"> + <field name="code">600000</field> + <field name="name">Achats de matières premières</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_601000" model="account.account.template"> + <field name="code">601000</field> + <field name="name">Achats de fournitures</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_602000" model="account.account.template"> + <field name="code">602000</field> + <field name="name">Achats de services, travaux et études</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_603000" model="account.account.template"> + <field name="code">603000</field> + <field name="name">Achats de sous-traitances générales</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_604000" model="account.account.template"> + <field name="code">604000</field> + <field name="name">Achats de marchandises</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_607000" model="account.account.template"> + <field name="code">607000</field> + <field name="name">Achats produits et demi-produits</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_608000" model="account.account.template"> + <field name="code">608000</field> + <field name="name">Remises, ristournes et rabais sur achats</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_60"/> + <field name="type">other</field> +</record> +<record id="account_609000" model="account.account.template"> + <field name="code">609000</field> + <field name="name">Variation de stock mat. premières</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_609"/> + <field name="type">other</field> +</record> +<record id="account_609100" model="account.account.template"> + <field name="code">609100</field> + <field name="name">Variation stock mat. consommables</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_609"/> + <field name="type">other</field> +</record> +<record id="account_609400" model="account.account.template"> + <field name="code">609400</field> + <field name="name">Variation stock marchandises</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_609"/> + <field name="type">other</field> +</record> +<record id="account_610000" model="account.account.template"> + <field name="code">610000</field> + <field name="name">Loyers et charges locatives</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_610"/> + <field name="type">other</field> +</record> +<record id="account_610100" model="account.account.template"> + <field name="code">610100</field> + <field name="name">Redevances de crédit bail</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_610"/> + <field name="type">other</field> +</record> +<record id="account_611000" model="account.account.template"> + <field name="code">611000</field> + <field name="name">Entretiens et réparations des locaux</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type">other</field> +</record> +<record id="account_612000" model="account.account.template"> + <field name="code">612000</field> + <field name="name">Consommation - eau</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6120"/> + <field name="type">other</field> +</record> +<record id="account_612010" model="account.account.template"> + <field name="code">612010</field> + <field name="name">Consommation - gaz</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6120"/> + <field name="type">other</field> +</record> +<record id="account_612020" model="account.account.template"> + <field name="code">612020</field> + <field name="name">Consommation - électricité</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6120"/> + <field name="type">other</field> +</record> +<record id="account_612030" model="account.account.template"> + <field name="code">612030</field> + <field name="name">Consommation - carburants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6120"/> + <field name="type">other</field> +</record> +<record id="account_612040" model="account.account.template"> + <field name="code">612040</field> + <field name="name">Consommation - mazout</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6120"/> + <field name="type">other</field> +</record> +<record id="account_612100" model="account.account.template"> + <field name="code">612100</field> + <field name="name">Documentation</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_612"/> + <field name="type">other</field> +</record> +<record id="account_612200" model="account.account.template"> + <field name="code">612200</field> + <field name="name">Imprimés et fournitures de bureau</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_612"/> + <field name="type">other</field> +</record> +<record id="account_612300" model="account.account.template"> + <field name="code">612300</field> + <field name="name">Téléphone</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6123"/> + <field name="type">other</field> +</record> +<record id="account_612310" model="account.account.template"> + <field name="code">612310</field> + <field name="name">Frais postaux</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6123"/> + <field name="type">other</field> +</record> +<record id="account_612320" model="account.account.template"> + <field name="code">612320</field> + <field name="name">Fax</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6123"/> + <field name="type">other</field> +</record> +<record id="account_613000" model="account.account.template"> + <field name="code">613000</field> + <field name="name">Redevances et royalties</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_613"/> + <field name="type">other</field> +</record> +<record id="account_613100" model="account.account.template"> + <field name="code">613100</field> + <field name="name">Honoraires</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_613"/> + <field name="type">other</field> +</record> +<record id="account_613200" model="account.account.template"> + <field name="code">613200</field> + <field name="name">Organismes de services</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_613"/> + <field name="type">other</field> +</record> +<record id="account_613300" model="account.account.template"> + <field name="code">613300</field> + <field name="name">Commissions</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_613"/> + <field name="type">other</field> +</record> +<record id="account_614000" model="account.account.template"> + <field name="code">614000</field> + <field name="name">Assurance incendie</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type">other</field> +</record> +<record id="account_615000" model="account.account.template"> + <field name="code">615000</field> + <field name="name">Annonces, publicité</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_615"/> + <field name="type">other</field> +</record> +<record id="account_615100" model="account.account.template"> + <field name="code">615100</field> + <field name="name">Cotisations et abonnements</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_615"/> + <field name="type">other</field> +</record> +<record id="account_615200" model="account.account.template"> + <field name="code">615200</field> + <field name="name">Dons et libéralités</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_615"/> + <field name="type">other</field> +</record> +<record id="account_615300" model="account.account.template"> + <field name="code">615300</field> + <field name="name">Publications légales</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_615"/> + <field name="type">other</field> +</record> +<record id="account_616000" model="account.account.template"> + <field name="code">616000</field> + <field name="name">Sous-traitants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type">other</field> +</record> +<record id="account_616100" model="account.account.template"> + <field name="code">616100</field> + <field name="name">Transports par tiers</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_61"/> + <field name="type">other</field> +</record> +<record id="account_620000" model="account.account.template"> + <field name="code">620000</field> + <field name="name">Rémunératons administrat. ou gérants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_620"/> + <field name="type">other</field> +</record> +<record id="account_620100" model="account.account.template"> + <field name="code">620100</field> + <field name="name">Rémunérations personnel de direction</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_620"/> + <field name="type">other</field> +</record> +<record id="account_620200" model="account.account.template"> + <field name="code">620200</field> + <field name="name">Rémunérations employés</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_620"/> + <field name="type">other</field> +</record> +<record id="account_620300" model="account.account.template"> + <field name="code">620300</field> + <field name="name">Rémunérations ouvriers</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_620"/> + <field name="type">other</field> +</record> +<record id="account_621000" model="account.account.template"> + <field name="code">621000</field> + <field name="name">Chg.soc.lég.administ.et gérant</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_621"/> + <field name="type">other</field> +</record> +<record id="account_621100" model="account.account.template"> + <field name="code">621100</field> + <field name="name">Chg.soc.lég. personnel de direction</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_621"/> + <field name="type">other</field> +</record> +<record id="account_621200" model="account.account.template"> + <field name="code">621200</field> + <field name="name">Chg.soc.lég. employés</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_621"/> + <field name="type">other</field> +</record> +<record id="account_621300" model="account.account.template"> + <field name="code">621300</field> + <field name="name">Chg.soc.lég. ouvriers</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_621"/> + <field name="type">other</field> +</record> +<record id="account_621400" model="account.account.template"> + <field name="code">621400</field> + <field name="name">Assurance accidents</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_621"/> + <field name="type">other</field> +</record> +<record id="account_622000" model="account.account.template"> + <field name="code">622000</field> + <field name="name">Primes patr. pour ass. extra - légales</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_62"/> + <field name="type">other</field> +</record> +<record id="account_623000" model="account.account.template"> + <field name="code">623000</field> + <field name="name">Autres frais de personnel</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_62"/> + <field name="type">other</field> +</record> +<record id="account_624000" model="account.account.template"> + <field name="code">624000</field> + <field name="name">Pension administrat. ou gérant</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_624"/> + <field name="type">other</field> +</record> +<record id="account_624100" model="account.account.template"> + <field name="code">624100</field> + <field name="name">Pension personnel</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_624"/> + <field name="type">other</field> +</record> +<record id="account_630000" model="account.account.template"> + <field name="code">630000</field> + <field name="name">Dot. cor. val s/frais d'établissement</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_630"/> + <field name="type">other</field> +</record> +<record id="account_630100" model="account.account.template"> + <field name="code">630100</field> + <field name="name">Dot. cor. val s/immob. incorporels</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_630"/> + <field name="type">other</field> +</record> +<record id="account_630200" model="account.account.template"> + <field name="code">630200</field> + <field name="name">Dot. cor. val s/immob. corporels</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_630"/> + <field name="type">other</field> +</record> +<record id="account_631000" model="account.account.template"> + <field name="code">631000</field> + <field name="name">Dot. cor. val s/stock mat.fourni</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_631"/> + <field name="type">other</field> +</record> +<record id="account_631100" model="account.account.template"> + <field name="code">631100</field> + <field name="name">Reprises cor. val. s/stock mat. fourni</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_631"/> + <field name="type">other</field> +</record> +<record id="account_632000" model="account.account.template"> + <field name="code">632000</field> + <field name="name">Dot. cor. val s/en-cours,pr fini</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_632"/> + <field name="type">other</field> +</record> +<record id="account_632100" model="account.account.template"> + <field name="code">632100</field> + <field name="name">Reprises cor. val s/en-cours,pf</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_632"/> + <field name="type">other</field> +</record> +<record id="account_633000" model="account.account.template"> + <field name="code">633000</field> + <field name="name">Dot. cor. val s/cr comm +1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_633"/> + <field name="type">other</field> +</record> +<record id="account_633100" model="account.account.template"> + <field name="code">633100</field> + <field name="name">Reprises cor. val s/cr com +1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_633"/> + <field name="type">other</field> +</record> +<record id="account_634000" model="account.account.template"> + <field name="code">634000</field> + <field name="name">Dot. cor. val. s/cr comm -1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_634"/> + <field name="type">other</field> +</record> +<record id="account_634100" model="account.account.template"> + <field name="code">634100</field> + <field name="name">Reprises cor. val.s/cr com -1an</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_634"/> + <field name="type">other</field> +</record> +<record id="account_635000" model="account.account.template"> + <field name="code">635000</field> + <field name="name">Dot. prov. pension et oblig. sim.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_635"/> + <field name="type">other</field> +</record> +<record id="account_635100" model="account.account.template"> + <field name="code">635100</field> + <field name="name">Reprises prov. s/pens.obli. sim.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_635"/> + <field name="type">other</field> +</record> +<record id="account_636000" model="account.account.template"> + <field name="code">636000</field> + <field name="name">Dot. prov-grosses réparation</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_636"/> + <field name="type">other</field> +</record> +<record id="account_636100" model="account.account.template"> + <field name="code">636100</field> + <field name="name">Reprises prov. grosses réparation</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_636"/> + <field name="type">other</field> +</record> +<record id="account_637000" model="account.account.template"> + <field name="code">637000</field> + <field name="name">Dot. prov-autres risques et chg</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_637"/> + <field name="type">other</field> +</record> +<record id="account_637100" model="account.account.template"> + <field name="code">637100</field> + <field name="name">Reprises prov autres risq,chg</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_637"/> + <field name="type">other</field> +</record> +<record id="account_640000" model="account.account.template"> + <field name="code">640000</field> + <field name="name">Taxe d'abonnement</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_640"/> + <field name="type">other</field> +</record> +<record id="account_640100" model="account.account.template"> + <field name="code">640100</field> + <field name="name">Impôt foncier</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_640"/> + <field name="type">other</field> +</record> +<record id="account_640200" model="account.account.template"> + <field name="code">640200</field> + <field name="name">Impôt commercial s/le capital</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_640"/> + <field name="type">other</field> +</record> +<record id="account_640300" model="account.account.template"> + <field name="code">640300</field> + <field name="name">Impôt s/la fortune</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_640"/> + <field name="type">other</field> +</record> +<record id="account_641000" model="account.account.template"> + <field name="code">641000</field> + <field name="name">Moins-val. sur réalis. d'immob. corp.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_64"/> + <field name="type">other</field> +</record> +<record id="account_642000" model="account.account.template"> + <field name="code">642000</field> + <field name="name">Moins-val. / réalis. de créances comm.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_64"/> + <field name="type">other</field> +</record> +<record id="account_643000" model="account.account.template"> + <field name="code">643000</field> + <field name="name">Charges d'exploitation diverses</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_64"/> + <field name="type">other</field> +</record> +<record id="account_650000" model="account.account.template"> + <field name="code">650000</field> + <field name="name">Intérêts, commissions et frais / dettes</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_651000" model="account.account.template"> + <field name="code">651000</field> + <field name="name">Dot. cor. val s/actif circ</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_651"/> + <field name="type">other</field> +</record> +<record id="account_651100" model="account.account.template"> + <field name="code">651100</field> + <field name="name">Reprises cor. val s/actif circulants</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_651"/> + <field name="type">other</field> +</record> +<record id="account_652000" model="account.account.template"> + <field name="code">652000</field> + <field name="name">Moins-values sur réalis. d'actifs circ.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_653000" model="account.account.template"> + <field name="code">653000</field> + <field name="name">Charges d'escompte de créances</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_654000" model="account.account.template"> + <field name="code">654000</field> + <field name="name">Différences de change</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_655000" model="account.account.template"> + <field name="code">655000</field> + <field name="name">Ecarts de conversion des devises</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_656000" model="account.account.template"> + <field name="code">656000</field> + <field name="name">Frais de banque</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_65"/> + <field name="type">other</field> +</record> +<record id="account_660000" model="account.account.template"> + <field name="code">660000</field> + <field name="name">Dot. cor. val exceptionnelles</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_660"/> + <field name="type">other</field> +</record> +<record id="account_660100" model="account.account.template"> + <field name="code">660100</field> + <field name="name">Reprises cor. val. excep</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_660"/> + <field name="type">other</field> +</record> +<record id="account_661000" model="account.account.template"> + <field name="code">661000</field> + <field name="name">Dot. cor. val s/immob. financières</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_661"/> + <field name="type">other</field> +</record> +<record id="account_661100" model="account.account.template"> + <field name="code">661100</field> + <field name="name">Reprises cor val s/immob. fin.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_661"/> + <field name="type">other</field> +</record> +<record id="account_662000" model="account.account.template"> + <field name="code">662000</field> + <field name="name">Dot. prov-risques et chg except.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_662"/> + <field name="type">other</field> +</record> +<record id="account_662100" model="account.account.template"> + <field name="code">662100</field> + <field name="name">Reprises prov risq,chg except.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_662"/> + <field name="type">other</field> +</record> +<record id="account_663000" model="account.account.template"> + <field name="code">663000</field> + <field name="name">Moins-values sur réalis. d'actifs immob.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type">other</field> +</record> +<record id="account_665000" model="account.account.template"> + <field name="code">665000</field> + <field name="name">Différences de change exceptionnelles</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type">other</field> +</record> +<record id="account_668000" model="account.account.template"> + <field name="code">668000</field> + <field name="name">Autres charges exceptionnelles</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_66"/> + <field name="type">other</field> +</record> +<record id="account_670000" model="account.account.template"> + <field name="code">670000</field> + <field name="name">Impôts luxemb sur le résultat de l'ex.</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_67"/> + <field name="type">other</field> +</record> +<record id="account_671000" model="account.account.template"> + <field name="code">671000</field> + <field name="name">Impôts luxemb /résultat d'ex. antérieurs</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_67"/> + <field name="type">other</field> +</record> +<record id="account_672000" model="account.account.template"> + <field name="code">672000</field> + <field name="name">Impôts étrangers sur le résultat de l'ex</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_67"/> + <field name="type">other</field> +</record> +<record id="account_673000" model="account.account.template"> + <field name="code">673000</field> + <field name="name">Impôts étrgs/résultat d'ex. antérieurs</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_67"/> + <field name="type">other</field> +</record> +<record id="account_674000" model="account.account.template"> + <field name="code">674000</field> + <field name="name">Impôts sur résultats exceptionnels</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_67"/> + <field name="type">other</field> +</record> +<record id="account_680000" model="account.account.template"> + <field name="code">680000</field> + <field name="name">Transfert aux réserves immunisées</field> + <field name="user_type" ref="account_type_expense"/> + + <field name="parent_id" ref="account_6"/> + <field name="type">other</field> +</record> +<record id="account_700000" model="account.account.template"> + <field name="code">700000</field> + <field name="name">Ventes et prestations de services</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_70"/> + <field name="type">payable</field> +</record> +<record id="account_708000" model="account.account.template"> + <field name="code">708000</field> + <field name="name">R.r.r accordés sur ventes</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_70"/> + <field name="type">payable</field> +</record> +<record id="account_712000" model="account.account.template"> + <field name="code">712000</field> + <field name="name">Variation de stocks des encours de fabr.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_71"/> + <field name="type">payable</field> +</record> +<record id="account_713000" model="account.account.template"> + <field name="code">713000</field> + <field name="name">Variation de stocks des produits finis</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_71"/> + <field name="type">payable</field> +</record> +<record id="account_720000" model="account.account.template"> + <field name="code">720000</field> + <field name="name">Travaux effect. par entreprise elle-même</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">payable</field> +</record> +<record id="account_740000" model="account.account.template"> + <field name="code">740000</field> + <field name="name">Subsides d'exploitation</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_741000" model="account.account.template"> + <field name="code">741000</field> + <field name="name">Plus-values sur réal. d'immob. corp.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_742000" model="account.account.template"> + <field name="code">742000</field> + <field name="name">Plus-values sur réalis. créances comm.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_743000" model="account.account.template"> + <field name="code">743000</field> + <field name="name">Récupération de frais de personnel</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_744000" model="account.account.template"> + <field name="code">744000</field> + <field name="name">Commissions et courtages</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_745000" model="account.account.template"> + <field name="code">745000</field> + <field name="name">Redevances pour brevets et licences</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_746000" model="account.account.template"> + <field name="code">746000</field> + <field name="name">Loyers perçus</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_748000" model="account.account.template"> + <field name="code">748000</field> + <field name="name">Produits d'exploitation divers.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_74"/> + <field name="type">payable</field> +</record> +<record id="account_750000" model="account.account.template"> + <field name="code">750000</field> + <field name="name">Produits des participations</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_750"/> + <field name="type">payable</field> +</record> +<record id="account_750100" model="account.account.template"> + <field name="code">750100</field> + <field name="name">Autres produits des immob. financières</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_750"/> + <field name="type">payable</field> +</record> +<record id="account_751000" model="account.account.template"> + <field name="code">751000</field> + <field name="name">Produits des valeurs mobilières</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_751"/> + <field name="type">payable</field> +</record> +<record id="account_751100" model="account.account.template"> + <field name="code">751100</field> + <field name="name">Autres produits des actifs circulants</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_751"/> + <field name="type">payable</field> +</record> +<record id="account_752000" model="account.account.template"> + <field name="code">752000</field> + <field name="name">Plus-values sur réalis. d'actifs circula</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_753000" model="account.account.template"> + <field name="code">753000</field> + <field name="name">Subsides en capital et en intérêts</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_754000" model="account.account.template"> + <field name="code">754000</field> + <field name="name">Différences de change</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_754100" model="account.account.template"> + <field name="code">754100</field> + <field name="name">Amendes pour retards de paiement</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_754200" model="account.account.template"> + <field name="code">754200</field> + <field name="name">Intérêts retards de paiement</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_755000" model="account.account.template"> + <field name="code">755000</field> + <field name="name">Ecarts de conversion de devises</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_756000" model="account.account.template"> + <field name="code">756000</field> + <field name="name">Autres produits financiers</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_757000" model="account.account.template"> + <field name="code">757000</field> + <field name="name">Escomptes obtenus</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_75"/> + <field name="type">payable</field> +</record> +<record id="account_763000" model="account.account.template"> + <field name="code">763000</field> + <field name="name">Plus-values sur réalis. d'actifs immob.</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_7"/> + <field name="type">payable</field> +</record> +<record id="account_771000" model="account.account.template"> + <field name="code">771000</field> + <field name="name">Régularis. d'impôts luxemb sur résultat</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_77"/> + <field name="type">payable</field> +</record> +<record id="account_773000" model="account.account.template"> + <field name="code">773000</field> + <field name="name">Régularis. d'impôts étrangers / résultat</field> + <field name="user_type" ref="account_type_income"/> + + <field name="parent_id" ref="account_77"/> + <field name="type">payable</field> +</record> + + + <!-- Chart template --> + <record id="l10nlu_chart_template" model="account.chart.template"> + <field name="name">PCMN for Luxembourg</field> + <field name="account_root_id" ref="account_lu_0"/> + <field name="tax_code_root_id" ref="account_tax_code_template_1"/> + <field name="bank_account_view_id" ref="account_550"/> + <field name="property_account_receivable" ref="account_401000"/> + <field name="property_account_payable" ref="account_441000"/> + <field name="property_account_expense_categ" ref="account_600000"/> + <field name="property_account_income_categ" ref="account_700000"/> + </record> + + + </data> +</openerp> diff --git a/addons/l10n_lu/l10n_lu_report.xml b/addons/l10n_lu/l10n_lu_report.xml new file mode 100644 index 00000000000..192b603e1af --- /dev/null +++ b/addons/l10n_lu/l10n_lu_report.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + <report + auto="False" + id="legal_vat" + menu="False" + model="account.tax.code" + name="l10n_lu.tax.report.print" + string="Luxemburg VAT Declaration"/> + </data> +</openerp> diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml new file mode 100644 index 00000000000..dd16b17d429 --- /dev/null +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<openerp> + <data> + + <record id="config_call_account_template" model="ir.actions.todo"> + <field name="name">Generate Chart of Accounts from a Chart Template</field> + <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to select the company, the chart template, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. +This is the same wizard that runs from Financial Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field> + <field name="action_id" ref="account.action_wizard_multi_chart"/> + <field name="state">open</field> + </record> + + <menuitem + id="legal_lu" + parent="account.menu_finance_legal_statement" + name="Luxemburg"/> + + <wizard + id="wizard_print_vat" + menu="False" + model="account.tax.code" + name="l10n_lu.tax.report.wizard" string="VAT Declaration"/> + + <menuitem + id="legal_lu_vat" + parent="legal_lu" + type="wizard" + action="wizard_print_vat"/> + + + </data> +</openerp> diff --git a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf new file mode 100755 index 00000000000..8e56cbbd703 --- /dev/null +++ b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf @@ -0,0 +1,1254 @@ +%PDF-1.4 +% +3 0 obj<</Type/Annot/F 4/AP<</N 1 0 R>>/T(info_name)/BS<</S/S/W 1>>/V()/Ff 0/Rect[270 698 567.52 710.34]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +5 0 obj<</Type/Annot/F 4/AP<</N 4 0 R>>/T(info_address)/BS<</S/S/W 1>>/V()/Ff 0/Rect[273.05 668.1 570.57 680.64]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +7 0 obj<</Type/Annot/F 4/AP<</N 6 0 R>>/T(info_address2)/BS<</S/S/W 1>>/V()/Ff 0/Rect[274.83 642.68 572.35 655.03]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +9 0 obj<</Type/Annot/F 4/AP<</N 8 0 R>>/T(info_vatnum)/BS<</S/S/W 1>>/V()/Ff 0/Rect[393.68 765.95 570.57 776.81]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +11 0 obj<</Type/Annot/F 4/AP<</N 10 0 R>>/T(case_03)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 567.83 446.09 578.69]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +13 0 obj<</Type/Annot/F 4/AP<</N 12 0 R>>/T(case_04)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[353.63 551.99 445.31 564.14]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +15 0 obj<</Type/Annot/F 4/AP<</N 14 0 R>>/T(case_05)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[352.78 538.71 443.89 549.58]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +17 0 obj<</Type/Annot/F 4/AP<</N 16 0 R>>/T(case_06)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[352.78 523.52 445.02 534.38]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +19 0 obj<</Type/Annot/F 4/AP<</N 18 0 R>>/T(case_08)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[352.99 509.6 443.6 519.9]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +21 0 obj<</Type/Annot/F 4/AP<</N 20 0 R>>/T(case_09)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 492.49 444.74 503.35]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +23 0 obj<</Type/Annot/F 4/AP<</N 22 0 R>>/T(case_11)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.55 461.32 445.87 472.18]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +25 0 obj<</Type/Annot/F 4/AP<</N 24 0 R>>/T(case_12)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 444.2 445.73 455.07]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +27 0 obj<</Type/Annot/F 4/AP<</N 26 0 R>>/T(case_13)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 429.64 446.23 440.51]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +29 0 obj<</Type/Annot/F 4/AP<</N 28 0 R>>/T(case_14)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.55 415.73 447.36 426.59]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +31 0 obj<</Type/Annot/F 4/AP<</N 30 0 R>>/T(case_15)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 401.17 445.3 412.04]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +33 0 obj<</Type/Annot/F 4/AP<</N 32 0 R>>/T(case_16)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 355.3 445.16 366.17]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +35 0 obj<</Type/Annot/F 4/AP<</N 34 0 R>>/T(case_17)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[353.63 338.19 445.01 350.97]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +37 0 obj<</Type/Annot/F 4/AP<</N 36 0 R>>/T(case_19)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 321.71 445.51 335.77]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +39 0 obj<</Type/Annot/F 4/AP<</N 38 0 R>>/T(case_22)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 303.96 446.01 317.38]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +41 0 obj<</Type/Annot/F 4/AP<</N 40 0 R>>/T(case_32)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.98 288.77 447.14 302]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +43 0 obj<</Type/Annot/F 4/AP<</N 42 0 R>>/T(case_33)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.98 274.21 447.64 288.77]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +45 0 obj<</Type/Annot/F 4/AP<</N 44 0 R>>/T(case_34)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 259.65 446.22 273.07]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +47 0 obj<</Type/Annot/F 4/AP<</N 46 0 R>>/T(case_35)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 245.1 446.07 257.88]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +49 0 obj<</Type/Annot/F 4/AP<</N 48 0 R>>/T(case_82)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.55 230.54 447.21 243.96]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +51 0 obj<</Type/Annot/F 4/AP<</N 50 0 R>>/T(case_37)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 289.48 565.8 299.63]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +53 0 obj<</Type/Annot/F 4/AP<</N 52 0 R>>/T(case_38)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 274.29 566.44 284]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +55 0 obj<</Type/Annot/F 4/AP<</N 54 0 R>>/T(case_39)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 259.09 565.01 269.88]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +57 0 obj<</Type/Annot/F 4/AP<</N 56 0 R>>/T(case_40)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 244.53 565.51 255.96]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +59 0 obj<</Type/Annot/F 4/AP<</N 58 0 R>>/T(case_83)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 229.34 566.01 241.41]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +61 0 obj<</Type/Annot/F 4/AP<</N 60 0 R>>/T(case_41)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 214.14 565.86 225.01]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +63 0 obj<</Type/Annot/F 4/AP<</N 62 0 R>>/T(case_47)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 179.77 565.72 193.96]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +65 0 obj<</Type/Annot/F 4/AP<</N 64 0 R>>/T(case_48)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 164.58 566.22 177.92]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +67 0 obj<</Type/Annot/F 4/AP<</N 66 0 R>>/T(case_49)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 150.66 566.07 163.57]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +69 0 obj<</Type/Annot/F 4/AP<</N 68 0 R>>/T(case_50)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 136.1 565.93 149.65]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +71 0 obj<</Type/Annot/F 4/AP<</N 70 0 R>>/T(case_51)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 104.93 565.79 118.48]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +73 0 obj<</Type/Annot/F 4/AP<</N 72 0 R>>/T(case_86)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[482.13 40.52 566.28 51.52]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +75 0 obj<</Type/Annot/F 4/AP<</N 74 0 R>>/T(case_42)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[353.63 180.2 445.15 190.77]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +77 0 obj<</Type/Annot/F 4/AP<</N 76 0 R>>/T(case_43)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.34 165 445.65 177.92]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +79 0 obj<</Type/Annot/F 4/AP<</N 78 0 R>>/T(case_44)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 149.8 446.14 163.57]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +81 0 obj<</Type/Annot/F 4/AP<</N 80 0 R>>/T(case_45)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.55 136.53 447.28 148.38]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +83 0 obj<</Type/Annot/F 4/AP<</N 82 0 R>>/T(case_85)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 120.69 446.5 132.83]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +85 0 obj<</Type/Annot/F 4/AP<</N 84 0 R>>/T(case_46)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[355.98 105.5 448.27 117.2]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +87 0 obj<</Type/Annot/F 4/AP<</N 86 0 R>>/T(case_52)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[354.7 64.1 446.21 74.96]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +91 0 obj<</T(case_01)/V/Off/Kids[92 0 R]/FT/Btn>> +endobj +92 0 obj<</Type/Annot/F 4/AP<</N<</Off 90 0 R/Yes 88 0 R>>>>/Parent 91 0 R/BS<</S/S/W 1>>/AS/Off/V/Off/Rect[102.89 569.1 108 574.22]/Subtype/Widget/DR<</Font<</ZaDb 89 0 R>>>>/DA(/ZaDb 10 Tf 0 0 0 rg )/MK<</CA(8)>>/FT/Btn>> +endobj +95 0 obj<</T(case_02)/V/Off/Kids[96 0 R]/FT/Btn>> +endobj +96 0 obj<</Type/Annot/F 4/AP<</N<</Off 94 0 R/Yes 93 0 R>>>>/Parent 95 0 R/BS<</S/S/W 1>>/AS/Off/V/Off/Rect[166.16 569.1 171.92 574.22]/Subtype/Widget/DR<</Font<</ZaDb 89 0 R>>>>/DA(/ZaDb 10 Tf 0 0 0 rg )/MK<</CA(8)>>/FT/Btn>> +endobj +98 0 obj<</Type/Annot/F 4/AP<</N 97 0 R>>/T(case_84)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[295.9 230.54 310.6 241.41]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +100 0 obj<</Type/Annot/F 4/AP<</N 99 0 R>>/T(case_07)/BS<</S/S/W 1>>/V()/Ff 0/Rect[85 507.68 333.61 519.9]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +102 0 obj<</Type/Annot/F 4/AP<</N 101 0 R>>/T(case_18)/BS<</S/S/W 1>>/V()/Ff 0/Rect[85 323.05 333.61 334.56]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +104 0 obj<</Type/Annot/F 4/AP<</N 103 0 R>>/T(case_53)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 760.83 421.02 773.62]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +106 0 obj<</Type/Annot/F 4/AP<</N 105 0 R>>/T(case_54)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 745.64 421.02 758.42]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +108 0 obj<</Type/Annot/F 4/AP<</N 107 0 R>>/T(case_55)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 731.72 422.16 743.86]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +110 0 obj<</Type/Annot/F 4/AP<</N 109 0 R>>/T(case_56)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 715.89 420.74 728.03]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +112 0 obj<</Type/Annot/F 4/AP<</N 111 0 R>>/T(case_81)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 699.41 420.59 712.2]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +114 0 obj<</Type/Annot/F 4/AP<</N 113 0 R>>/T(case_57)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 665.04 421.73 677.83]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +116 0 obj<</Type/Annot/F 4/AP<</N 115 0 R>>/T(case_58)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 650.49 420.95 663.27]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +118 0 obj<</Type/Annot/F 4/AP<</N 117 0 R>>/T(case_59)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 635.93 420.8 648.71]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +120 0 obj<</Type/Annot/F 4/AP<</N 119 0 R>>/T(case_60)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 621.38 421.94 634.8]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +122 0 obj<</Type/Annot/F 4/AP<</N 121 0 R>>/T(case_61)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 589.56 420.52 602.34]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +124 0 obj<</Type/Annot/F 4/AP<</N 123 0 R>>/T(case_88)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 550.72 421.01 563.5]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +126 0 obj<</Type/Annot/F 4/AP<</N 125 0 R>>/T(case_89)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 536.16 420.87 548.95]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +128 0 obj<</Type/Annot/F 4/AP<</N 127 0 R>>/T(case_90)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 520.97 420.73 533.75]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +130 0 obj<</Type/Annot/F 4/AP<</N 129 0 R>>/T(case_91)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 507.05 421.23 519.83]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +132 0 obj<</Type/Annot/F 4/AP<</N 131 0 R>>/T(case_422)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 490.58 421.08 503.36]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +134 0 obj<</Type/Annot/F 4/AP<</N 133 0 R>>/T(case_92)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 467.71 420.94 480.49]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +136 0 obj<</Type/Annot/F 4/AP<</N 135 0 R>>/T(case_10)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[331.69 449.96 420.8 462.74]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +138 0 obj<</Type/Annot/F 4/AP<</N 137 0 R>>/T(case_87)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 783.98 556.08 796.77]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +140 0 obj<</Type/Annot/F 4/AP<</N 139 0 R>>/T(case_62)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 760.48 555.94 773.62]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +142 0 obj<</Type/Annot/F 4/AP<</N 141 0 R>>/T(case_63)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 745.28 556.44 758.42]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +144 0 obj<</Type/Annot/F 4/AP<</N 143 0 R>>/T(case_64)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 730.73 556.29 743.86]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +146 0 obj<</Type/Annot/F 4/AP<</N 145 0 R>>/T(case_65)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 717.45 556.15 730.73]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +148 0 obj<</Type/Annot/F 4/AP<</N 147 0 R>>/T(case_70)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 685 556.65 698]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +150 0 obj<</Type/Annot/F 4/AP<</N 149 0 R>>/T(case_66)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 664.05 555.86 677.83]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +153 0 obj<</T(case_68)/V//Ff 0/Kids[154 0 R 155 0 R]/DV//FT/Tx>> +endobj +154 0 obj<</Type/Annot/F 4/AP<</N 151 0 R>>/Parent 153 0 R/BS<</S/S/W 1>>/Ff 0/Q 2/Rect[472.79 650.14 557.64 664.05]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +155 0 obj<</Type/Annot/F 4/AP<</N 152 0 R>>/Parent 153 0 R/BS<</S/S/W 1>>/Ff 0/Q 2/Rect[472.79 635.58 555.58 648.71]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +156 0 obj<</T(case_68)/V//Ff 0/DV//FT/Tx>> +endobj +158 0 obj<</Type/Annot/F 4/AP<</N 157 0 R>>/T(case_69)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 621.66 556.08 634.8]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +160 0 obj<</Type/Annot/F 4/AP<</N 159 0 R>>/T(case_71)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 603.27 554.65 617.33]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +162 0 obj<</Type/Annot/F 4/AP<</N 161 0 R>>/T(case_93)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 550.37 555.15 564.43]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +164 0 obj<</Type/Annot/F 4/AP<</N 163 0 R>>/T(case_94)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 535.81 555.65 550.37]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +166 0 obj<</Type/Annot/F 4/AP<</N 165 0 R>>/T(case_95)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 521.89 555.5 535.81]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +168 0 obj<</Type/Annot/F 4/AP<</N 167 0 R>>/T(case_96)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 506.7 556 520.97]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +170 0 obj<</Type/Annot/F 4/AP<</N 169 0 R>>/T(case_219)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 490.23 555.22 505.42]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +172 0 obj<</Type/Annot/F 4/AP<</N 171 0 R>>/T(case_97)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 466.72 555.71 480.49]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +174 0 obj<</Type/Annot/F 4/AP<</N 173 0 R>>/T(case_72)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[472.79 428.52 555.57 442.58]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +176 0 obj<</Type/Annot/F 4/AP<</N 175 0 R>>/T(case_23)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 381.37 556.71 395.43]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +178 0 obj<</Type/Annot/F 4/AP<</N 177 0 R>>/T(case_24)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 365.53 557.2 379.59]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +180 0 obj<</Type/Annot/F 4/AP<</N 179 0 R>>/T(case_25)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 351.61 556.42 365.68]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +182 0 obj<</Type/Annot/F 4/AP<</N 181 0 R>>/T(case_26)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 337.06 556.92 351.61]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +184 0 obj<</Type/Annot/F 4/AP<</N 183 0 R>>/T(case_27)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 321.86 556.77 335.92]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +186 0 obj<</Type/Annot/F 4/AP<</N 185 0 R>>/T(case_28)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 307.95 557.27 321.86]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +188 0 obj<</Type/Annot/F 4/AP<</N 187 0 R>>/T(case_29)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 292.11 556.49 306.17]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +190 0 obj<</Type/Annot/F 4/AP<</N 189 0 R>>/T(case_30)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 277.56 556.34 292.11]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +192 0 obj<</Type/Annot/F 4/AP<</N 191 0 R>>/T(case_31)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 262.36 556.84 276.42]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +194 0 obj<</Type/Annot/F 4/AP<</N 193 0 R>>/T(case_98)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 224.16 556.06 238.22]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +196 0 obj<</Type/Annot/F 4/AP<</N 195 0 R>>/T(case_73)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 208.96 556.55 223.02]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +198 0 obj<</Type/Annot/F 4/AP<</N 197 0 R>>/T(case_74)/BS<</S/S/W 1>>/V()/Ff 0/Q 2/Rect[474.2 191.85 555.86 205.91]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +200 0 obj<</Type/Annot/F 4/AP<</N 199 0 R>>/T(info_vatnum_p2)/BS<</S/S/W 1>>/V()/Ff 0/Rect[120.15 799.82 254.36 813.88]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +202 0 obj<</Type/Annot/F 4/AP<</N 201 0 R>>/T(info_creator)/BS<</S/S/W 1>>/V()/Ff 0/Rect[63.91 150.5 242.22 163.92]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +204 0 obj<</Type/Annot/F 4/AP<</N 203 0 R>>/T(info_date_creation)/BS<</S/S/W 1>>/V()/Ff 0/Rect[261.39 150.5 373.23 163.92]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +206 0 obj<</Type/Annot/F 4/AP<</N 205 0 R>>/T(info_signature)/BS<</S/S/W 1>>/V()/Ff 0/Rect[389.21 150.5 547.07 167.11]/Subtype/Widget/DR<</Font<</TimesNewRomanPSMT 2 0 R>>>>/DV()/DA(/TimesNewRomanPSMT 10 Tf 0 0 0 rg )/FT/Tx>> +endobj +207 0 obj<</CapHeight 699/Type/FontDescriptor/Flags 32/Descent -215/FontBBox[-568 -306 2000 1006]/StemV 80/Ascent 693/FontName/TimesNewRomanPSMT/ItalicAngle 0>> +endobj +2 0 obj<</FirstChar 1/Type/Font/FontDescriptor 207 0 R/BaseFont/TimesNewRomanPSMT/Subtype/TrueType/LastChar 255/Encoding/WinAnsiEncoding/Widths[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 250 333 408 500 500 833 777 180 333 333 500 563 250 333 250 277 500 500 500 500 500 500 500 500 500 500 277 277 563 563 563 443 920 722 666 666 722 610 556 722 722 333 389 722 610 889 722 722 556 722 666 556 610 722 722 943 722 722 610 333 277 333 469 500 333 443 500 443 500 443 333 500 500 277 277 500 277 777 500 500 500 500 333 389 277 500 500 722 500 500 443 479 200 479 541 0 500 0 333 500 443 1000 500 500 333 1000 556 333 889 0 610 0 0 333 333 443 443 350 500 1000 333 979 389 333 722 0 443 722 250 333 500 500 500 500 200 500 333 759 275 500 563 333 759 500 399 548 299 299 333 576 453 250 333 299 310 500 750 750 750 443 722 722 722 722 722 722 889 666 610 610 610 610 333 333 333 333 722 722 722 722 722 722 722 563 722 722 722 722 722 722 556 500 443 443 443 443 443 443 666 443 443 443 443 443 277 277 277 277 500 500 500 500 500 500 500 548 500 500 500 500 500 500 500 500]>> +endobj +89 0 obj<</Type/Font/BaseFont/ZapfDingbats/Subtype/Type1>> +endobj +44 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.52 13.42]>>stream +xPpuVpb +endstream +endobj +139 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.15 13.14]>>stream +xPpuVpb +endstream +endobj +74 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.52 10.57]>>stream +xPpuVpb +endstream +endobj +82 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.8 12.14]>>stream +xPpuVpb +endstream +endobj +22 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.32 10.86]>>stream +xPpuVpb +endstream +endobj +66 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.95 12.91]>>stream +xPpuVpb +endstream +endobj +50 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.67 10.15]>>stream +xPpuVpb +endstream +endobj +201 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 178.31 13.42]>>stream +xPpuVpb +endstream +endobj +101 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 248.61 11.5]>>stream +xPpuVpb +endstream +endobj +193 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 81.86 14.06]>>stream +xPpuVpb +endstream +endobj +167 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.21 14.27]>>stream +xPpuVpb +endstream +endobj +88 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 77/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</ZaDb 89 0 R>>>>/Subtype/Form/BBox[0 0 5.11 5.11]>>stream +x+T0Bc=C(Q` +N! +Q.I + +!i@ qC]= c#eifaba +endstream +endobj +76 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.31 12.92]>>stream +xPpuVpb +endstream +endobj +26 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.89 10.87]>>stream +xPpuVpb +endstream +endobj +191 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.64 14.06]>>stream +xPpuVpb +endstream +endobj +24 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.39 10.86]>>stream +xPpuVpb +endstream +endobj +6 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 297.52 12.35]>>stream +xPpuVpb +endstream +endobj +30 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.96 10.86]>>stream +xPpuVpb +endstream +endobj +203 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 111.84 13.42]>>stream +xPpuVpb +endstream +endobj +94 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 8/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]>>/Subtype/Form/BBox[0 0 5.75 5.11]>>stream +x +endstream +endobj +99 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 248.61 12.21]>>stream +xPpuVpb +endstream +endobj +20 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.4 10.86]>>stream +xPpuVpb +endstream +endobj +105 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.33 12.78]>>stream +xPpuVpb +endstream +endobj +90 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 8/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]>>/Subtype/Form/BBox[0 0 5.11 5.11]>>stream +x +endstream +endobj +80 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.73 11.85]>>stream +xPpuVpb +endstream +endobj +161 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.36 14.06]>>stream +xPpuVpb +endstream +endobj +38 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.31 13.42]>>stream +xPpuVpb +endstream +endobj +125 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.18 12.78]>>stream +xPpuVpb +endstream +endobj +113 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.04 12.78]>>stream +xPpuVpb +endstream +endobj +46 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.38 12.78]>>stream +xPpuVpb +endstream +endobj +40 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.17 13.23]>>stream +xPpuVpb +endstream +endobj +177 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83 14.06]>>stream +xPpuVpb +endstream +endobj +78 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.44 13.77]>>stream +xPpuVpb +endstream +endobj +4 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 297.52 12.53]>>stream +xPpuVpb +endstream +endobj +159 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 81.86 14.06]>>stream +xPpuVpb +endstream +endobj +34 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.38 12.78]>>stream +xPpuVpb +endstream +endobj +60 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.74 10.87]>>stream +xPpuVpb +endstream +endobj +32 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.82 10.87]>>stream +xPpuVpb +endstream +endobj +165 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.71 13.92]>>stream +xPpuVpb +endstream +endobj +179 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.22 14.06]>>stream +xPpuVpb +endstream +endobj +10 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.39 10.86]>>stream +xPpuVpb +endstream +endobj +119 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.25 13.42]>>stream +xPpuVpb +endstream +endobj +163 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.86 14.56]>>stream +xPpuVpb +endstream +endobj +70 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.66 13.54]>>stream +xPpuVpb +endstream +endobj +141 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.65 13.14]>>stream +xPpuVpb +endstream +endobj +197 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 81.66 14.06]>>stream +xPpuVpb +endstream +endobj +117 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.11 12.78]>>stream +xPpuVpb +endstream +endobj +145 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.36 13.28]>>stream +xPpuVpb +endstream +endobj +157 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.29 13.14]>>stream +xPpuVpb +endstream +endobj +151 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 84.85 13.92]>>stream +xPpuVpb +endstream +endobj +199 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 134.21 14.06]>>stream +xPpuVpb +endstream +endobj +84 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 92.29 11.7]>>stream +xPpuVpb +endstream +endobj +42 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.66 14.56]>>stream +xPpuVpb +endstream +endobj +68 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.8 13.55]>>stream +xPpuVpb +endstream +endobj +115 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.26 12.78]>>stream +xPpuVpb +endstream +endobj +173 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.78 14.06]>>stream +xPpuVpb +endstream +endobj +62 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.59 14.19]>>stream +xPpuVpb +endstream +endobj +14 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.1 10.86]>>stream +xPpuVpb +endstream +endobj +195 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.35 14.06]>>stream +xPpuVpb +endstream +endobj +127 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.04 12.78]>>stream +xPpuVpb +endstream +endobj +72 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 84.16 11]>>stream +xPpuVpb +endstream +endobj +152 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.79 13.14]>>stream +xPpuVpb +endstream +endobj +107 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.47 12.14]>>stream +xPpuVpb +endstream +endobj +103 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.33 12.78]>>stream +xPpuVpb +endstream +endobj +97 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 14.7 10.87]>>stream +xPpuVpb +endstream +endobj +86 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.51 10.86]>>stream +xPpuVpb +endstream +endobj +181 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.71 14.56]>>stream +xPpuVpb +endstream +endobj +133 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.25 12.78]>>stream +xPpuVpb +endstream +endobj +1 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 297.52 12.34]>>stream +xPpuVpb +endstream +endobj +189 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.14 14.56]>>stream +xPpuVpb +endstream +endobj +54 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.89 10.79]>>stream +xPpuVpb +endstream +endobj +8 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 176.89 10.86]>>stream +xPpuVpb +endstream +endobj +183 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.57 14.06]>>stream +xPpuVpb +endstream +endobj +48 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.66 13.42]>>stream +xPpuVpb +endstream +endobj +109 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.05 12.14]>>stream +xPpuVpb +endstream +endobj +149 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.08 13.78]>>stream +xPpuVpb +endstream +endobj +169 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.43 15.2]>>stream +xPpuVpb +endstream +endobj +129 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.53 12.78]>>stream +xPpuVpb +endstream +endobj +36 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.17 14.06]>>stream +xPpuVpb +endstream +endobj +123 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.32 12.78]>>stream +xPpuVpb +endstream +endobj +185 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.07 13.92]>>stream +xPpuVpb +endstream +endobj +175 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.5 14.06]>>stream +xPpuVpb +endstream +endobj +205 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 157.86 16.62]>>stream +xPpuVpb +endstream +endobj +18 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 90.61 10.29]>>stream +xPpuVpb +endstream +endobj +52 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 84.31 9.71]>>stream +xPpuVpb +endstream +endobj +58 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.88 12.07]>>stream +xPpuVpb +endstream +endobj +171 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.92 13.77]>>stream +xPpuVpb +endstream +endobj +121 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 88.83 12.78]>>stream +xPpuVpb +endstream +endobj +93 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 83/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</ZaDb 89 0 R>>>>/Subtype/Form/BBox[0 0 5.75 5.11]>>stream +x+T0Bc=sS ahP` +N! +Q.I + +!i@ qC]=S KKB!$WAB3$K5D!P +endstream +endobj +135 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.1 12.78]>>stream +xPpuVpb +endstream +endobj +64 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 84.09 13.34]>>stream +xPpuVpb +endstream +endobj +56 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.38 11.43]>>stream +xPpuVpb +endstream +endobj +28 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.81 10.86]>>stream +xPpuVpb +endstream +endobj +147 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.86 13]>>stream +xPpuVpb +endstream +endobj +12 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 91.68 12.14]>>stream +xPpuVpb +endstream +endobj +137 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.29 12.78]>>stream +xPpuVpb +endstream +endobj +187 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 82.29 14.06]>>stream +xPpuVpb +endstream +endobj +16 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 92.24 10.86]>>stream +xPpuVpb +endstream +endobj +131 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 89.39 12.78]>>stream +xPpuVpb +endstream +endobj +111 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 88.9 12.78]>>stream +xPpuVpb +endstream +endobj +143 0 obj <</Matrix [1 0 0 1 0 0]/Filter/FlateDecode/Type/XObject/FormType 1/Length 18/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TimesNewRomanPSMT 2 0 R>>>>/Subtype/Form/BBox[0 0 83.5 13.14]>>stream +xPpuVpb +endstream +endobj +208 0 obj <</Filter/FlateDecode/Length 14>>stream +x+ +* +endstream +endobj +209 0 obj <</Filter/FlateDecode/Length 15>>stream +xS* + +endstream +endobj +210 0 obj <</Filter/FlateDecode/Length 14>>stream +x+ +* +endstream +endobj +211 0 obj <</Filter/FlateDecode/Length 15>>stream +xS* + +endstream +endobj +212 0 obj<</Type/Page/Contents[210 0 R 213 0 R 211 0 R]/Parent 214 0 R/Resources<</ExtGState<</GS1 215 0 R>>/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/Font<</TT2 216 0 R/TT4 217 0 R/TT6 218 0 R>>>>/CropBox[0 0 595.22 842]/Annots[104 0 R 106 0 R 108 0 R 110 0 R 112 0 R 114 0 R 116 0 R 118 0 R 120 0 R 122 0 R 124 0 R 126 0 R 128 0 R 130 0 R 132 0 R 134 0 R 136 0 R 138 0 R 140 0 R 142 0 R 144 0 R 146 0 R 148 0 R 150 0 R 154 0 R 155 0 R 158 0 R 160 0 R 162 0 R 164 0 R 166 0 R 168 0 R 170 0 R 172 0 R 174 0 R 176 0 R 178 0 R 180 0 R 182 0 R 184 0 R 186 0 R 188 0 R 190 0 R 192 0 R 194 0 R 196 0 R 198 0 R 200 0 R 202 0 R 204 0 R 206 0 R]/MediaBox[0 0 595.22 842]/Rotate 0>> +endobj +219 0 obj<</ExtGState<</GS1 215 0 R>>/ProcSet[/PDF/Text]/Font<</TT2 216 0 R/TT4 217 0 R/TT6 218 0 R>>>> +endobj +213 0 obj <</Filter/FlateDecode/Length 5609>>stream +h[͒8rSb7 f
8&NyZŪцJ^?վߢ+/L +t--ؗ }Uwέd(s%]gԁAcO/eul6Ӷf%/E."[?O̗Lya*7V-lXۋ,Kuju9nV?[-a ut>d?_\f?¯ξ߇~Vb]
6Z@[#}_߉*7. A{DQ*JL73UK +Jd$ +E#]ƹɥ(å AcJri[OB~P +blO> #b]SbY ϑ`)s.c EˀXiI]B$ˢd3knoMƸ UYQL i*Nr +&jT\U4 +N th. b/U;PmvlywN?#g), +E^$D҉"e Â}f=mvx`wԯ%p?X!ulY©q;6VX569UKM"+ )|e^Șcl +4A u(
Td`NP܊4
4V\!⎆_%E4q"[KIZWſ,y^>7Jo +))ܤP%R l&ꊤhlaIӦ,-5 8uWkR} }\ h9R1%ho
b[Лyri1ŗcPaQI#&Aw5!
DT'bjN;8&׳D% +VųFOX_q*
*q 98՛9EmS8|UzSx>0 XJQHX"8ӛ9
qJsᾆ_` n糵ЭC2"q {f$-mH&9B2<-#PY - +ﾾ`ݏ߱ JSU;[7`4<ˊ8ho]x h Uյ(th؉dTn5|+ kT56"^8a Z3̢ +mzv8XTAw5aԀzvl0JoG|
F>kgz[:{o_ʶ |^݂|9Kh?Uo䏧sjSh&a3 3_ѿ~r֔N˴p`Δb鬉WbʊxrpNڞG@*5s?\w2W +<R#Cxorw8@FP\2 rc΄~߯Y}d wz\'^*{*sl\>` 1$'UpL +1Ȫt?bJSFPBXb? +1F/c"RM~aUAk{DBJUڴM_2Hx}IM!6%12 +uu\kC]P߇Fn7|OWC_^r%#LuaHGbbԾN[ae + .FďZwhW@fXmק-%{Rfk/ +L* +k" R_Dxۼ',U@芔н +C&.P"UtL) +ְ%8췛G%Ba:Ɖ' +h'jjP$[Pia.Q닧RHqH 9 1W.'[X>k[c칥i('V' oc + +x}'^_\ۿ | yxH&&J~@!gJ]uY"6 ߵCFJ]JEc +nJ\a@-HM-vCt\OktMr7 [ OM$k<ҝ U1aEȧP//m`.P ^ZE( F[B4K84`6N)1Dۅx6spm + lFb& 6a-ax]hBVaiw 3ntrQݝ4k +3V ? Aݡm v%ԐP\}2> + ȡmޔhDAģywn~~)X79"% +pjQ~zKb}G r P҅5h%@lcN/f(l@ҝQTc4 ɸ3b.ɩ*;j6uC"۽V:|,$ mMV× + +endstream +endobj +220 0 obj<</Nums[0 221 0 R]>> +endobj +221 0 obj<</S/D>> +endobj +214 0 obj<</Count 2/Type/Pages/Kids[222 0 R 212 0 R]>> +endobj +223 0 obj <</Type/Metadata/Length 3540/Subtype/XML>>stream +<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> +<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.0-c316 44.253921, Sun Oct 01 2006 17:14:39"> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <rdf:Description rdf:about="" + xmlns:xap="http://ns.adobe.com/xap/1.0/"> + <xap:CreatorTool>PScript5.dll Version 5.2</xap:CreatorTool> + <xap:ModifyDate>2008-01-16T09:35:29+01:00</xap:ModifyDate> + <xap:CreateDate>2008-01-16T09:35:29+01:00</xap:CreateDate> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> + <pdf:Producer>Acrobat Distiller 8.1.0 (Windows)</pdf:Producer> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> + <dc:creator> + <rdf:Seq> + <rdf:li/> + </rdf:Seq> + </dc:creator> + <dc:title> + <rdf:Alt> + <rdf:li xml:lang="x-default"/> + </rdf:Alt> + </dc:title> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"> + <xapMM:DocumentID>uuid:6ef5efc1-11ff-409a-a4ba-0fed66b53f00</xapMM:DocumentID> + <xapMM:InstanceID>uuid:6660edfb-9141-4619-9c31-6f458bf0cd39</xapMM:InstanceID> + </rdf:Description> + </rdf:RDF> +</x:xmpmeta> + + + + + + + + + + + + + + + + + + + + + +<?xpacket end="w"?> +endstream +endobj +224 0 obj<</Type/Catalog/PageLabels 220 0 R/AcroForm<</Fields[3 0 R 5 0 R 7 0 R 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R 21 0 R 23 0 R 25 0 R 27 0 R 29 0 R 31 0 R 33 0 R 35 0 R 37 0 R 39 0 R 41 0 R 43 0 R 45 0 R 47 0 R 49 0 R 51 0 R 53 0 R 55 0 R 57 0 R 59 0 R 61 0 R 63 0 R 65 0 R 67 0 R 69 0 R 71 0 R 73 0 R 75 0 R 77 0 R 79 0 R 81 0 R 83 0 R 85 0 R 87 0 R 91 0 R 95 0 R 98 0 R 100 0 R 102 0 R 104 0 R 106 0 R 108 0 R 110 0 R 112 0 R 114 0 R 116 0 R 118 0 R 120 0 R 122 0 R 124 0 R 126 0 R 128 0 R 130 0 R 132 0 R 134 0 R 136 0 R 138 0 R 140 0 R 142 0 R 144 0 R 146 0 R 148 0 R 150 0 R 153 0 R 156 0 R 158 0 R 160 0 R 162 0 R 164 0 R 166 0 R 168 0 R 170 0 R 172 0 R 174 0 R 176 0 R 178 0 R 180 0 R 182 0 R 184 0 R 186 0 R 188 0 R 190 0 R 192 0 R 194 0 R 196 0 R 198 0 R 200 0 R 202 0 R 204 0 R 206 0 R]/DR<</Font<</TimesNewRomanPSMT 2 0 R/ZaDb 89 0 R>>>>/DA(/Helv 0 Tf 0 g )>>/Pages 214 0 R/Metadata 223 0 R>> +endobj +222 0 obj<</Type/Page/Contents[208 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 209 0 R]/Parent 214 0 R/Resources<</ColorSpace<</Cs6 233 0 R>>/ExtGState<</GS1 215 0 R>>/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/XObject<</Im1 234 0 R>>/Font<</TT2 216 0 R/TT11 235 0 R/TT4 217 0 R/TT8 236 0 R/TT6 218 0 R/TT10 237 0 R/TT13 238 0 R>>>>/CropBox[0 0 595.22 842]/Annots[3 0 R 5 0 R 7 0 R 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R 21 0 R 23 0 R 25 0 R 27 0 R 29 0 R 31 0 R 33 0 R 35 0 R 37 0 R 39 0 R 41 0 R 43 0 R 45 0 R 47 0 R 49 0 R 51 0 R 53 0 R 55 0 R 57 0 R 59 0 R 61 0 R 63 0 R 65 0 R 67 0 R 69 0 R 71 0 R 73 0 R 75 0 R 77 0 R 79 0 R 81 0 R 83 0 R 85 0 R 87 0 R 92 0 R 96 0 R 98 0 R 100 0 R 102 0 R]/MediaBox[0 0 595.22 842]/Rotate 0>> +endobj +239 0 obj<</ColorSpace<</Cs6 233 0 R>>/ExtGState<</GS1 215 0 R>>/ProcSet[/PDF/Text/ImageC]/XObject<</Im1 234 0 R>>/Font<</TT11 235 0 R/TT2 216 0 R/TT4 217 0 R/TT8 236 0 R/TT6 218 0 R/TT10 237 0 R/TT13 238 0 R>>>> +endobj +216 0 obj<</Type/Font/FirstChar 32/FontDescriptor 240 0 R/BaseFont/TimesNewRomanPSMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 32/Widths[250]>> +endobj +217 0 obj<</Type/Font/FirstChar 32/FontDescriptor 241 0 R/BaseFont/Arial-BoldMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 233/Widths[278 0 0 0 0 0 0 238 333 333 0 584 278 333 278 0 556 556 556 556 556 556 556 556 556 556 333 0 0 584 0 0 0 722 722 722 722 667 0 0 0 278 556 0 611 0 722 778 667 0 722 667 611 722 667 0 667 0 0 0 0 0 0 0 0 556 611 556 611 556 333 611 611 278 0 0 278 889 611 611 611 611 389 556 333 611 556 0 556 556 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 278 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 667 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556 0 0 0 0 0 0 0 556 556]>> +endobj +218 0 obj<</Type/Font/FirstChar 32/FontDescriptor 242 0 R/BaseFont/ArialMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 251/Widths[278 0 0 0 0 889 667 191 333 333 0 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 0 0 0 0 0 0 667 0 722 722 667 0 0 0 278 0 0 556 0 0 778 667 0 722 667 611 722 667 0 0 0 0 0 0 0 0 556 0 556 556 500 556 556 278 556 556 222 222 0 222 833 556 556 556 556 333 500 278 556 500 0 500 500 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 667 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556 0 0 0 0 0 0 0 556 556 556 0 0 0 0 0 0 0 0 0 556 0 0 0 0 0 0 556]>> +endobj +236 0 obj<</Type/Font/FirstChar 32/FontDescriptor 243 0 R/BaseFont/Arial-ItalicMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 233/Widths[278 0 0 0 0 0 0 0 333 333 0 0 278 0 278 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 722 0 0 0 0 0 0 0 0 0 0 722 0 0 0 722 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556 0 500 556 556 0 0 0 222 0 0 222 833 556 556 556 0 333 500 278 556 0 0 0 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556]>> +endobj +237 0 obj<</Type/Font/FirstChar 32/FontDescriptor 244 0 R/BaseFont/Arial-BoldItalicMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 32/Widths[278]>> +endobj +233 0 obj[/ICCBased 245 0 R] +endobj +240 0 obj<</Type/FontDescriptor/XHeight -546/CapHeight 656/Flags 34/FontStretch/Normal/Descent -216/FontBBox[-568 -307 2000 1007]/StemV 82/Ascent 891/FontFamily(Times New Roman)/FontWeight 400/FontName/TimesNewRomanPSMT/ItalicAngle 0>> +endobj +241 0 obj<</Type/FontDescriptor/XHeight 515/CapHeight 718/Flags 32/FontStretch/Normal/Descent -211/FontBBox[-628 -376 2000 1010]/StemV 138/Ascent 905/FontFamily(Arial)/FontWeight 700/FontName/Arial-BoldMT/ItalicAngle 0>> +endobj +242 0 obj<</Type/FontDescriptor/XHeight 515/CapHeight 718/Flags 32/FontStretch/Normal/Descent -211/FontBBox[-665 -325 2000 1006]/StemV 88/Ascent 905/FontFamily(Arial)/FontWeight 400/FontName/ArialMT/ItalicAngle 0>> +endobj +215 0 obj<</Type/ExtGState/SA false/OPM 1/op false/OP false/SM 0.02>> +endobj +225 0 obj <</Filter/FlateDecode/Length 1271>>stream +HVKnFϦwl CY` >ɜ#'5rlRlRM92$SOWWzUg?~e3FgY&`ٷQc `4st\l9ٌ>E,~%kXsA*) I0o
lc`a*qW7VNg1>pG'>F1hS ϗlV,%ԉ-MTIBK@|2$:0O-'U-wXКeW pCڮ uASjҌ&u?rHZGeq܁ K" [o])H*k)@4Rhm`8]c(,bǘ$]BG~pK/: + -!$l'݅ORHN/<$5Zl
ۿ2߮nh+(zр7PY =bUʀ C!Ljݨn c1-nu)n1᭐EJ'.B h CgH`i +/ 2ұ3v z*NC 9 hF!y|q g+V ݬc_z|VO b +endstream +endobj +235 0 obj<</Type/Font/DescendantFonts[246 0 R]/BaseFont/ECFBNN+Wingdings-Regular/Subtype/Type0/Encoding/Identity-H>> +endobj +226 0 obj <</Filter/FlateDecode/Length 1192>>stream +HVKo7ﯘ[hEܠ(=XRW +r$mmͿ7j @a3oWd ( #])#(eiBQjs)ԬjZF4l +,y 5ytjݯiURd2m2Y&U2Gn8ֱW(uR:(Kw +` f{Sq5-v?YwϷ \|w`""G]D?=;g3UM S녬rr.X&0Fx#ge>f:@avcП* NUsK;ÀuS-W6r%5[Қ!m*ea//8'>'L\*~T. !n\XiĦ\+Ԃ6- ڿ:6}XF{ 5?qzKfR]*H\q];; +
u6۴˅ƕ\wcZucIp9_9KtɭԔo&HR kq1[ S)ʖy D ߔP*rVV?dQ |s_A-N@4>uHsg!+OΑ3ꌬG6,% Hs
( k-֫.3YW%vjnOӷ
ۦBVbPw,@j11]nh +43Iy\ \dTPk9aQ;'Ǽnv8F{i6f 2 ᦽ,&jNs̠x)nTYۊeV+C} l`ơaQdBB1Cۦj9<M~"_ew1ۃG |x&ޜ6 e:1^s8=6Dbv7-;P-YuaGN?lߴ5b|}2hkG"3yX$9MTv> 5{L#<2q˵yf~XW7y<i> W"(~B`X>mA=v¾ݺiOxF[w{lL.W]x?7Z ڞߩFa͍~]ϓ]w# Fn8/T5>L-N,/iMT=+i ]ּ|H NѦ-IϭY?_jɈ` +endstream +endobj +227 0 obj <</Filter/FlateDecode/Length 1113>>stream +HW͒6 )pQ\:t6lZ[QƖIn} oQdIu&H 1I!+'9ƭq&8]36V94}54>t_0S
p_u;f[ +f-8z qùO+D\
0AEj}xV0p2pƈEiΤrMőz
p4 +J[z7xə ܠ֎
"bwB/J;2aK Gޞ3@#O B2A=Diô }kcܕF~yDO^|$na0S` )& İ 2h6qk5] +<Z||$'mys ]9>y' rTT(&X=-ޘ#
R{`JIը:Lȯ.+"tL c?Vve{~;{"dT:)Ð*h `wTiuXjqA+^n%gh2= c {-S8Tz$fzl8ZKpxWp!y iXE`GH ʏ+X$*Qޜ33k \{i3bG.3'P#/<ώwʍ] L1rgMIHi/p<{ѐn*%A; _VP$[~,ɜ2dFaV(}@:ϛ(lzjQnؐ26$K|J &^,F1j31.[vpU& +GrYXQߐ!R+7?h_[ڬof-3QO-"BL /Ev>Gڞs[|BCfto| W7C%P>23Xg==aWY@Wÿ~rPX prݠs]xƷX0N~3w +endstream +endobj +228 0 obj <</Filter/FlateDecode/Length 873>>stream +HVMO0WT [ J8 *aQew ?όlwQ4`?~j+;Nv҈nUHE)w 0U&(Hi<KG6x wź0dj; Ƽic<JPnw =_#QܶӬ_ +wZB!dmc +
PbZ*^ނB=Qr)r qoݴCɆH>;zp:@#&j)1j%8 9t -H:jX'i۶Mi Ogc\
iUUOINag'\3X^(TBK͏uPݸ:'W N2&U%*Z]W-Um,6OϢK"x`&ZP\T54e hB,7 +Z3$<1㠻q}Ƒw0Ⱥ8 /(s%o}b6 |&t}Eҡ sPiLcBasw?ޒ+;?-1oL"4|i&BnJ"1Z k ȕ~,IO}ҥI<g0V$U:ej!06A $?i#$TJP;*5T32Ih2+gsqU6&&VM ThM ^5`V/ПK>:0[ZeY% kI INPwH}gNۭ<&|?K:5̻)v&n/oG7zq3|moyJ_&d9ҡ&g{>dit&Un>c| +endstream +endobj +229 0 obj <</Filter/FlateDecode/Length 1114>>stream +HVnF+fruzg3l @ h02I\yMR$-g[-]Uu p!d:Ya$ +Vl0tƧ?eK[upb5K}bݥkc~EkE iOCYO$ Do T/}p'}b2L[Ì\އ}R(. F~c"697w2]0芀
MC'Fq+CZ&z~qً=7εb +j
'ԀѪ +!SM[ʈm. Iv͡ +X;Ͷq*Vf%Cүo\apؾ?^w{hj +cG
(}p
! +톝Exl(^;>Γ.̌jA>-MB?ClrB|td1] z>* +ME3Q14(nްob]äMe*}lӎJg*BjJYV" R{"3Im +#0d".Q:IXQ@ B3zA5B,4Sg0b䬻 Ca^LDf!b%^lx |"Tв(4 PpJӢuY.x2/R +endstream +endobj +230 0 obj <</Filter/FlateDecode/Length 811>>stream +Hn0E +nP̒ÇZjW8ibزD
X2ř;3"G殠J2l&Rઉ5"(+~RYA.˙VǕb[1m ע6Ұf Pg Oi S!Jh VFZ&sLyk㒍"A N p]ʼnǒ[a)JRS_ F!Hô>8.j*?仙d{sW|/>7CU zpZTw(AB%NV+n +_:sN?(ěxl2 XC/3ʡh:# @It +endstream +endobj +238 0 obj<</Type/Font/FirstChar 32/FontDescriptor 247 0 R/BaseFont/TimesNewRomanPS-BoldMT/Subtype/TrueType/Encoding/WinAnsiEncoding/LastChar 32/Widths[250]>> +endobj +231 0 obj <</Filter/FlateDecode/Length 967>>stream +HV˒6+pI-GX ^sK*rIoq\뢋vI*6WED\ʖ[%`= fI9"d$[V(BOvĭd7. A)<zs͈Q2F~H UW+6H +h|Kb2?XY҆ \wI*~ք Idv'._[w <
*AR o$K3 +~*,,[ûugQ F - q un?<%\:1M@5o* 1:+\ѹӥyKf,&gf"-&)Ylҥ.$]R)ěj6W4sKF\tc]2A. e CT,kR)n*!22cR6-x,xeզkvm]WTMٲUɞ?& ;%I?Ɖ !2V\Sk]H͵?jHx@&?F|UW:?V?`*w
[KGPdbՔq.<#\A˾)z)*6vu/bٱ-e+k| [ړ }.beyS% _p !pf1)S_F +L_C{@ڣ;8GaDgj :b 0 +endstream +endobj +232 0 obj <</Filter/FlateDecode/Length 1113>>stream +HV͎4)6Bc;\!EN3IG-[Pe{ 窯;
Rh[ht˔5֊q?km{xN 9$5 vm}SpSnHrŝяH#a ?"gԸjUsӊ}[D8F7^Vpℚ/W#q+٠'Wh1B8(έeA[('R2RfK5JɅAc}Jry6i}aЩO=,6p>eE_ yoNAW.Bmg@rIڥW*0j)8r+# +> *),$eO
b)pcn)Wv
KDpk,&֚Dk}}9wP վު%*!g)Q3(}yh+8<]^om,m]_MYh& r5K9M5{V^!IDri(0!O)@ 6kitK +HY[ u]wC羂z }?59zZ j7%̖
X>>ƃSufFkDQ2@Pǡ& *CSR50їoUp k^*$DRD)*r43\2Vk ]_{%
{x2},P ;1_]\ zj"1d{M9ӸCZ27O Kt N>oc9I͕Ib([P`ŝl2%9gJ" + zuݹpsky_* + SXl0zbU*3 vc 8 }!AoWd 1 *45{ n\әjF~)+M\Lh7 8jh + +endstream +endobj +245 0 obj <</Filter/FlateDecode/Length 2598/Alternate/DeviceRGB/N 3>>stream +hޜwTTϽwz0z.0. Qf +3R +tqX)I)B>==
<8Xȉ9<QDhʸ8Qyl£sy0OZk( +@JPA#h'@8
.: ``a!2D!UH 2 dA>P ECqB**Z:]B=h~L2
5p N:| ó@
QC !H,G6 H9R ]H/r Aw( Q(OTJCm@*QGQ -(j MF+
6h/*t :].G7Зw7 Xa<1:L1 +BѠPX-z%8CաzQEoYeYUgdGhMEKNІh(/qZYcI˒%srrr BV;rn; )2*\RV** O(W) VSUVQPNUޯ|QyZ⨒RrVeJjU-S=.Kw'+=5%5O5ZZڼzzz#
C#VL[cFSUW3WY^OWkN[G;L{vNNC]nnm= C/QM}XB?^Jl`i58`0z)oiaCaa(Ϩ腱qn^O&&I&&LeLWvjo22mN6w7hir2βZP,|-Yt[|[XNYiZE[U[
3 F15ziw666&6N.YY^|NݎiWk7bO?d?tsxvlppsJp:ę<b+Z&V]=ν}cyOna/e/W +Wx+}|a{| Z[=O> +llGmnacOkE&EE Y2⫅;K,KhtiN =e²{^-_V^Oo§s]?TWީrjVQ=w}`嚢zԶiו 8>k
+
E
<hؤT 7 E 7--֢o :}$dwZUQ +ۡS+Nuwv}ojȞ)9K8v\ι/]~pq==/]~bS+vWN_zZu}}m?Xo~FM]: ^zmלּ302tw8rx.佤{/gܟ!a#G叕 cșQѾ'AO ƞӇfܧn>[ly邟~_ Y53rW^{7so }x>|쇊z >yz + +endstream +endobj +234 0 obj <</Filter/DCTDecode/Type/XObject/Length 7594/BitsPerComponent 8/Height 83/ColorSpace 233 0 R/Subtype/Image/Width 343>>stream + + $$''$$53335;;;;;;;;;;
%% # # ((%%((22022;;;;;;;;;; + + +Wje^<QusNQe4Yuպ8Çwt\<p
078@IR ,65 nwN[-Ws +8;\V=ush%zL鸽/ +<VwsʄY crCp8s|b8cKzQ7454}Sfx]Nёck4i#붷WkCx1A _Z:v?Jcc +5b:ot.ɢms.Ev>Y}zfK KM cœ ;ոѨ +\Z8ouz K^bK[~ +I$XI%)$IJI$RI$I%)$IJI$RI$I%)%I)%I)%I)%I)B + +endstream +endobj +243 0 obj<</Type/FontDescriptor/XHeight 515/CapHeight 718/Flags 96/FontStretch/Normal/Descent -211/FontBBox[-517 -325 1082 998]/StemV 85.863/Ascent 905/FontFamily(Arial)/FontWeight 400/FontName/Arial-ItalicMT/ItalicAngle -15>> +endobj +244 0 obj<</Type/FontDescriptor/XHeight 515/CapHeight 718/Flags 96/FontStretch/Normal/Descent -211/FontBBox[-560 -376 1157 1000]/StemV 135.84/Ascent 905/FontFamily(Arial)/FontWeight 700/FontName/Arial-BoldItalicMT/ItalicAngle -15>> +endobj +248 0 obj <</Filter/FlateDecode/Length 3228/Length1 6156>>stream +hX
pTu>] $T䘷V? +$
d+,e\W"Ujř8mp +],.v\E ;Z]a}`\93W_=o; :9 wPSL)[YIՠ&.~4"]HطTV\C_a'")Ze]٧ Pgpi5JHݨ Rc['Z-kZzSڔ~ڱ; o]~ZBK/Ii2ijSF ;O:,h %?^4 zy)(MKǕ|uOtJՂ{#q]+f[~vo g
Kv+wt ìtOx&R֯<'%r};LJZʦTZNpp֯[zUʒBϊ/,|A-e.c͟)o .ZpAjӡk"KQ] 4̂)m+cwui@U=41 <wΓhSQsUqH;`Ӗݒk + * +lLX.Ti-cf-ctr-O'5R( [Ur + M~Q9ΨjgFkbJ!}1?0'%| & s% + IeG> kw=qo$aҎ^י%s3?Zh]<w Tuh%vx ӣ ӒBȜ͒,w!!V3G4Z dw<ESe=p:ځF(n#qpׄ5?* Q #lz<hZdVnutìC˨ޏI
%h%vK}
~{lPsx& +˅YK 7k t8%!mss7,3ێgJ~_JlM5 DmT'L_Hw'FlI3L@jJ@<kL yOd"cNtru,!gpjrMiD[F#$vH9 Ј>A#Ј5WaUՇ.nA[1Q =fCwYmн5^=Hn
tgӐZCCk)$ջNE,!~ i_x5>VQ̿Ɯ :,wk7`<<o3
8"kֹGm.?YM]ғː~kl ݡO7 +HԢo7QCff/ٶ +ih6;aoy=k66mYͼ6+&Ll3f{; ^^ +[ +0 + +endstream +endobj +249 0 obj<</Type/FontDescriptor/CapHeight 0/Flags 4/FontStretch/Normal/Descent -210/FontBBox[0 -211 1359 899]/FontFile2 248 0 R/StemV 0/Ascent 898/FontFamily(Wingdings)/FontWeight 400/FontName/ECFBNN+Wingdings-Regular/ItalicAngle 0>> +endobj +246 0 obj<</Type/Font/DW 1000/CIDSystemInfo<</Ordering(Identity)/Supplement 0/Registry(Adobe)>>/FontDescriptor 249 0 R/CIDToGIDMap/Identity/BaseFont/ECFBNN+Wingdings-Regular/Subtype/CIDFontType2/W[134[891]]>> +endobj +247 0 obj<</Type/FontDescriptor/XHeight -546/CapHeight 656/Flags 34/FontStretch/Normal/Descent -216/FontBBox[-558 -307 2000 1026]/StemV 136/Ascent 891/FontFamily(Times New Roman)/FontWeight 700/FontName/TimesNewRomanPS-BoldMT/ItalicAngle 0>> +endobj +250 0 obj<</CreationDate(D:20080116093529+01'00')/Title()/Author()/Producer(Acrobat Distiller 8.1.0 \(Windows\))/Creator(PScript5.dll Version 5.2)/ModDate(D:20080116093529+01'00')>> +endobj +xref +0 251 +0000000000 65535 f +0000041729 00000 n +0000023106 00000 n +0000000015 00000 n +0000032719 00000 n +0000000234 00000 n +0000028438 00000 n +0000000461 00000 n +0000042501 00000 n +0000000690 00000 n +0000034521 00000 n +0000000917 00000 n +0000048470 00000 n +0000001145 00000 n +0000038900 00000 n +0000001374 00000 n +0000049243 00000 n +0000001603 00000 n +0000045593 00000 n +0000001832 00000 n +0000029680 00000 n +0000002058 00000 n +0000025303 00000 n +0000002287 00000 n +0000028181 00000 n +0000002516 00000 n +0000027666 00000 n +0000002744 00000 n +0000047958 00000 n +0000002973 00000 n +0000028695 00000 n +0000003202 00000 n +0000033748 00000 n +0000003430 00000 n +0000033234 00000 n +0000003658 00000 n +0000044304 00000 n +0000003887 00000 n +0000030920 00000 n +0000004116 00000 n +0000031950 00000 n +0000004344 00000 n +0000037614 00000 n +0000004570 00000 n +0000024275 00000 n +0000004799 00000 n +0000031693 00000 n +0000005027 00000 n +0000043016 00000 n +0000005254 00000 n +0000025817 00000 n +0000005483 00000 n +0000045850 00000 n +0000005711 00000 n +0000042244 00000 n +0000005937 00000 n +0000047701 00000 n +0000006166 00000 n +0000046106 00000 n +0000006395 00000 n +0000033491 00000 n +0000006624 00000 n +0000038643 00000 n +0000006853 00000 n +0000047444 00000 n +0000007082 00000 n +0000025560 00000 n +0000007311 00000 n +0000037871 00000 n +0000007540 00000 n +0000035294 00000 n +0000007768 00000 n +0000039672 00000 n +0000007997 00000 n +0000024790 00000 n +0000008224 00000 n +0000027409 00000 n +0000008452 00000 n +0000032462 00000 n +0000008678 00000 n +0000030405 00000 n +0000008905 00000 n +0000025047 00000 n +0000009134 00000 n +0000037358 00000 n +0000009361 00000 n +0000040956 00000 n +0000009588 00000 n +0000027107 00000 n +0000024209 00000 n +0000030194 00000 n +0000009813 00000 n +0000009870 00000 n +0000046879 00000 n +0000029211 00000 n +0000010101 00000 n +0000010158 00000 n +0000040700 00000 n +0000010392 00000 n +0000029422 00000 n +0000010619 00000 n +0000026333 00000 n +0000010840 00000 n +0000040442 00000 n +0000011063 00000 n +0000029936 00000 n +0000011294 00000 n +0000040184 00000 n +0000011525 00000 n +0000043273 00000 n +0000011756 00000 n +0000049758 00000 n +0000011987 00000 n +0000031435 00000 n +0000012217 00000 n +0000038127 00000 n +0000012448 00000 n +0000036067 00000 n +0000012679 00000 n +0000034778 00000 n +0000012909 00000 n +0000046621 00000 n +0000013139 00000 n +0000044561 00000 n +0000013370 00000 n +0000031177 00000 n +0000013600 00000 n +0000039414 00000 n +0000013831 00000 n +0000044046 00000 n +0000014062 00000 n +0000049500 00000 n +0000014293 00000 n +0000041471 00000 n +0000014525 00000 n +0000047187 00000 n +0000014756 00000 n +0000048727 00000 n +0000014986 00000 n +0000024532 00000 n +0000015217 00000 n +0000035551 00000 n +0000015448 00000 n +0000050015 00000 n +0000015679 00000 n +0000036325 00000 n +0000015910 00000 n +0000048215 00000 n +0000016141 00000 n +0000043531 00000 n +0000016366 00000 n +0000036841 00000 n +0000039926 00000 n +0000016597 00000 n +0000016669 00000 n +0000016895 00000 n +0000017121 00000 n +0000036583 00000 n +0000017171 00000 n +0000032976 00000 n +0000017401 00000 n +0000030662 00000 n +0000017632 00000 n +0000035036 00000 n +0000017863 00000 n +0000034005 00000 n +0000018094 00000 n +0000026849 00000 n +0000018324 00000 n +0000043789 00000 n +0000018551 00000 n +0000046363 00000 n +0000018783 00000 n +0000038385 00000 n +0000019014 00000 n +0000045077 00000 n +0000019245 00000 n +0000032207 00000 n +0000019475 00000 n +0000034263 00000 n +0000019704 00000 n +0000041213 00000 n +0000019934 00000 n +0000042758 00000 n +0000020164 00000 n +0000044819 00000 n +0000020394 00000 n +0000048985 00000 n +0000020624 00000 n +0000041986 00000 n +0000020854 00000 n +0000027923 00000 n +0000021084 00000 n +0000026591 00000 n +0000021314 00000 n +0000039156 00000 n +0000021544 00000 n +0000035809 00000 n +0000021774 00000 n +0000037099 00000 n +0000022004 00000 n +0000026074 00000 n +0000022238 00000 n +0000028952 00000 n +0000022468 00000 n +0000045334 00000 n +0000022705 00000 n +0000022938 00000 n +0000050272 00000 n +0000050354 00000 n +0000050437 00000 n +0000050519 00000 n +0000050602 00000 n +0000051397 00000 n +0000057138 00000 n +0000065787 00000 n +0000062724 00000 n +0000062884 00000 n +0000063570 00000 n +0000051286 00000 n +0000057076 00000 n +0000057113 00000 n +0000061736 00000 n +0000057200 00000 n +0000060817 00000 n +0000065864 00000 n +0000067329 00000 n +0000068591 00000 n +0000069774 00000 n +0000070716 00000 n +0000071900 00000 n +0000072945 00000 n +0000073981 00000 n +0000065058 00000 n +0000077856 00000 n +0000067205 00000 n +0000064291 00000 n +0000064897 00000 n +0000072780 00000 n +0000062504 00000 n +0000065094 00000 n +0000065337 00000 n +0000065565 00000 n +0000085603 00000 n +0000085837 00000 n +0000075164 00000 n +0000089628 00000 n +0000089844 00000 n +0000086076 00000 n +0000089387 00000 n +0000090093 00000 n +trailer +<</Root 224 0 R/Size 251/Info 250 0 R>> +startxref +90282 +208 0 obj +<< +/Length 26598 +>> +stream +q Q q /GS1 gs BT /TT2 1 Tf 7.98 0 0 7.98 42.54 820.28 Tm 0 g 0 Tc 0 Tw ( ) Tj /TT4 1 Tf 7.02 0 0 7.02 233.94 812.78 Tm ( ) Tj /TT6 1 Tf 7.5 0 0 7.5 378.48 812.54 Tm 0.003 Tc -0.0008 Tw [ (R) 5.2 () -0.8 (serv) 15 ( l'administration ) ] TJ /TT4 1 Tf 9 0 0 9 233.94 799.7 Tm 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 7.5 0 0 7.5 272.82 798.5 Tm 0.002 Tc 0.0002 Tw (Date ) Tj 0 -1.144 TD 0.0032 Tc 0 Tw (d'entre ) Tj 20.32 0.568 TD 0.0024 Tc (Comptabilis ) Tj ET 268.98 808.34 0.72 0.77997 re f 268.98 808.4 152.4 0.72003 re f 421.38 808.34 0.72 0.77997 re f 422.1 808.4 151.68 0.72003 re f 573.78 808.34 0.72003 0.77997 re f 573.78 808.4 0.72003 0.72003 re f 268.98 785.3 0.72 23.04 re f 421.38 785.3 0.72 23.04 re f 573.78 785.3 0.72003 23.04 re f 268.98 784.58 0.72 0.71997 re f 268.98 784.58 305.52 0.71997 re f 573.78 784.58 0.72003 0.71997 re f BT 7.98 0 0 7.98 202.02 772.4 Tm 0 Tc ( ) Tj /TT4 1 Tf 9.9549 -0.3834 TD -0.0002 Tc 0.0006 Tw [ (N matricule ) -3368.4 (TVA) ] TJ /TT6 1 Tf 11.4586 0 TD 0 Tc 0 Tw ( ) Tj 2.5639 0.015 TD 7.4139 Tc [ ( ) -7.5 ( ) ] TJ ET 268.56 779.78 1.5 1.5 re f 268.56 779.78 306.3 1.5 re f 573.36 779.78 1.5 1.5 re f 268.56 764.66 1.5 15.12 re f 339.48 764.66 1.5 15.12 re f 389.04 764.66 1.5 15.12 re f 573.36 764.66 1.5 15.12 re f q 164.743 0 0 39.42 31.86 780.08 cm /Im1 Do Q BT /TT4 1 Tf 7.02 0 0 7.02 196.2 780.08 Tm 0 Tc ( ) Tj 9 0 0 9 78 765.44 Tm -0.0015 Tc 0.0037 Tw [ (Recette Cen) -4 (t) -1.8 (rale ) ] TJ 1.7133 -1.1867 TD -0.001 Tc 0.0032 Tw (B.P. 1004 ) Tj -2.8067 -1.1867 TD -0.0001 Tc 0.0023 Tw (L - 1010 Luxembourg ) Tj 0.0133 -1.1867 TD -0.001 Tc 0.0032 Tw [ (T) -3.5 (e) 1.8 (l.: \(+) -3.7 (352\) 44 905 - 1 ) ] TJ -2.68 -1.52 TD -0.0022 Tc 0.0044 Tw [ (IBA) 26.6 (N) 0 ( L) -4.7 (U) 0 (31 1111 0114 1970 0000 ) ] TJ 2.5 -1.1867 TD 0.0007 Tc 0.0015 Tw [ (Code) 3.5 ( BIC: CCPLLULL ) ] TJ 7.5 0 0 7.5 113.4 699.8 Tm 0 Tc 0 Tw ( ) Tj 10.02 0 0 10.02 272.82 741.62 Tm 0.0004 Tc -0.0028 Tw (TAXE SUR LA VALEUR AJOUTE) Tj 9 0 0 9 433.68 741.62 Tm 0.0022 Tc 0 Tw ( ) Tj /TT6 1 Tf 0.84 0 TD -0.0017 Tc 0.0039 Tw (\(Loi du 12.02.1979\) ) Tj /TT4 1 Tf -18.7133 -0.6 TD 0.0022 Tc 0 Tw ( ) Tj 10.02 0 0 10.02 272.82 725.9 Tm -0.0002 Tc -0.0022 Tw ET 268.56 763.16 1.5 1.5 re f 268.56 763.16 306.3 1.5 re f 573.36 763.16 1.5 1.5 re f BT /TT8 1 Tf 7.02 0 0 7.02 272.82 690.8 Tm 0.0004 Tc 0.0038 Tw (\(Nom, resp. dnomination sociale\) ) Tj ET 27.96 697.34 0.72 0.77997 re f 27.96 697.4 170.16 0.72003 re f 198.12 697.34 0.72 0.77997 re f 198.12 697.4 0.72 0.72003 re f 0.602 g 268.98 697.64 304.8 0.48004 re f 0 g 27.96 666.8 0.72 30.54 re f 198.12 666.8 0.72 30.54 re f BT /TT4 1 Tf 7.98 0 0 7.98 46.62 683 Tm 0 Tc 0.0004 Tw (Dlai lgal) Tj /TT6 1 Tf 4.9474 0 TD 0.0006 Tc -0.0002 Tw (: dpt de la dclaration et ) Tj -4.2256 -1.1504 TD (paiement de la taxe au plus tard le ) Tj /TT4 1 Tf 10.02 0 0 10.02 70.08 656.48 Tm 0.0003 Tc -0.0027 Tw /TT6 1 Tf 7.98 0 0 7.98 202.02 689.96 Tm 0 Tc 0 Tw ( ) Tj /TT8 1 Tf 7.02 0 0 7.02 272.82 659.78 Tm -0.0002 Tc 0.0044 Tw (\(Rue, numro\) ) Tj ET 27.96 666.32 0.72 0.47998 re f 198.12 666.32 0.72 0.47998 re f 0.602 g 268.98 666.32 304.8 0.47998 re f 0 g 27.96 646.76 0.72 19.56 re f 198.12 646.76 0.72 19.56 re f 27.96 646.04 0.72 0.72003 re f 27.96 646.04 170.88 0.72003 re f 198.12 646.04 0.72 0.72003 re f BT /TT4 1 Tf 9 0 0 9 31.86 628.04 Tm 0.0008 Tc 0.0014 Tw (Bureau d'imposition:) Tj /TT10 1 Tf 7.02 0 0 7.02 121.62 628.04 Tm 0 Tc 0 Tw ( ) Tj /TT6 1 Tf 7.98 0 0 7.98 202.02 634.16 Tm ( ) Tj /TT8 1 Tf 7.02 0 0 7.02 272.82 635 Tm 0.0008 Tc 0.0034 Tw (\(Code pays, code postal et lieu\)) Tj /TT6 1 Tf 14.1026 0 TD 0 Tc 0 Tw ( ) Tj ET 28.08 641.54 0.48001 0.48004 re f 28.08 641.54 170.52 0.48004 re f 198.24 641.54 0.48 0.48004 re f 198.24 641.54 0.48 0.48004 re f 0.602 g 268.98 641.54 304.8 0.48004 re f 0 g 28.08 622.58 0.48001 18.96 re f 28.08 622.58 170.16 0.47998 re f 198.24 622.58 0.48 18.96 re f 198.24 622.58 0.48 0.47998 re f BT /TT2 1 Tf 7.98 0 0 7.98 42.54 619.34 Tm ( ) Tj 0 -0.5038 TD ( ) Tj /TT4 1 Tf 7.02 0 0 7.02 62.94 615.32 Tm ( ) Tj 9 0 0 9 33.96 603.5 Tm -0.0007 Tc 0.0029 Tw [ (I. ) -500 (Calcu) -3.2 (l) -2.9 ( d) -3.2 (e) 2.1 ( la taxe p) -3.2 (a) 2.1 (y) 8.8 (e) 2.1 (r ) ] TJ 7.5 0 0 7.5 345.42 604.04 Tm 0.0026 Tc -0.0004 Tw [ (B) 4.8 (ase d) 5.4 ('imp) 5.4 (o) 5.4 (s) -1.2 (itio) 5.4 (n) 5.4 ( ) ] TJ /TT6 1 Tf 8.864 0 TD 0.0036 Tc -0.0014 Tw [ (\(hors T) 6.4 (V) 6.6 (A) 6.6 (\)) ] TJ /TT4 1 Tf 4.848 0 TD -0.0188 Tc 7.997 Tw [ ( TV) -15.8 (A) 23.4 ( ) ] TJ ET 27.96 613.76 0.72 0.77997 re f 27.96 613.82 545.82 0.71997 re f 573.78 613.76 0.72003 0.77997 re f 573.78 613.82 0.72003 0.71997 re f 27.96 599.72 0.72 14.04 re f 573.78 599.72 0.72003 14.04 re f BT 7.5 0 0 7.5 32.7 582.62 Tm 0.0031 Tc -0.0009 Tw [ (1. ) -656 (C) 5.3 (h) 5.9 (iffre d) 5.9 (') 0.9 (affaires g) 5.9 (l) 0.9 (o) 5.9 (b) 5.9 (a) -0.7 (l:) ] TJ /TT6 1 Tf 4.98 0 0 4.98 132.24 586.1 Tm 0 Tc 0 Tw ( ) Tj 41.0121 -0.012 TD ( ) Tj 7.98 0 0 7.98 450 582.74 Tm 3.2936 Tc [ ( ) 2691.7 ( ) ] TJ ET 27.96 599 0.72 0.72003 re f 27.96 599 546.54 0.72003 re f 573.78 599 0.72003 0.72003 re f BT 7.5 0 0 7.5 39 568.58 Tm 0.0034 Tc 2.5988 Tw [ ( 1\) ) ] TJ 4.704 0.048 TD 0.0033 Tc -0.0011 Tw [ (V) 6.3 (entes ) ] TJ /TT11 1 Tf 3.688 0 TD 0 Tc 0 Tw ( +endstream +endobj +209 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +225 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +226 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +227 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +228 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +229 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +230 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +231 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +232 0 obj +<< +/Length 0 +>> +stream + +endstream +endobj +xref +208 2 +0000095377 00000 n +0000122031 00000 n +225 8 +0000122083 00000 n +0000122135 00000 n +0000122187 00000 n +0000122239 00000 n +0000122291 00000 n +0000122343 00000 n +0000122395 00000 n +0000122447 00000 n +trailer +<< +/Root 224 0 R +/Size 250 +/Info 250 0 R +/Prev 90282 +>> +startxref +122499 +%%EOF diff --git a/addons/l10n_lu/wizard/__init__.py b/addons/l10n_lu/wizard/__init__.py new file mode 100644 index 00000000000..0ff0d08776c --- /dev/null +++ b/addons/l10n_lu/wizard/__init__.py @@ -0,0 +1 @@ +import print_vat diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py new file mode 100644 index 00000000000..200fa813218 --- /dev/null +++ b/addons/l10n_lu/wizard/pdf_ext.py @@ -0,0 +1,103 @@ +# -*- encoding: utf-8 -*- +# 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. +""" Copyright (c) 2003-2007 LOGILAB S.A. (Paris, FRANCE). + http://www.logilab.fr/ -- mailto:contact@logilab.fr + +manipulate pdf and fdf files. pdftk recommended. + +Notes regarding pdftk, pdf forms and fdf files (form definition file) +fields names can be extracted with: + pdftk orig.pdf generate_fdf output truc.fdf +to merge fdf and pdf: + pdftk orig.pdf fill_form test.fdf output result.pdf [flatten] +without flatten, one could further edit the resulting form. +with flatten, everything is turned into text. +""" + +import os +import tools + +HEAD="""%FDF-1.2 +%\xE2\xE3\xCF\xD3 +1 0 obj +<< +/FDF +<< +/Fields [ +""" + +TAIL="""] +>> +>> +endobj +trailer + +<< +/Root 1 0 R +>> +%%EOF +""" + +def output_field( f ): + return "\xfe\xff" + "".join( [ "\x00"+c for c in f ] ) + +def extract_keys(lines): + keys = [] + for line in lines: + if line.startswith('/V'): + pass #print 'value',line + elif line.startswith('/T'): + key = line[7:-2] + key = ''.join(key.split('\x00')) + keys.append( key ) + return keys + +def write_field(out, key, value): + out.write("<<\n") + if value: + out.write("/V (%s)\n" %value) + else: + out.write("/V /\n") + out.write("/T (%s)\n" % output_field(key) ) + out.write(">> \n") + +def write_fields(out, fields): + out.write(HEAD) + for key in fields: + value = fields[key] + write_field(out, key, value) +# write_field(out, key+"a", value) # pour copie-carbone sur autres pages + out.write(TAIL) + +def extract_keys_from_pdf(filename): + # what about using 'pdftk filename dump_data_fields' and parsing the output ? + os.system('pdftk %s generate_fdf output /tmp/toto.fdf' % filename) + lines = file('/tmp/toto.fdf').readlines() + return extract_keys(lines) + + +def fill_pdf(infile, outfile, fields): + write_fields(file('/tmp/toto.fdf', 'w'), fields) + os.system('pdftk %s fill_form /tmp/toto.fdf output %s flatten' % (infile, outfile)) + +def testfill_pdf(infile, outfile): + keys = extract_keys_from_pdf(infile) + fields = [] + for key in keys: + fields.append( (key, key, '') ) + fill_pdf(infile, outfile, fields) + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py new file mode 100644 index 00000000000..fbd9c29bb41 --- /dev/null +++ b/addons/l10n_lu/wizard/print_vat.py @@ -0,0 +1,93 @@ +# -*- encoding: utf-8 -*- +#Copyright (c) Vincent Cardon <vincent.cardon@tranquil-it-systems.fr> +# Denis Cardon <denis.cardon@tranquilitsystems.com> and Emmanuel RICHARD. +#Ingenieur fondateur +#Tranquil IT Systems + + +import wizard +import time +import datetime +import pooler +import sys +from mx.DateTime import * +import tools +from report.render import render +from report.interface import report_int +import os +import pdf_ext + +_tax_form = """<?xml version="1.0"?> +<form string="VAT Legal Declaration"> + <field name="tax_code_id"/> + <field name="period_id"/> +</form>""" + +_tax_fields = { + 'tax_code_id': { + 'string': 'Company', + 'type': 'many2one', + 'relation': 'account.tax.code', + 'required': True, + 'domain': [('parent_id','=',False)]}, + 'period_id': { + 'string':'Period', + 'type': 'many2one', + 'relation': 'account.period', + 'required':True + } +} + +class external_pdf(render): + def __init__(self, pdf): + render.__init__(self) + self.pdf = pdf + self.output_type='pdf' + def _render(self): + return self.pdf + + +class report_custom(report_int): + def create(self, cr, uid, ids, datas, context={}): + print datas, ids, uid + + pool = pooler.get_pool(cr.dbname) + + taxobj = pool.get('account.tax.code') + code_ids = taxobj.search(cr, uid, [('parent_id','child_of',[datas['form']['tax_code_id']])]) + result = {} + for t in taxobj.browse(cr, uid, code_ids, {'period_id': datas['form']['period_id']}): + if t.code: + result['case_'+str(t.code)] = '%.2f' % (t.sum_period or 0.0, ) + + user = pool.get('res.users').browse(cr, uid, uid, context) + + # Not Clean, to be changed + partner = user.company_id.partner_id + result['info_name'] = user.company_id.name + result['info_vatnum'] = partner.vat + if partner.address: + result['info_address'] = partner.address[0].street + result['info_address2'] = str(partner.address[0].zip) + ' ' + str(partner.address[0].city) + + pdf_ext.fill_pdf('addons/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result) + self.obj = external_pdf(file('/tmp/output.pdf').read()) + self.obj.render() + return (self.obj.pdf, 'pdf') + +report_custom('report.l10n_lu.tax.report.print') + + +class wizard_report(wizard.interface): + states = { + 'init': { + 'actions': [], + 'result': {'type':'form', 'arch':_tax_form, 'fields':_tax_fields, 'state':[('end','Cancel'),('pdf','Print VAT Declaration')]}, + }, + 'pdf': { + 'actions': [], + 'result': {'type':'print', 'report': 'l10n_lu.tax.report.print', 'state':'end'}, + }, + } +wizard_report('l10n_lu.tax.report.wizard') + diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py new file mode 100644 index 00000000000..949e893c0f0 --- /dev/null +++ b/addons/lunch/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +import lunch +import wizard +import report +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py new file mode 100644 index 00000000000..46da1f5e13f --- /dev/null +++ b/addons/lunch/__terp__.py @@ -0,0 +1,15 @@ +# -*- encoding: utf-8 -*- +{ + "name": "Lunch Module", + "author": "Tiny", + "version": "0.1", + "depends": ["base", "process", "hr"], + "init_xml": [], + "update_xml": ['lunch_wizard.xml', 'lunch_view.xml', 'lunch_report.xml', + 'process/lunch_process.xml' + ], + "demo_xml": ['lunch_demo.xml'], + "installable": True, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py new file mode 100644 index 00000000000..167a075d95b --- /dev/null +++ b/addons/lunch/lunch.py @@ -0,0 +1,171 @@ +# -*- encoding: utf-8 -*- +from osv import osv, fields +import time + +class lunch_category(osv.osv): + _name = 'lunch.category' + _description = "Category" + + _columns = { + 'name': fields.char('Name', required=True, size=50), + } + + _order = 'name' + +lunch_category() + +class lunch_product(osv.osv): + _name = 'lunch.product' + + def _category_name_get(self, cr, uid, context={}): + obj = self.pool.get('lunch.category') + cat_ids= obj.search(cr,uid,[]) + res = obj.read(cr,uid,cat_ids,['name', 'category']) + return [(str(r['id']), r['name']) for r in res]+ [('0','')] + + _columns = { + 'name': fields.char('Name', size=50, required=True), + 'category_id': fields.selection(_category_name_get, 'Category', size=32), + 'description': fields.char('Description', size=128, required=False), + 'price': fields.float('Price', digits=(16,2)), + 'active': fields.boolean('Active'), + } + + _defaults = { + 'active': lambda *a : True, + } + +lunch_product() + +class lunch_cashbox(osv.osv): + _name='lunch.cashbox' + + def amount_available(self, cr, uid, ids, field_name, arg, context): + cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box") + r = dict(cr.fetchall()) + for i in ids : + r.setdefault(i,0) + return r + + _columns={ + 'manager':fields.many2one('res.users','Manager'), + 'name':fields.char('Name',size=30,required=True, unique = True), + 'sum_remain': fields.function(amount_available, method=True, string='Remained Total'), + } + +lunch_cashbox() + + + + +class lunch_cashmove(osv.osv): + _name= 'lunch.cashmove' + + _columns={ + 'name': fields.char('Name',size=128), + 'user_cashmove': fields.many2one('res.users','User Name', required=True), + 'amount': fields.float('Amount', digits=(16,2)), + 'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True), + 'active':fields.boolean('Active'), + 'create_date': fields.datetime('Created date', readonly=True), + } + + _defaults={ + 'active': lambda *a: True, + } + +lunch_cashmove() + + + +class lunch_order(osv.osv): + _name='lunch.order' + _rec_name= "user_id" + + def _price_get(self, cr, uid, ids, name, args, context=None): + res = {} + for o in self.browse(cr, uid, ids): + res[o.id] = o.product.price + return res + + _columns={ + 'user_id': fields.many2one('res.users','User Name', required=True, + readonly=True, states={'draft':[('readonly',False)]}), + 'product':fields.many2one('lunch.product','Product', required=True, + readonly=True, states={'draft':[('readonly',False)]}, change_default=True), + 'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}), + 'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True ), + 'descript':fields.char('Description Order', readonly=True, size=50, + states={'draft':[('readonly',False)]}), + 'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),], + 'State', readonly=True, select=True), + 'price': fields.function(_price_get, method=True, string="Price"), + } + + _defaults={ + 'user_id': lambda self,cr,uid,context: uid, + 'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'), + 'state': lambda self,cr,uid,context: 'draft', + } + + def confirm(self,cr,uid,ids,box,context): + cashmove_ref= self.pool.get('lunch.cashmove') + for order in self.browse(cr,uid,ids): + if order.state == 'confirmed': + continue + new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order', + 'amount':-order.product.price, + 'user_cashmove':order.user_id.id, + 'box':box, + 'active':True, + }) + self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'}) + return {} + + def lunch_order_cancel(self,cr,uid,ids,context): + orders= self.browse(cr,uid,ids) + for order in orders: + if not order.cashmove: + continue + self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id]) + self.write(cr,uid,ids,{'state':'draft'}) + return {} + + def onchange_product(self, cr, uid, ids, product): + if not product: + return {'value': {'price': 0.0}} + price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price'] + return {'value': {'price': price}} + +lunch_order() + +class report_lunch_amount(osv.osv): + _name='report.lunch.amount' + _description = "Amount available by user and box" + _auto = False + _rec_name= "user" + + _columns = { + 'user_id': fields.many2one('res.users','User Name',readonly=True), + 'amount': fields.float('Amount', readonly=True, digits=(16,2)), + 'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True), + } + + def init(self, cr): + cr.execute(""" + create or replace view report_lunch_amount as ( + select + min(lc.id) as id, + lc.user_cashmove as user_id, + sum(amount) as amount, + lc.box as box + from + lunch_cashmove lc + where + active = 't' + group by lc.user_cashmove, lc.box + )""") + +report_lunch_amount() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml new file mode 100644 index 00000000000..e26680f5253 --- /dev/null +++ b/addons/lunch/lunch_demo.xml @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<terp> + <data noupdate="1"> + + <record model="lunch.category" id="categ_sandwich"> + <field name="name">Sandwich</field> + </record> + + <record model="lunch.product" id="product_club"> + <field name="name">Club</field> + <field name="category_id" eval="str(ref('categ_sandwich'))"/> + <field name="price">2.75</field> + </record> + + <record model="lunch.cashbox" id="cashbox_cashbox"> + <field name="name">Cashbox</field> + <field name="manager" ref="base.user_admin"/> + </record> + </data> +</terp> diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml new file mode 100644 index 00000000000..3cdd8cb418c --- /dev/null +++ b/addons/lunch/lunch_report.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<terp> +<data> + <report + id="report_lunch_order" + string="Print Order" + model="lunch.order" + name="lunch.order" + rml="lunch/report/order.rml" + auto="False" + /> + +</data> +</terp> diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml new file mode 100644 index 00000000000..5862089067a --- /dev/null +++ b/addons/lunch/lunch_view.xml @@ -0,0 +1,232 @@ +<?xml version="1.0"?> +<openerp> + <data> + + <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/> + <menuitem name="Lunch" parent="menu_tools" id="menu_lunch" /> + <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_category_root" sequence="1"/> + + <record model="ir.ui.view" id="view_lunch_order_form"> + <field name="name">Order</field> + <field name="model">lunch.order</field> + <field name="arch" type="xml"> + <form string="Order"> + <group colspan="2" col="4"> + <field name="user_id" select="1"/> + <field name="date" select="1"/> + <field name="product" select="1" on_change="onchange_product(product)"/> + <field name="price"/> + <field name="descript"/> + <field name="cashmove"/> + <field name="state" select="2"/> + </group> + </form> + </field> + </record> + + <record model="ir.ui.view" id="view_lunch_order_tree"> + <field name="name">Order</field> + <field name="model">lunch.order</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Order"> + <field name="user_id"/> + <field name="product"/> + <field name="date"/> + <field name="cashmove"/> + <field name="state"/> + <field name="descript"/> + <field name="price" sum="Total price"/> + </tree> + </field> + </record> + + + + <record model="ir.actions.act_window" id="action_lunch_order_form"> + <field name="name">Make order</field> + <field name="res_model">lunch.order</field> + <field name="view_mode">form,tree</field> + </record> + <menuitem name="Make order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/> + + <record model="ir.actions.act_window" id="action_lunch_order_day_form"> + <field name="name"> Order of the day</field> + <field name="res_model">lunch.order</field> + <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field> + + </record> + <menuitem name="Order of the day" parent="menu_lunch_order_form" id="menu_lunch_order_day_form" action="action_lunch_order_day_form"/> + + <record model="ir.ui.view" id="view_lunch_cashbox_form"> + <field name="name">CashBox</field> + <field name="model">lunch.cashbox</field> + <field name="arch" type="xml"> + <form string="CashBox"> + <field name="name" select="1"/> + <field name="manager" select="1"/> + </form> + </field> + </record> + + <record model="ir.ui.view" id="view_lunch_cashbox_tree"> + <field name="name">CashBox</field> + <field name="model">lunch.cashbox</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="CashBox" colors="red:sum_remain<=0"> + <field name="name" select="1"/> + <field name="manager" select="1"/> + <field name="sum_remain" select="1"/> + </tree> + </field> + </record> + + <record model="ir.actions.act_window" id="action_lunch_cashbox_form"> + <field name="name"> CashBox </field> + <field name="res_model">lunch.cashbox</field> + </record> + <menuitem name="CashBox" parent="menu_lunch_category_root" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/> + + <record model="ir.ui.view" id="view_lunch_cashmove_form"> + <field name="name">CashMove</field> + <field name="model">lunch.cashmove</field> + <field name="arch" type="xml"> + <form string="CashMove"> + <field name="name" select="1"/> + <field name="user_cashmove" select="1"/> + <field name="amount" select="2"/> + <field name="box" select="1"/> + <field name="create_date" select="1"/> + </form> + </field> + </record> + + <record model="ir.ui.view" id="view_lunch_cashmove_tree"> + <field name="name">CashMove</field> + <field name="model">lunch.cashmove</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="CashMove" editable="top"> + <field name="name" select="1" required="1"/> + <field name="user_cashmove" select="1"/> + <field name="amount" select="1" sum="Total amount"/> + <field name="box" select="1"/> + <field name="create_date"/> + </tree> + </field> + </record> + + <record model="ir.actions.act_window" id="action_lunch_cashmove_form"> + <field name="name">CashMove</field> + <field name="res_model">lunch.cashmove</field> + </record> + + <menuitem name="Cash Moves" parent="menu_lunch" id="menu_lunch_cashmove_form" action="action_lunch_cashmove_form"/> + + <record model="ir.ui.view" id="view_lunch_category_form"> + <field name="name"> Category of product </field> + <field name="model">lunch.category</field> + <field name="arch" type="xml"> + <form string="Category"> + <separator string="Category related to Products" colspan="4"/> + <field name="name" select="1"/> + </form> + </field> + </record> + + <record model="ir.ui.view" id="view_lunch_category_tree"> + <field name="name">Category</field> + <field name="model">lunch.category</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Order"> + <field name="name" select="1"/> + </tree> + </field> + </record> + + + <record model="ir.actions.act_window" id="action_lunch_category_form"> + <field name="name"> Category of product </field> + <field name="res_model">lunch.category</field> + </record> + + <record model="ir.ui.view" id="view_lunch_product_form"> + <field name="name">Products</field> + <field name="type">form</field> + <field name="model">lunch.product</field> + <field name="arch" type="xml"> + <form string="Products"> + <field name="name" select="1"/> + <field name="category_id" select="1"/> + <field name="description" select="1"/> + <field name="price" select="1"/> + <field name="active" select="1"/> + </form> + </field> + </record> + + + <record model="ir.ui.view" id="view_lunch_product_tree"> + <field name="name">Products</field> + <field name="model">lunch.product</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Products"> + <field name="name" select="1"/> + <field name="category_id" select="1"/> + <field name="description" select="1"/> + <field name="price" select="1"/> + </tree> + </field> + </record> + + <record model="ir.actions.act_window" id="action_lunch_product_form"> + <field name="name">Product</field> + <field name="res_model">lunch.product</field> + </record> + + <menuitem name="Tools/Lunch/Configuration/Products" id="menu_lunch_product_form" action="action_lunch_product_form" sequence="1"/> + <menuitem name="Products" parent="menu_lunch_category_root" id="menu_lunch_product_form" action="action_lunch_product_form" sequence="1"/> + <menuitem name="Category of product" parent="menu_lunch_product_form" id="menu_lunch_category_form" action="action_lunch_category_form" /> + + + <record model="ir.ui.view" id="view_report_lunch_amount_tree"> + <field name="name">Lunch amount</field> + <field name="model">report.lunch.amount</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Box Amount by User"> + <field name="box" select="1"/> + <field name="user_id" select="1"/> + <field name="amount" select="1" sum="Total box" /> + </tree> + </field> + </record> + + <record model="ir.ui.view" id="view_report_lunch_amount_form"> + <field name="name">Lunch amount</field> + <field name="model">report.lunch.amount</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Box Amount by User"> + <field name="user_id" select="1"/> + <field name="box" select="1"/> + <field name="amount" select="1"/> + </form> + </field> + </record> + + + <record model="ir.actions.act_window" id="action_report_lunch_amount_tree"> + <field name="name">Lunch amount</field> + <field name="res_model">report.lunch.amount</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + </record> + <menuitem name="Box Amount by User" parent="menu_lunch" action="action_report_lunch_amount_tree" id="menu_lunch_report_amount_tree"/> + </data> +</openerp> + + diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml new file mode 100644 index 00000000000..ec9f7fea855 --- /dev/null +++ b/addons/lunch/lunch_wizard.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" ?> +<terp> + <data> + <wizard + string="Confirm Order" + model="lunch.order" + name="lunch.order.confirm" + keyword="client_action_multi" + id="lunch_order_confirm"/> + + <wizard + string="Cancel Order" + model="lunch.order" + name="lunch.order.cancel" + keyword="client_action_multi" + id="wizard_id_cancel"/> + + <wizard + string="Set CashBox to Zero" + model="lunch.cashbox" + name="lunch.cashbox.clean" + keyword="client_action_multi" + id="wizard_clean_cashbox"/> + </data> + + +</terp> diff --git a/addons/lunch/process/lunch_process.xml b/addons/lunch/process/lunch_process.xml new file mode 100644 index 00000000000..4818d9d93f9 --- /dev/null +++ b/addons/lunch/process/lunch_process.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="process_node_lunchbox0" model="process.node"> + <field name="menu_id" ref="lunch.menu_lunch_product_form"/> + <field name="model_id" ref="lunch.model_lunch_product"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Lunchbox"""" name="name"/> + <field eval=""""Employee get lunchbox if he wants lunch"""" name="note"/> + <field name="process_id" ref="hr.process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_transition_employeelunch0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Employee lunch"""" name="name"/> + <field eval=""""Employee get lunch"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_lunchbox0"/> + <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py new file mode 100644 index 00000000000..efaffa8d307 --- /dev/null +++ b/addons/lunch/report/__init__.py @@ -0,0 +1,4 @@ +# -*- encoding: utf-8 -*- +import order +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py new file mode 100644 index 00000000000..7824bade083 --- /dev/null +++ b/addons/lunch/report/order.py @@ -0,0 +1,53 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 time +from report import report_sxw +from osv import osv + + +class order(report_sxw.rml_parse): + + def sum_price(self, orders): + res = 0.0 + for o in orders: + res += o.price + return res + + def __init__(self, cr, uid, name, context): + super(order, self).__init__(cr, uid, name, context) + + self.localcontext.update({ + 'time': time, + 'sum_price': self.sum_price, + }) + +report_sxw.report_sxw('report.lunch.order', 'lunch.order', + 'addons/lunch/report/order.rml',parser=order, header=False) +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml new file mode 100644 index 00000000000..a7bc1b32cdd --- /dev/null +++ b/addons/lunch/report/order.rml @@ -0,0 +1,132 @@ +<?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="42.0" width="527" height="758"/> + </pageTemplate> + </template> + <stylesheet> + <blockTableStyle id="Standard_Outline"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Tableau2"> + <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"/> + </blockTableStyle> + <blockTableStyle id="Tableau1"> + <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="15.0" leading="19"/> + <paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20"/> + <paraStyle name="P3" fontName="Times-Roman"/> + <paraStyle name="P4" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/> + <paraStyle name="P5" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/> + <paraStyle name="P6" fontName="Times-BoldItalic" fontSize="9.0" leading="11"/> + <paraStyle name="P7" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/> + <paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/> + <paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11"/> + <paraStyle name="P10" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/> + <paraStyle name="P11" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/> + <paraStyle name="P12" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/> + <paraStyle name="P13" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/> + <paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/> + <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="Header" fontName="Times-Roman"/> + <paraStyle name="Footer" fontName="Times-Roman"/> + <paraStyle name="Table Contents" fontName="Times-Roman"/> + <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Footnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/> + <paraStyle name="Index" fontName="Times-Roman"/> + </stylesheet> + <story> + <para style="P1"> + <font face="Times-Roman">Printed at : [[time.strftime("%Hh%M")]]</font> + </para> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P3"> + <font color="white"> </font> + </para> + <blockTable colWidths="149.0,135.0,103.0,140.0" repeatRows="1" style="Tableau2"> + <tr> + <td> + <para style="P4">Name</para> + </td> + <td> + <para style="P4">Order</para> + </td> + <td> + <para style="P4">Description</para> + </td> + <td> + <para style="P4">Unit Price</para> + </td> + </tr> + </blockTable> + <section> + <para style="P5"> + <font color="white"> </font> + </para> + </section> + <blockTable colWidths="148.0,135.0,103.0,140.0" style="Tableau1"> + <tr> + <td> + <para style="P7">[[repeatIn(objects, 'o') ]]</para> + <para style="P7">[[ o.user_id.name ]]</para> + </td> + <td> + <para style="P8">[[o.product.name ]]</para> + </td> + <td> + <para style="P9">[[ o.descript ]]</para> + <para style="P10"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="P14">[['%.2f' % o.price ]]</para> + </td> + </tr> + <tr> + <td> + <para style="P9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="P12"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="P9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="P11">[[ '%.2f' % sum_price(objects) ]]</para> + </td> + </tr> + </blockTable> + <para style="P6"> + <font color="white"> </font> + </para> + </story> +</document> + diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py new file mode 100644 index 00000000000..26328e41dc2 --- /dev/null +++ b/addons/lunch/wizard/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +import confirm +import cancel +import reset_box +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/cancel.py new file mode 100644 index 00000000000..15ad6b96451 --- /dev/null +++ b/addons/lunch/wizard/cancel.py @@ -0,0 +1,34 @@ +# -*- encoding: utf-8 -*- + +import wizard +import netsvc +import ir +import pooler + +cancel_form = """<?xml version="1.0"?> +<form string="Cancel Order"> + <label string="Are you sure you want to cancel this order ?"/> +</form>""" + + +cancel_fields = { +} + +def _cancel(self,cr,uid,data,context): + return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context) + +class order_cancel(wizard.interface): + states = { + 'init': { + 'actions': [], + 'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]} + }, + 'cancel': { + 'actions': [_cancel], + 'result': {'type':'state', 'state':'end'} + } + } +order_cancel('lunch.order.cancel') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/confirm.py new file mode 100644 index 00000000000..6c42fb033c3 --- /dev/null +++ b/addons/lunch/wizard/confirm.py @@ -0,0 +1,67 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 wizard +import netsvc +import ir +import pooler + +confirm_order_form = """<?xml version="1.0"?> +<form title="Confirm"> + <separator string="Orders Confirmation" colspan="4"/> + <field name="confirm_cashbox"/> + <newline/> +</form> +""" + +confirm_order_fields = { + 'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' }, +} + +def _confirm(self,cr,uid,data,context): + pool= pooler.get_pool(cr.dbname) + order_ref = pool.get('lunch.order') + order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context) + return {} + +class order_confirm(wizard.interface): + states = { + 'init': { + 'action':[], + 'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]}, + }, + 'go' : { + 'actions' : [_confirm], + 'result' : {'type' : 'state', 'state' : 'end'} + }, + } +order_confirm('lunch.order.confirm') + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py new file mode 100644 index 00000000000..643ecd3ad3f --- /dev/null +++ b/addons/lunch/wizard/reset_box.py @@ -0,0 +1,56 @@ +# -*- encoding: utf-8 -*- +import wizard +import netsvc +import ir +import pooler + +set_to_zero_form = """<?xml version="1.0"?> +<form string="Reset cashbox"> + <label string="Are you sure you want to reset this cashbox ?"/> +</form>""" + + + +confirm_setting_zero_fields = {} + +def _set_to_zero(self,cr,uid,data,context): + pool= pooler.get_pool(cr.dbname) + cashmove_ref = pool.get('lunch.cashmove') + cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids']))) + res= cr.fetchall() + cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids']))) +## to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys() +## print to_unactive +## cashmove_ref.write(cr,uid,to_unactive,{'active':False}) +## + for (user_id,box_id,amount) in res: + cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id), + 'amount': amount, + 'user_cashmove': user_id, + 'box': box_id, + 'active': True, + }) + return {} + + +class cashbox_set_to_zero(wizard.interface): + + states = { + + 'init': { + 'action':[], + 'result':{'type' : 'form', + 'arch' : set_to_zero_form, + 'fields' : confirm_setting_zero_fields, + 'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]}, + + }, + 'zero' : { + 'actions' : [_set_to_zero], + 'result' : {'type' : 'state', 'state' : 'end'} + }, + } + +cashbox_set_to_zero('lunch.cashbox.clean') +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/membership/i18n/fr_FR.po b/addons/membership/i18n/fr_FR.po index 0d9037c2652..0b3dd6ec9b7 100644 --- a/addons/membership/i18n/fr_FR.po +++ b/addons/membership/i18n/fr_FR.po @@ -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:32+0000\n" +"PO-Revision-Date: 2008-10-13 12:39+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 13:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: membership #: view:product.product:0 @@ -23,7 +24,7 @@ msgstr "Information" #. module: membership #: field:membership.membership_line,account_invoice_line:0 msgid "Account Invoice line" -msgstr "" +msgstr "Ligne de Facture" #. module: membership #: model:ir.ui.menu,name:membership.menu_reporting @@ -32,8 +33,11 @@ msgstr "Reporting" #. module: membership #: 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: membership #: constraint:membership.membership_line:0 @@ -43,28 +47,31 @@ msgstr "" #. module: membership #: wizard_button:wizard_invoice_membership,init,ok:0 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Canceled Member" -msgstr "" +msgstr "Membre Annulé" #. module: membership #: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: membership #: help:res.partner,membership_amount:0 msgid "The price negociated by the partner" -msgstr "" +msgstr "Le prix négocié par le partenaire" #. module: membership #: model:ir.model,name:membership.model_membership_membership_line msgid "Member line" -msgstr "" +msgstr "Ligne de Membres" #. module: membership #: model:ir.ui.menu,name:membership.menu_membership_products @@ -75,17 +82,17 @@ msgstr "" #. module: membership #: field:membership.membership_line,date_to:0 msgid "To" -msgstr "" +msgstr "A" #. module: membership #: field:membership.membership_line,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: membership #: field:res.partner,membership_start:0 msgid "Start membership date" -msgstr "" +msgstr "Date de début d'adhésion" #. module: membership #: field:report.partner_member.year,invoiced_amount:0 @@ -93,29 +100,29 @@ msgstr "" #: field:report.partner_member.year_new,invoiced_amount:0 #: field:report.partner_member.year_new,invoiced_number:0 msgid "Invoiced" -msgstr "" +msgstr "Facturée" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Paid Member" -msgstr "" +msgstr "Membre Cotisant" #. module: membership #: field:membership.membership_line,date_from:0 msgid "From" -msgstr "" +msgstr "De" #. module: membership #: field:report.partner_member.year,currency:0 #: field:report.partner_member.year_new,currency:0 msgid "Currency" -msgstr "" +msgstr "Devise" #. module: membership #: field:product.product,membership_date_to:0 msgid "Date to" -msgstr "" +msgstr "Date de fin" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_products @@ -127,13 +134,13 @@ msgstr "" #: model:ir.ui.menu,name:membership.menu_report_partner_member_year #: view:report.partner_member.year:0 msgid "Membership by Years" -msgstr "" +msgstr "Adhésion par Année" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Free Member" -msgstr "" +msgstr "Membre Libre" #. module: membership #: field:report.partner_member.year_new,paid_amount:0 @@ -141,7 +148,7 @@ msgstr "" #: field:report.partner_member.year,paid_amount:0 #: field:report.partner_member.year,paid_number:0 msgid "Paid" -msgstr "" +msgstr "Payé" #. module: membership #: field:res.partner,membership_amount:0 @@ -152,7 +159,7 @@ msgstr "" #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Invoiced Member" -msgstr "" +msgstr "Membre Facturé" #. module: membership #: field:product.product,membership:0 @@ -161,7 +168,7 @@ msgstr "" #: view:product.product:0 #: view:res.partner:0 msgid "Membership" -msgstr "" +msgstr "Adhésion" #. module: membership #: help:product.product,membership:0 @@ -172,18 +179,18 @@ msgstr "" #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Non Member" -msgstr "" +msgstr "Non Membre" #. module: membership #: field:res.partner,membership_stop:0 msgid "Stop membership date" -msgstr "" +msgstr "Date de fin d'adhésion" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Associated Member" -msgstr "" +msgstr "Membre Associé" #. module: membership #: model:ir.ui.menu,name:membership.menu_conf @@ -194,38 +201,40 @@ msgstr "Configuration" #: model:ir.actions.act_window,name:membership.action_membership_members_invoiced #: model:ir.ui.menu,name:membership.menu_members_invoiced msgid "Invoiced members" -msgstr "" +msgstr "Membres Facturés" #. module: membership #: model:product.pricelist,name:membership.list1m msgid "Member Sale Pricelist" -msgstr "" +msgstr "Liste de Prix de Vente Membre" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members #: model:ir.ui.menu,name:membership.menu_members msgid "Current members" -msgstr "" +msgstr "Membres actuels" #. module: membership #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: membership #: view:res.partner:0 msgid "Members" -msgstr "" +msgstr "Membres" #. module: membership #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" msgstr "" +"Erreur: l'unité de vente doit appartenir à une catégorie différente que " +"l'unité de mesure" #. module: membership #: field:res.partner,membership_cancel:0 msgid "Cancel membership date" -msgstr "" +msgstr "Annuler la date d'adhésion" #. module: membership #: view:res.partner:0 @@ -235,37 +244,37 @@ msgstr "Partenaire" #. module: membership #: model:ir.ui.menu,name:membership.menu_members_waiting msgid "Future members (invoice not confirmed)" -msgstr "" +msgstr "Membres futurs (facture non confirmée)" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Waiting Member" -msgstr "" +msgstr "Membre en attente" #. module: membership #: model:ir.model,name:membership.model_report_partner_member_year_new #: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new #: view:report.partner_member.year_new:0 msgid "New Membership by Years" -msgstr "" +msgstr "Nouvelles adhésions par Année" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_old #: model:ir.ui.menu,name:membership.menu_members_old msgid "Old members" -msgstr "" +msgstr "Anciens Membres" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_associated #: model:ir.ui.menu,name:membership.menu_members_associated msgid "Associated members" -msgstr "" +msgstr "Membres Associés" #. module: membership #: field:res.partner,associate_member:0 msgid "Associate member" -msgstr "" +msgstr "Membre Associé" #. module: membership #: model:product.template,name:membership.member_product_1_product_template @@ -285,35 +294,36 @@ msgstr "" #. module: membership #: wizard_view:wizard_invoice_membership,init:0 msgid "Choose invoice details" -msgstr "" +msgstr "Choisissez les détails de la facture" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_paid #: model:ir.ui.menu,name:membership.menu_members_paid msgid "Paid members" -msgstr "" +msgstr "Membres Cotisants" #. module: membership #: constraint:product.pricelist.version:0 msgid "You can not have 2 pricelist version that overlaps!" msgstr "" +"Vous ne pouvez pas avoir 2 version de listes de prix qui se chevauchent" #. module: membership #: selection:membership.membership_line,state:0 #: selection:res.partner,membership_state:0 msgid "Old Member" -msgstr "" +msgstr "Ancien Membre" #. module: membership #: field:product.template,member_price:0 #: model:product.price.type,name:membership.product_price_type_memberprice msgid "Member Price" -msgstr "" +msgstr "Prix Membre" #. module: membership #: field:res.partner,free_member:0 msgid "Free member" -msgstr "" +msgstr "Membre Libre" #. module: membership #: field:report.partner_member.year_new,waiting_amount:0 @@ -321,7 +331,7 @@ msgstr "" #: field:report.partner_member.year,waiting_amount:0 #: field:report.partner_member.year,waiting_number:0 msgid "Waiting" -msgstr "" +msgstr "En attente" #. module: membership #: model:product.template,name:membership.member_product_0_product_template @@ -331,7 +341,7 @@ msgstr "" #. module: membership #: constraint:res.partner:0 msgid "The VAT doesn't seem to be correct." -msgstr "" +msgstr "Le numéro de TVA ne semble pas correct." #. module: membership #: field:report.partner_member.year,canceled_amount:0 @@ -339,52 +349,51 @@ msgstr "" #: field:report.partner_member.year_new,canceled_amount:0 #: field:report.partner_member.year_new,canceled_number:0 msgid "Canceled" -msgstr "" +msgstr "Annulé" #. module: membership #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Erreur: code EAN invalide" #. module: membership #: field:product.product,membership_date_from:0 msgid "Date from" -msgstr "" +msgstr "Date de début" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_waiting msgid "Future members" -msgstr "" +msgstr "Membres Futures" #. module: membership #: field:report.partner_member.year_new,year:0 #: field:report.partner_member.year,year:0 msgid "Year" -msgstr "" +msgstr "Année" #. module: membership #: wizard_button:wizard_invoice_membership,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: membership #: field:membership.membership_line,partner:0 msgid "Partner" -msgstr "" +msgstr "Partenaire" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members_free #: model:ir.ui.menu,name:membership.menu_members_free msgid "Free members" -msgstr "" +msgstr "Membres Libres" #. module: membership #: field:res.partner,membership_state:0 msgid "Current membership state" -msgstr "" +msgstr "État de l'adhésion courante" #. module: membership #: field:membership.membership_line,date_cancel:0 msgid "Cancel date" -msgstr "" - +msgstr "Date d'annulation" diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 5f488738e1a..1029118f32c 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -81,7 +81,7 @@ <field name="act_window_id" ref="action_membership_products"/> </record> - <menuitem name="Membership" id="menu_membership"/> + <menuitem name="Membership" id="menu_membership" icon="terp-crm"/> <menuitem name="Configuration" parent="menu_membership" id="menu_conf" sequence="1"/> diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv index a641bd47522..de35a7c8adc 100644 --- a/addons/membership/security/ir.model.access.csv +++ b/addons/membership/security/ir.model.access.csv @@ -1,4 +1,5 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_membership_membership_line,membership.membership_line,model_membership_membership_line,base.group_user,1,1,1,1 -access_report_partner_member_year,report.partner_member.year,model_report_partner_member_year,base.group_user,1,0,0,0 -access_report_partner_member_year_new,report.partner_member.year_new,model_report_partner_member_year_new,base.group_user,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1 +"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0 +"access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0 +"access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0 diff --git a/addons/mrp/i18n/fr_FR.po b/addons/mrp/i18n/fr_FR.po index 3e96a958e75..98d6df953dd 100644 --- a/addons/mrp/i18n/fr_FR.po +++ b/addons/mrp/i18n/fr_FR.po @@ -1,24 +1,26 @@ -# Translation of OpenERP Server. -# This file containt the translation of the following modules: -# * mrp +# French translation for openobject-addons +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. # 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-14 13:19+0000\n" +"Last-Translator: Olivier Laurent <Unknown>\n" +"Language-Team: French <fr@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:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: mrp #: field:mrp.workcenter,time_efficiency:0 msgid "Time Efficiency" -msgstr "Efficacité temporelle" +msgstr "Éfficacité dans le temps" #. module: mrp #: selection:mrp.procurement,state:0 @@ -33,7 +35,7 @@ msgstr "Mouvements créés" #. module: mrp #: model:ir.model,name:mrp.model_mrp_bom_revision msgid "Bill of material revisions" -msgstr "Révisions de la nomenclature" +msgstr "Révisions de la Nomenclature" #. module: mrp #: view:mrp.production:0 @@ -47,8 +49,13 @@ msgstr "Auteur" #. module: mrp #: help:mrp.bom,type:0 -msgid "Use a phantom bill of material in lines that have a sub-bom and that have to be automatically computed in one line, without habing two production orders." -msgstr "Utilise une note de matériel fantôme ayant un sub-born et devant être calculé automatiquement en une ligne, sans avoir deux ordres de fabrication." +msgid "" +"Use a phantom bill of material in lines that have a sub-bom and that have to " +"be automatically computed in one line, without habing two production orders." +msgstr "" +"Utilisez une nomenclature fantôme dans les lignes qui ont une sous-" +"nomenclature et qui doivent être automatiquement calculée en une ligne, sans " +"avoir deux ordres de production." #. module: mrp #: field:mrp.workcenter,costs_cycle:0 @@ -58,22 +65,28 @@ msgstr "Coût par cycle" #. module: mrp #: wizard_view:mrp.procurement.compute.all,init:0 msgid "Scheduler Parameters" -msgstr "Paramètres du calcul des besoins" +msgstr "Paramètres de la plannification" #. module: mrp #: view:mrp.procurement:0 msgid "Planification" -msgstr "" +msgstr "Planification" #. module: mrp #: rml:bom.structure:0 msgid "BOM" -msgstr "BOM" +msgstr "Nomenclature" + +#. module: mrp +#: wizard_field:mrp.procurement.compute.all,init,user_id:0 +#: wizard_field:mrp.procurement.compute,init,user_id:0 +msgid "Send Result To" +msgstr "Envoyer les résultats à" #. module: mrp #: field:mrp.bom.revision,indice:0 msgid "Revision" -msgstr "Index" +msgstr "Révision" #. module: mrp #: field:mrp.workcenter,costs_journal_id:0 @@ -81,101 +94,97 @@ msgid "Analytic Journal" msgstr "Journal analytique" #. module: mrp -#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2 -#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2 -msgid "Compute Stock Minimum Rules Only" -msgstr "" - -#. module: mrp -#: help:res.company,po_lead:0 -msgid "This is the leads/security time for each purchase order." -msgstr "" +#: view:mrp.procurement:0 +msgid "Details" +msgstr "Détails" #. module: mrp #: field:mrp.production,location_dest_id:0 msgid "Finnished Products Location" -msgstr "" +msgstr "Localisation des Produits Finis" #. module: mrp -#: field:mrp.procurement,product_uos_qty:0 -msgid "UoS Quantity" -msgstr "" +#: wizard_field:mrp.procurement.compute.all,init,picking_lead:0 +#: wizard_field:mrp.procurement.compute,init,picking_lead:0 +msgid "Packing Lead Time" +msgstr "Délai de colisage" #. module: mrp #: selection:mrp.workcenter,type:0 msgid "Human Resource" -msgstr "Ressource humaine" +msgstr "Resources Humaines" #. module: mrp #: wizard_button:mrp.procurement.compute.all,init,compute:0 #: wizard_button:mrp.procurement.compute,init,compute:0 #: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0 msgid "Compute Procurements" -msgstr "Calculer les besoins" +msgstr "Calculer les Approvisionnements" #. module: mrp -#: view:mrp.routing.workcenter:0 -msgid "Routing Workcenters" -msgstr "Centre de travail de routage" +#: wizard_field:mrp.procurement.compute.all,init,po_lead:0 +#: wizard_field:mrp.procurement.compute,init,po_lead:0 +msgid "PO Lead Time" +msgstr "" #. module: mrp #: field:mrp.procurement,date_close:0 msgid "Date Closed" -msgstr "Date fermée" +msgstr "Date de fin" #. module: mrp #: view:mrp.production:0 msgid "Finnished Products" -msgstr "" +msgstr "Produits Finis" #. module: mrp #: rml:bom.structure:0 msgid "UoM" -msgstr "UoM" +msgstr "UdM" #. module: mrp -#: field:mrp.production.product.line,production_id:0 -#: field:mrp.production.workcenter.line,production_id:0 -msgid "Production Order" -msgstr "Ordre de fabrication" +#: field:mrp.procurement,origin:0 +#: field:mrp.production,origin:0 +msgid "Origin" +msgstr "Origine" #. module: mrp #: field:mrp.production.workcenter.line,hour:0 msgid "Nbr of hour" -msgstr "Nb d'heure" +msgstr "Nbr d'heures" #. module: mrp #: field:mrp.workcenter,time_start:0 msgid "Time before prod." -msgstr "Temps avant prod." +msgstr "Délai avant production" #. module: mrp #: field:mrp.bom,date_stop:0 msgid "Valid until" -msgstr "Valide jusqu'à" +msgstr "Valide jusqu'au" #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing_workcenter msgid "Routing workcenter usage" -msgstr "Utilisation de la gamme" +msgstr "Usage des Centre de Travail d'Acheminement" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_routing_action #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action msgid "Routings" -msgstr "" +msgstr "Acheminements" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_property_group_action #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action msgid "Property Categories" -msgstr "" +msgstr "Catégories de la Propriété" #. module: mrp -#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1 -#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1 -msgid "Compute Procurements Only" -msgstr "" +#: field:mrp.procurement,purchase_id:0 +#: field:stock.warehouse.orderpoint,procurement_id:0 +msgid "Purchase Order" +msgstr "Commande d'achat" #. module: mrp #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom @@ -188,77 +197,76 @@ msgstr "Nomenclature" #. module: mrp #: wizard_view:mrp.workcenter.load,init:0 msgid "Select time unit" -msgstr "Sélectionner une unité de temps" +msgstr "Sélectionner l'unité de temps" #. module: mrp #: constraint:mrp.bom:0 msgid "Error ! You can not create recursive BoM." -msgstr "" +msgstr "Erreur! Vous ne pouvez pas créer de nomenclatures récursives" #. module: mrp #: wizard_field:product_price,init,number:0 msgid "Number of products to produce" -msgstr "Nombre de produits à produire" - -#. module: mrp -#: field:res.company,manufacturing_lead:0 -msgid "Manufacturity Lead Time" -msgstr "" +msgstr "Nombre de produits à manufacturer" #. module: mrp #: field:stock.warehouse.orderpoint,logic:0 msgid "Reordering Mode" -msgstr "Mode de cmde." +msgstr "Mode de réagencement" #. module: mrp -#: field:mrp.procurement,origin:0 -#: field:mrp.production,origin:0 -msgid "Origin" -msgstr "Origine" +#: wizard_view:mrp.procurement.compute.all,init:0 +#: wizard_view:mrp.procurement.compute,init:0 +msgid "Control" +msgstr "Contrôle" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4 msgid "Exceptions procurements to fix" -msgstr "Approvisionnements en exception à fixer" +msgstr "Approvisionnement en Exception à Corriger" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_reordering msgid "Reordering Policy" -msgstr "Politique de réapprovisionnement" +msgstr "Politique de réagencement" #. module: mrp #: field:mrp.production,move_lines:0 msgid "Products Consummed" -msgstr "Mouvements" +msgstr "Produits consommés" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_configuration -#: view:res.company:0 msgid "Configuration" msgstr "Configuration" #. module: mrp #: field:mrp.production,name:0 msgid "Reference" -msgstr "" +msgstr "Référence" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_action2 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action2 msgid "Draft procurements" -msgstr "Approvisionnements brouillons" +msgstr "Approvisionnements Brouillon" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11 msgid "Temporary Procurement Exceptions" -msgstr "" +msgstr "Approvisionnement en Exception Temporaire" #. module: mrp #: selection:mrp.bom,type:0 msgid "Normal BoM" -msgstr "Nomenclature normale" +msgstr "UdM Standard" + +#. module: mrp +#: field:mrp.workcenter,time_cycle:0 +msgid "Time for 1 cycle (hour)" +msgstr "Temps d'1 cycle (heures)" #. module: mrp #: field:mrp.bom,product_uos_qty:0 @@ -270,12 +278,12 @@ msgstr "" #: wizard_field:mrp.procurement.compute.all,init,automatic:0 #: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0 msgid "Automatic orderpoint" -msgstr "Point de commande automatique" +msgstr "" #. module: mrp #: view:mrp.routing:0 msgid "Workcenter Operations" -msgstr "Opérations" +msgstr "Opérations du Centre de Travail" #. module: mrp #: view:mrp.bom:0 @@ -285,17 +293,17 @@ msgstr "Révisions" #. module: mrp #: field:mrp.property,composition:0 msgid "Properties composition" -msgstr "Composition de propriétés" +msgstr "Composition des Propriétés" #. module: mrp #: field:mrp.bom,product_efficiency:0 msgid "Product Efficiency" -msgstr "Efficacité du produit" +msgstr "Efficacité Produit" #. module: mrp #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint msgid "Orderpoint minimum rule" -msgstr "Règle de stock minimum" +msgstr "" #. module: mrp #: wizard_view:mrp.procurement.compute,init:0 @@ -312,7 +320,7 @@ msgstr "Confirmer" #: rml:bom.structure:0 #: model:ir.actions.report.xml,name:mrp.report_bom_structure msgid "BOM Structure" -msgstr "Structure BOM" +msgstr "Structure de la Nomenclature" #. module: mrp #: selection:mrp.production,state:0 @@ -322,12 +330,12 @@ msgstr "En production" #. module: mrp #: field:stock.warehouse.orderpoint,qty_multiple:0 msgid "Qty Multiple" -msgstr "Multiple qté." +msgstr "Multiple Qté" #. module: mrp #: model:ir.model,name:mrp.model_mrp_production_workcenter_line msgid "Production workcenters used" -msgstr "Utilisation des postes de charge" +msgstr "Centre de Travail de Production Utilisés" #. module: mrp #: field:mrp.procurement,priority:0 @@ -338,24 +346,24 @@ msgstr "Priorité" #. module: mrp #: selection:mrp.procurement,state:0 msgid "Waiting" -msgstr "" +msgstr "En attente" #. module: mrp #: field:mrp.production,workcenter_lines:0 msgid "Workcenters Utilisation" -msgstr "Utilisation centre de travail" +msgstr "Utilisation du Centre de Travail" #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing #: field:mrp.bom,routing_id:0 #: view:mrp.routing:0 msgid "Routing" -msgstr "Gamme" +msgstr "Acheminement" #. module: mrp #: field:mrp.bom,product_rounding:0 msgid "Product Rounding" -msgstr "Arrondi produit" +msgstr "" #. module: mrp #: wizard_button:mrp.workcenter.load,init,report:0 @@ -365,7 +373,7 @@ msgstr "Imprimer" #. module: mrp #: selection:stock.warehouse.orderpoint,logic:0 msgid "Best price (not yet active!)" -msgstr "Meilleur prix (pas encore activé)" +msgstr "Meilleur Prix (pas encore actif!)" #. module: mrp #: field:mrp.workcenter,type:0 @@ -375,23 +383,18 @@ msgstr "Type" #. module: mrp #: view:mrp.procurement:0 msgid "Product & Location" -msgstr "" +msgstr "Produit & Localisation" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_new #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new msgid "New Procurement" -msgstr "" - -#. module: mrp -#: view:res.company:0 -msgid "MRP & Logistic Scheduler" -msgstr "" +msgstr "Nouvel Approvisionnement" #. module: mrp #: view:mrp.production:0 msgid "Recreate Picking" -msgstr "Recréer le colisage" +msgstr "Recréer le coli" #. module: mrp #: view:mrp.bom:0 @@ -401,7 +404,7 @@ msgstr "Recréer le colisage" #: view:mrp.routing.workcenter:0 #: view:mrp.workcenter:0 msgid "General Information" -msgstr "Information générale" +msgstr "Infos générales" #. module: mrp #: selection:mrp.workcenter,type:0 @@ -409,17 +412,12 @@ msgid "Tool" msgstr "Outil" #. module: mrp -#: help:res.company,manufacturing_lead:0 -msgid "Security days for each manufacturing operation." -msgstr "" - -#. module: mrp #: field:mrp.bom,product_qty:0 #: field:mrp.production.product.line,product_qty:0 #: field:mrp.production,product_qty:0 #: field:mrp.production,product_uos_qty:0 msgid "Product Qty" -msgstr "Qté produit" +msgstr "Qté de Produit" #. module: mrp #: field:mrp.routing.workcenter,cycle_nbr:0 @@ -429,47 +427,37 @@ msgstr "Nombre de cycle" #. module: mrp #: rml:bom.structure:0 msgid "Product Name" -msgstr "Nom du produit" +msgstr "Nom du Produit" #. module: mrp #: view:mrp.procurement:0 msgid "References" -msgstr "" +msgstr "Références" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new msgid "New Bill of Materials" -msgstr "" - -#. module: mrp -#: field:mrp.workcenter,costs_cycle_account_id:0 -msgid "Cycle Account" -msgstr "Compte cycle" +msgstr "Nouvelle Nomenclature" #. module: mrp #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: mrp #: field:mrp.workcenter,time_stop:0 msgid "Time after prod." -msgstr "Temps après prod." +msgstr "" #. module: mrp #: wizard_field:mrp.workcenter.load,init,time_unit:0 msgid "Type of period" -msgstr "Type de période" +msgstr "Type de Période" #. module: mrp -#: field:mrp.production,picking_id:0 -msgid "Packing list" -msgstr "Liste de colisage" - -#. module: mrp -#: field:res.company,schedule_range:0 -msgid "Scheduler Range" +#: field:mrp.workcenter,costs_cycle_account_id:0 +msgid "Cycle Account" msgstr "" #. module: mrp @@ -480,12 +468,12 @@ msgstr "Valide depuis" #. module: mrp #: field:stock.warehouse.orderpoint,product_max_qty:0 msgid "Max Quantity" -msgstr "Quantité max" +msgstr "Quantité Max" #. module: mrp #: field:mrp.bom,revision_type:0 msgid "indice type" -msgstr "Type d'index" +msgstr "Type d'indice" #. module: mrp #: model:ir.model,name:mrp.model_mrp_procurement @@ -497,12 +485,12 @@ msgstr "Approvisionnement" #: model:ir.actions.act_window,name:mrp.mrp_procurement_action #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action msgid "Procurement Orders" -msgstr "" +msgstr "Ordre d'Approvisionnement" #. module: mrp #: view:mrp.workcenter:0 msgid "Capacity Information" -msgstr "Information de capacité" +msgstr "Information sur la Capacité" #. module: mrp #: model:ir.model,name:mrp.model_mrp_property @@ -512,22 +500,28 @@ msgstr "Propriété" #. module: mrp #: field:mrp.routing.workcenter,routing_id:0 msgid "Parent Routing" -msgstr "Routage parent" +msgstr "Acheminement Parent" #. module: mrp #: model:ir.actions.wizard,name:mrp.wizard_price msgid "Product Cost Structure" -msgstr "Structure de coût du produit" +msgstr "Structure de Coût du Produit" #. module: mrp -#: view:mrp.workcenter:0 -msgid "Analytic Accounting" -msgstr "Comptabilité analytique" +#: field:mrp.procurement,product_uos_qty:0 +msgid "UoS Quantity" +msgstr "" + +#. module: mrp +#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2 +#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2 +msgid "Compute stock minimum rules" +msgstr "Calculer les règles de stock minimum" #. module: mrp #: field:stock.warehouse.orderpoint,product_min_qty:0 msgid "Min Quantity" -msgstr "Quantité min" +msgstr "Quantité Min." #. module: mrp #: selection:mrp.procurement,priority:0 @@ -536,6 +530,11 @@ msgid "Urgent" msgstr "Urgent" #. module: mrp +#: model:ir.ui.menu,name:mrp.menu_mrp_root +msgid "Production Management" +msgstr "Gestion de la Production" + +#. module: mrp #: selection:mrp.property,composition:0 msgid "plus" msgstr "plus" @@ -549,12 +548,12 @@ msgstr "Nomenclature" #. module: mrp #: view:mrp.bom:0 msgid "BoM Structure" -msgstr "Structure de nomenclature" +msgstr "Structure de la Nomenclature" #. module: mrp #: field:mrp.production,date_start:0 msgid "Start Date" -msgstr "Date début" +msgstr "Date de début" #. module: mrp #: field:mrp.workcenter,timesheet_id:0 @@ -564,54 +563,60 @@ msgstr "Feuille de présence" #. module: mrp #: selection:mrp.production,state:0 msgid "Waiting Goods" -msgstr "Attente marchandises" +msgstr "en attende de Marchandises" #. module: mrp #: field:mrp.workcenter,costs_hour_account_id:0 msgid "Hour Account" -msgstr "Compte heure" +msgstr "Compte Horaire" #. module: mrp #: selection:mrp.bom,revision_type:0 msgid "alphabetical indices" -msgstr "Indexes alphabétiques" +msgstr "Indices Alphabétiques" #. module: mrp #: field:mrp.production,product_lines:0 msgid "Scheduled goods" -msgstr "Matériel planifié" +msgstr "Biens Prévus" #. module: mrp #: view:mrp.procurement:0 msgid "Procurement Lines" -msgstr "Lignes d'approvisionnement" +msgstr "Lignes d'Approvisionnement" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_new #: model:ir.ui.menu,name:mrp.menu_production_orders_new msgid "New Production Order" -msgstr "" +msgstr "Nouvel Ordre de Production" #. module: mrp #: field:mrp.procurement,purchase_line_id:0 msgid "Purchase Order Line" -msgstr "Détail d'une commande d'achat" +msgstr "Ligne de commande" #. module: mrp #: field:mrp.bom.revision,last_indice:0 msgid "last indice" -msgstr "Dernier index" +msgstr "Dernier Indice" #. module: mrp #: field:mrp.bom,revision_ids:0 #: view:mrp.bom.revision:0 msgid "BoM Revisions" -msgstr "Révisions de nomenclature" +msgstr "Révisions des Nomenclatures" + +#. module: mrp +#: wizard_field:mrp.procurement.compute.all,init,schedule_cycle:0 +#: wizard_field:mrp.procurement.compute,init,schedule_cycle:0 +msgid "Scheduler Cycle" +msgstr "Cycle de Prévision" #. module: mrp #: view:mrp.procurement:0 msgid "Retry" -msgstr "Réessayer" +msgstr "Réessayez" #. module: mrp #: selection:mrp.procurement,state:0 @@ -625,9 +630,10 @@ msgid "Sets / Phantom" msgstr "" #. module: mrp -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" +#: selection:mrp.procurement,priority:0 +#: selection:mrp.production,priority:0 +msgid "Not urgent" +msgstr "Non urgent" #. module: mrp #: field:mrp.routing.workcenter,hour_nbr:0 @@ -635,21 +641,22 @@ msgid "Number of hours" msgstr "Nombre d'heures" #. module: mrp -#: field:res.company,security_lead:0 +#: wizard_field:mrp.procurement.compute.all,init,security_lead:0 +#: wizard_field:mrp.procurement.compute,init,security_lead:0 msgid "Security Days" -msgstr "" +msgstr "Jours de sécurité" #. module: mrp #: field:mrp.bom,position:0 msgid "Internal Ref." -msgstr "Position N°" +msgstr "Réf. Interne" #. module: mrp #: field:mrp.procurement,state:0 #: field:mrp.production,state:0 #: view:mrp.procurement:0 msgid "Status" -msgstr "" +msgstr "État" #. module: mrp #: wizard_view:product_price,init:0 @@ -666,27 +673,28 @@ msgstr "Normal" #: model:ir.actions.act_window,name:mrp.mrp_production_action2 #: model:ir.ui.menu,name:mrp.menu_production_orders_start msgid "Production Orders To Start" -msgstr "" +msgstr "Ordres de Production à Commencer" #. module: mrp #: view:mrp.procurement:0 msgid "Procurement Details" -msgstr "" +msgstr "Détail de l'Approvisionnement" #. module: mrp #: selection:mrp.production,state:0 msgid "Ready to Produce" -msgstr "Prêt à produire" +msgstr "Prêt à Produire" #. module: mrp #: selection:mrp.production,state:0 msgid "Packing Exception" -msgstr "Exception de colisage" +msgstr "Exception de Colisage" #. module: mrp -#: field:mrp.bom.revision,name:0 -msgid "Modification name" -msgstr "Modification" +#: wizard_view:mrp.procurement.compute.all,init:0 +#: wizard_view:mrp.procurement.compute,init:0 +msgid "Time (days)" +msgstr "Temps (jours)" #. module: mrp #: field:mrp.bom,active:0 @@ -694,17 +702,22 @@ msgstr "Modification" #: field:mrp.workcenter,active:0 #: field:stock.warehouse.orderpoint,active:0 msgid "Active" -msgstr "Active" +msgstr "Actif" + +#. module: mrp +#: field:mrp.bom.revision,name:0 +msgid "Modification name" +msgstr "Nom de la Modification" #. module: mrp #: field:mrp.bom,type:0 msgid "BoM Type" -msgstr "Type de nomenclature" +msgstr "Type de Nomenclature" #. module: mrp #: field:mrp.bom,bom_id:0 msgid "Parent BoM" -msgstr "Nomenclature parente" +msgstr "Nomenclature Parente" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_property_action @@ -721,7 +734,7 @@ msgstr "Propriétés" #. module: mrp #: field:mrp.workcenter,costs_hour:0 msgid "Cost per hour" -msgstr "Coût par heure" +msgstr "Coût horaire" #. module: mrp #: field:mrp.procurement,date_planned:0 @@ -730,53 +743,68 @@ msgid "Scheduled date" msgstr "Date prévue" #. module: mrp -#: selection:mrp.procurement,state:0 -msgid "Exception" -msgstr "Exception" +#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0 +#: model:ir.ui.menu,name:mrp.mrp_Sched_all +msgid "Compute all schedulers" +msgstr "Calculer toutes les prévisions" #. module: mrp #: selection:mrp.procurement,priority:0 #: selection:mrp.production,priority:0 msgid "Very Urgent" -msgstr "Très urgent" +msgstr "très Urgent" #. module: mrp #: field:mrp.procurement,procure_method:0 msgid "Procurement Method" -msgstr "Méthode d'appro." +msgstr "Méthode d'Approvisionnement" #. module: mrp #: field:mrp.production.workcenter.line,cycle:0 msgid "Nbr of cycle" -msgstr "Nb de cycle" +msgstr "Nbre de cycles" #. module: mrp #: view:mrp.procurement:0 #: view:mrp.production:0 msgid "Extra Information" -msgstr "" +msgstr "Information supplémentaire" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action #: model:ir.ui.menu,name:mrp.menu_mrp_production_action #: view:mrp.production:0 msgid "Production Orders" -msgstr "" +msgstr "Ordres de Production" #. module: mrp #: view:mrp.procurement:0 msgid "Run procurement" -msgstr "Lancer l'approvisionnement" +msgstr "Lancer l'Approvisionnement" #. module: mrp -#: help:res.company,schedule_range:0 -msgid "This is the time frame analysed by the scheduler when computing procurements. All procurement that are not between today and today+range are skipped for futur computation." +#: selection:stock.warehouse.orderpoint,logic:0 +msgid "Order to Max" msgstr "" #. module: mrp #: help:mrp.bom,routing_id:0 -msgid "The list of operations (list of workcenters) to produce the finnished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification." -msgstr "La liste des opérations (liste des centres de travail) pour produire le produit fini. Le routage est principalement utilisé pour calculer les coûts de centre de travail pendant les opérations et pour planifier les charges futures sur les centres de travail sur base de la planification de production." +msgid "" +"The list of operations (list of workcenters) to produce the finnished " +"product. The routing is mainly used to compute workcenter costs during " +"operations and to plan futur loads on workcenters based on production " +"plannification." +msgstr "" +"La liste des opérations (liste des Centres de Travail) pour produire le " +"produit fini. L'acheminement est principalement utilisé pour calculer les " +"coûts des centres de travail pendant les opérations et pour plannifier les " +"charges futures sur les centres de travail basés sur la plannification de la " +"production." + +#. module: mrp +#: view:mrp.routing.workcenter:0 +msgid "Routing Workcenters" +msgstr "Centre de Travail d'Acheminement" #. module: mrp #: rml:bom.structure:0 @@ -787,13 +815,13 @@ msgstr "Quantité" #. module: mrp #: view:mrp.production:0 msgid "Production done" -msgstr "Production finie" +msgstr "Production Effectuée" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action msgid "Bill of Materials" -msgstr "" +msgstr "Nomenclature" #. module: mrp #: field:mrp.workcenter,costs_general_account_id:0 @@ -812,35 +840,24 @@ msgstr "Code" #: model:ir.actions.act_window,name:mrp.mrp_production_action4 #: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4 msgid "Production Orders Waiting Products" -msgstr "" +msgstr "Ordres de Production en attente de Produits" #. module: mrp #: model:ir.model,name:mrp.model_mrp_property_group #: field:mrp.property,group_id:0 #: field:mrp.property.group,name:0 msgid "Property Group" -msgstr "Groupe de propriété" - -#. module: mrp -#: selection:mrp.procurement,priority:0 -#: selection:mrp.production,priority:0 -msgid "Not urgent" -msgstr "Non urgent" +msgstr "Groupe de Propriétés" #. module: mrp #: view:mrp.production:0 msgid "Confirm Production" -msgstr "Confirmer la production" - -#. module: mrp -#: help:res.company,security_lead:0 -msgid "This is the days added to what you promise to customers for security purpose" -msgstr "" +msgstr "Confirmer la Production" #. module: mrp #: selection:mrp.procurement,procure_method:0 msgid "from stock" -msgstr "Depuis le stock" +msgstr "du stock" #. module: mrp #: field:stock.move,procurements:0 @@ -851,12 +868,12 @@ msgstr "Approvisionnements" #: selection:mrp.procurement,state:0 #: selection:mrp.production,state:0 msgid "Done" -msgstr "Fait" +msgstr "Terminé" #. module: mrp #: view:mrp.production.workcenter.line:0 msgid "Production Workcenters" -msgstr "Centres de travail de production" +msgstr "Centre de Travail de Production" #. module: mrp #: wizard_button:product_price,init,end:0 @@ -872,34 +889,53 @@ msgstr "Annuler" #. module: mrp #: field:mrp.procurement,location_id:0 -#: field:stock.warehouse.orderpoint,location_id:0 msgid "Location" msgstr "Emplacement" #. module: mrp #: field:mrp.procurement,message:0 msgid "Latest error" -msgstr "Dernière erreur" +msgstr "Dernière Erreur" #. module: mrp -#: wizard_view:mrp.procurement.compute,init:0 -msgid "This wizard will schedule procurements." +#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1 +#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1 +msgid "Compute procurement" +msgstr "Calculer l'Approvisionnement" + +#. module: mrp +#: view:mrp.workcenter:0 +msgid "Analytic Accounting" +msgstr "Comptabilité Analytique" + +#. module: mrp +#: 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 !" #. module: mrp #: model:ir.model,name:mrp.model_mrp_production_product_line msgid "Production scheduled products" -msgstr "Production planifiée de produits" +msgstr "Produits plannifiés pour la production" #. module: mrp -#: field:mrp.workcenter,time_cycle:0 -msgid "Time for 1 cycle (hour)" -msgstr "Tps. pour un cycle (hr)" +#: field:mrp.production.product.line,production_id:0 +#: field:mrp.production.workcenter.line,production_id:0 +msgid "Production Order" +msgstr "Ordre de Production" + +#. module: mrp +#: selection:mrp.procurement,state:0 +msgid "Exception" +msgstr "Exception" #. module: mrp #: field:mrp.production,move_prod_id:0 msgid "Move product" -msgstr "Mouvement produit" +msgstr "Déplacer le produit" #. module: mrp #: selection:mrp.workcenter,type:0 @@ -918,15 +954,16 @@ msgid "Production" msgstr "Production" #. module: mrp -#: view:mrp.procurement:0 -msgid "Details" +#: wizard_field:mrp.procurement.compute.all,init,po_cycle:0 +#: wizard_field:mrp.procurement.compute,init,po_cycle:0 +msgid "PO Cycle" msgstr "" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action3 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3 msgid "Production Orders in Progress" -msgstr "" +msgstr "Ordres de Production en Marche" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_orderpoint_form @@ -935,22 +972,22 @@ msgstr "" #: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form #: view:stock.warehouse.orderpoint:0 msgid "Minimum Stock Rules" -msgstr "Règles de stock minimum" +msgstr "Règles de Stock Minimum" #. module: mrp #: view:mrp.production:0 msgid "Production orders" -msgstr "" +msgstr "Ordres de Production" #. module: mrp #: field:mrp.procurement,close_move:0 msgid "Close Move at end" -msgstr "Clôturer le mouvement" +msgstr "" #. module: mrp #: field:mrp.workcenter,capacity_per_cycle:0 msgid "Capacity per Cycle" -msgstr "Capacité par cycle" +msgstr "Capacité par Cycle" #. module: mrp #: field:mrp.bom,product_id:0 @@ -977,7 +1014,7 @@ msgstr "Description" #. module: mrp #: selection:mrp.production,state:0 msgid "Canceled" -msgstr "Annulée" +msgstr "Annulé" #. module: mrp #: rml:bom.structure:0 @@ -988,7 +1025,7 @@ msgstr "-" #: field:mrp.bom,product_uos:0 #: field:mrp.production.product.line,product_uos:0 msgid "Product UOS" -msgstr "" +msgstr "UP Produit" #. module: mrp #: selection:mrp.procurement,state:0 @@ -1002,7 +1039,7 @@ msgstr "En cours" #: field:mrp.production,product_uos:0 #: field:stock.warehouse.orderpoint,product_uom:0 msgid "Product UOM" -msgstr "UDM de production" +msgstr "UDM produit" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action @@ -1010,17 +1047,17 @@ msgstr "UDM de production" #: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action #: view:mrp.production:0 msgid "Workcenters" -msgstr "" +msgstr "Centres de Travail" #. module: mrp #: view:mrp.procurement:0 msgid "UOM" -msgstr "UDM" +msgstr "UdM" #. module: mrp #: field:mrp.bom,bom_lines:0 msgid "BoM Lines" -msgstr "Lignes de nomenclature" +msgstr "Lignes de Nomenclature" #. module: mrp #: selection:mrp.procurement,procure_method:0 @@ -1033,37 +1070,26 @@ msgid "Reservation" msgstr "Réservation" #. module: mrp -#: model:ir.ui.menu,name:mrp.menu_mrp_root -msgid "Manufacturing" -msgstr "" - -#. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3 msgid "Unscheduled procurements" -msgstr "Approvisonnements imprévus" +msgstr "Approvisionnements non prévu" #. module: mrp #: view:mrp.production.lot.line:0 msgid "Production Products" -msgstr "Produits de production" +msgstr "" #. module: mrp #: field:mrp.production,date_finnished:0 msgid "End Date" -msgstr "Date fin" - -#. module: mrp -#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0 -#: model:ir.ui.menu,name:mrp.mrp_Sched_all -msgid "Compute All Schedulers" -msgstr "" +msgstr "Date de fin" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action #: model:ir.ui.menu,name:mrp.menu_bom_tree msgid "Bill of Material Structure" -msgstr "" +msgstr "Structure de la Nomenclature" #. module: mrp #: field:mrp.bom,name:0 @@ -1081,7 +1107,7 @@ msgstr "Nom" #. module: mrp #: model:ir.actions.wizard,name:mrp.wizard_workcenter_load msgid "Workcenter load" -msgstr "Charge par poste" +msgstr "Charge du Centre de Travail" #. module: mrp #: view:mrp.procurement:0 @@ -1097,7 +1123,7 @@ msgstr "max" #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5 msgid "Exceptions procurements" -msgstr "Approvisionnements par exception" +msgstr "Approvisionnements en Exception" #. module: mrp #: field:mrp.procurement,product_uos:0 @@ -1107,22 +1133,17 @@ msgstr "" #. module: mrp #: field:mrp.production,location_src_id:0 msgid "Raw Products Location" -msgstr "" +msgstr "Emplacement des Produits Bruts" #. module: mrp #: view:mrp.production:0 msgid "Compute Data" -msgstr "Calculer données" - -#. module: mrp -#: view:mrp.production.lot.line:0 -msgid "Production Products Consommation" -msgstr "Consommation de produits de production" +msgstr "Calculer les Données" #. module: mrp #: field:mrp.procurement,product_uom:0 msgid "Product UoM" -msgstr "" +msgstr "UdM du Produit" #. module: mrp #: model:ir.model,name:mrp.model_mrp_workcenter @@ -1130,7 +1151,7 @@ msgstr "" #: field:mrp.routing.workcenter,workcenter_id:0 #: view:mrp.workcenter:0 msgid "Workcenter" -msgstr "Poste de charge" +msgstr "Centre de Travail" #. module: mrp #: wizard_button:product_price,init,price:0 @@ -1138,20 +1159,19 @@ msgid "Print product price" msgstr "Imprimer le prix du produit" #. module: mrp -#: field:mrp.procurement,purchase_id:0 -#: field:stock.warehouse.orderpoint,procurement_id:0 -msgid "Purchase Order" -msgstr "Commande d'achat" +#: field:mrp.production,picking_id:0 +msgid "Packing list" +msgstr "Liste des Colisages" #. module: mrp #: view:mrp.production:0 msgid "Start Production" -msgstr "Commencer la production" +msgstr "Démarrer la Production" #. module: mrp #: wizard_field:mrp.workcenter.load,init,measure_unit:0 msgid "Amount measuring unit" -msgstr "Unité de mesure" +msgstr "" #. module: mrp #: field:mrp.bom.revision,date:0 @@ -1161,7 +1181,7 @@ msgstr "Date de modification" #. module: mrp #: view:mrp.property.group:0 msgid "Properties categories" -msgstr "Catérogies de propriétés" +msgstr "Catégories des Propriétés" #. module: mrp #: field:mrp.bom,sequence:0 @@ -1179,36 +1199,30 @@ msgstr "min" #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2 msgid "Bill of Materials Components" -msgstr "" +msgstr "Composants de la Nomenclature" #. module: mrp #: view:mrp.production:0 #: view:mrp.production.product.line:0 msgid "Scheduled Products" -msgstr "" +msgstr "Produits Plannifiés" #. module: mrp -#: field:res.company,po_lead:0 -msgid "Purchase Lead Time" +#: view:mrp.production.lot.line:0 +msgid "Production Products Consommation" msgstr "" #. module: mrp #: view:mrp.production:0 msgid "Consumed Products" -msgstr "" +msgstr "Produits Concommés" #. module: mrp #: selection:mrp.bom,revision_type:0 msgid "numeric indices" -msgstr "Index numériques" +msgstr "Indices Numériques" #. module: mrp #: field:mrp.routing,location_id:0 msgid "Production Location" -msgstr "Emplacement de production" - -#. module: mrp -#: selection:stock.warehouse.orderpoint,logic:0 -msgid "Order to Max" -msgstr "Commander au max." - +msgstr "Emplacement de la Production" diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index e6139099b04..19965b42e67 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -902,7 +902,7 @@ class mrp_procurement(osv.osv): return True return False - def action_confirm(self, cr, uid, ids): + def action_confirm(self, cr, uid, ids, context={}): for procurement in self.browse(cr, uid, ids): if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: @@ -1012,27 +1012,11 @@ class mrp_procurement(osv.osv): 'notes':product.description_purchase, } - taxes = self.pool.get('account.tax').browse(cr, uid, - [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id]) - taxep = None - if partner_id: - taxep_id = self.pool.get('res.partner').property_get(cr, uid,partner_id,property_pref=['property_account_supplier_tax']).get('property_account_supplier_tax',False) - if taxep_id: - taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id) - if not taxep or not taxep.id: - taxes_ids = [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - taxes_ids = res5 - + taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id + self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, taxes) line.update({ 'taxes_id':[(6,0,taxes_ids)] }) - - purchase_id = self.pool.get('purchase.order').create(cr, uid, { 'origin': procurement.origin, 'partner_id': partner_id, diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index bec2216b0c5..1d93353d4bd 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -27,9 +27,19 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem id="menu_mrp_configuration" name="Configuration" parent="menu_mrp_root"/> - <menuitem id="menu_mrp_property_group_action_prop" name="Properties" parent="menu_mrp_configuration"/> - <menuitem action="mrp_property_group_action" id="menu_mrp_property_group_action" parent="menu_mrp_property_group_action_prop"/> + <menuitem + id="menu_mrp_configuration" + name="Configuration" + parent="menu_mrp_root"/> + <menuitem + id="menu_mrp_property_group_action_prop" + name="Properties" + parent="menu_mrp_configuration" + groups="base.group_extended"/> + <menuitem + action="mrp_property_group_action" + id="menu_mrp_property_group_action" + parent="menu_mrp_property_group_action_prop"/> <record id="mrp_property_tree_view" model="ir.ui.view"> <field name="name">mrp.property.tree</field> @@ -65,7 +75,10 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem action="mrp_property_action" id="menu_mrp_property_action" parent="menu_mrp_property_group_action_prop"/> + <menuitem + action="mrp_property_action" + id="menu_mrp_property_action" + parent="menu_mrp_property_group_action_prop"/> <!-- Workcenters @@ -216,20 +229,20 @@ <form string="Bill of Material"> <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/> <newline/> - <field name="name" select="1"/> - <field name="code" select="1"/> <field name="product_uom"/> <field name="product_qty"/> + <field name="name" select="1"/> + <field name="code" select="1"/> <newline/> <field name="product_uos" groups="product.group_uos"/> <field name="product_uos_qty" groups="product.group_uos"/> - <field name="routing_id" select="2"/> - <field name="type"/> + <field name="routing_id" select="2" groups="base.group_extended"/> + <field name="type" groups="base.group_extended"/> <notebook colspan="4"> <page string="General Information"> <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/> </page> - <page string="Revisions"> + <page string="Revisions" groups="base.group_extended"> <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/> </page> <page string="Properties"> @@ -242,7 +255,7 @@ <field name="date_stop" select="2"/> <field name="product_rounding"/> <field name="product_efficiency"/> - <field colspan="4" name="property_ids" nolabel="2"/> + <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/> </page> </notebook> </form> @@ -404,7 +417,7 @@ <group colspan="4" col="6"> <field name="name" select="1"/> <field name="date_planned" select="1"/> - <field name="priority"/> + <field name="priority" groups="base.group_extended"/> <field name="product_id" on_change="product_id_change(product_id)" select="1"/> <field name="product_qty"/> <field name="product_uom"/> @@ -656,12 +669,12 @@ <page string="Extra Information"> <separator colspan="4" string="Details"/> <field name="bom_id" select="2"/> - <field name="move_id"/> + <field name="move_id" groups="base.group_extended"/> <field name="date_close" select="2"/> - <field name="close_move"/> + <field name="close_move" groups="base.group_extended"/> <field name="purchase_id"/> <separator colspan="4" string="Properties"/> - <field colspan="4" name="property_ids" nolabel="1"/> + <field colspan="4" name="property_ids" nolabel="1" groups="base.group_extended"/> </page> </notebook> </form> diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml index cc35b509d5a..514da6d7d6f 100644 --- a/addons/mrp/mrp_wizard.xml +++ b/addons/mrp/mrp_wizard.xml @@ -1,22 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record id="wiz_mrp_proc0" model="ir.actions.wizard"> - <field name="name">Compute All Schedulers</field> - <field name="wiz_name">mrp.procurement.compute.all</field> - </record> + <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/> <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard"/> - <record id="wiz_mrp_proc1" model="ir.actions.wizard"> - <field name="name">Compute Procurements Only</field> - <field name="wiz_name">mrp.procurement.compute</field> - </record> + <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/> <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/> - <record id="wiz_mrp_proc2" model="ir.actions.wizard"> - <field name="name">Compute Stock Minimum Rules Only</field> - <field name="wiz_name">mrp.procurement.orderpoint.compute</field> - </record> + <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/> <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/> <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/> diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 583de318410..866ad784349 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" ?> <openerp> <data> @@ -13,7 +12,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_minimumstockrule0" model="process.node"> @@ -43,6 +42,7 @@ <field eval=""""Procurements"""" name="name"/> <field eval=""""Procurement Orders"""" name="note"/> <field name="process_id" ref="purchase.process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -54,6 +54,7 @@ <field eval=""""Production order"""" name="name"/> <field eval=""""Procurement for raw materials"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -109,6 +110,7 @@ <field eval=""""Subcontracting"""" name="name"/> <field eval=""""Procure method is purchase"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -128,7 +130,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Stockable make to stock"""" name="name"/> + <field eval=""""Stockable stock"""" name="name"/> <field eval=""""Wait for available products for reservation"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> @@ -139,7 +141,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Stockable make to order"""" name="name"/> + <field eval=""""Stockable order"""" name="name"/> <field eval=""""If Procurement is make to order"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> @@ -153,6 +155,7 @@ <field eval=""""Stockable request"""" name="name"/> <field eval=""""If procure method is purchase"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -161,16 +164,25 @@ <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""Stockable production"""" name="name"/> + <field eval=""""Stock produce"""" name="name"/> <field eval=""""If procure method is produce"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state=='confirmed'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> <!-- - Process Transition - --> + Process Transition + --> + + <record id="res_roles_mrp0" model="res.roles"> + <field eval=""""Mrp"""" name="name"/> + </record> + + <record id="mrp.trans_draft_confirm" model="workflow.transition"> + <field name="role_id" ref="res_roles_mrp0"/> + </record> <record id="process_transition_productionprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -215,6 +227,7 @@ <field eval=""""If procure method is Make to order and supply method is buy"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_subcontracting0"/> <field model="process.node" name="source_node_id" ref="process_node_maketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_procurementstockable0" model="process.transition"> @@ -251,6 +264,7 @@ <field eval=""""If Procure method is Make to order and supply method is buy"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_stockablerequest0"/> <field model="process.node" name="source_node_id" ref="process_node_stockablemaketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_stockableorderproduction0" model="process.transition"> @@ -260,6 +274,7 @@ <field eval=""""If Procure method is Make to order and supply method is produce"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_stockableproduction0"/> <field model="process.node" name="source_node_id" ref="process_node_stockablemaketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_procurementtopurchase0" model="process.transition"> @@ -298,5 +313,97 @@ <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> </record> + <!-- + Process Condition + --> + + <record id="process_condition_serviceprocure0" model="process.condition"> + <field name="model_id" ref="model_mrp_procurement"/> + <field name="node_id" ref="process_node_serviceproduct0"/> + <field eval=""""object.product_id.type=='service'"""" name="model_states"/> + <field eval=""""Condition_service_procure"""" name="name"/> + </record> + + <record id="process_condition_stockableprocure0" model="process.condition"> + <field name="model_id" ref="model_mrp_procurement"/> + <field name="node_id" ref="process_node_stockableproduct0"/> + <field eval=""""object.product_id.type=='product'"""" name="model_states"/> + <field eval=""""Condition_stockable_procure"""" name="name"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_procurementpurchaseorder0" model="process.transition.action"> + <field eval=""""action_po_assign"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Purchase"""" name="name"/> + <field name="transition_id" ref="process_transition_procurementtopurchase0"/> + </record> + + <record id="process_transition_action_orderconfirmsubcontracting0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_ordercancelsubcontracting0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_runprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_stockableconfirmrequest0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_stockablecancelrequest0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_requestrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_stockableconfirmproduction0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + + <record id="process_transition_action_stockablecancelproduction0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + + <record id="process_transition_action_productionrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py index 98f4bf1c0fb..6e2cf896660 100644 --- a/addons/mrp/report/order.py +++ b/addons/mrp/report/order.py @@ -39,4 +39,7 @@ class order(report_sxw.rml_parse): }) -report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order, header=2) + +report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header=1) + + diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index b9d62c5138f..341793ee79d 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -91,16 +91,19 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> + <paraStyle name="P1" fontName="Helvetica" fontSize="16.0" leading="20"/> - <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="11"/> + <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="11"/> <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11"/> <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/> <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/> <paraStyle name="P7" fontName="Helvetica-Oblique" fontSize="9.0" leading="11"/> <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/> + <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/> + <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER"/> <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/> <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/> @@ -118,6 +121,7 @@ <paraStyle name="P23" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> <paraStyle name="P24" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/> <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="16.0" leading="20"/> + <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"/> @@ -142,8 +146,10 @@ <font color="white"> </font> </para> <blockTable colWidths="74.0,88.0,78.0,89.0,199.0" repeatRows="1" style="Table1"> + <tr> <td> + <para style="terp_tblheader_General_Centre">Printing date</para> </td> <td> @@ -157,6 +163,7 @@ </td> <td> <para style="terp_tblheader_General_Centre">Product Name</para> + </td> </tr> </blockTable> @@ -164,6 +171,7 @@ <blockTable colWidths="74.0,88.0,78.0,89.0,199.0" style="Table2"> <tr> <td> + <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y') ]]</para> </td> <td> @@ -177,10 +185,12 @@ </td> <td> <para style="terp_default_Centre_8">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para> + </td> </tr> </blockTable> </section> + <para style="P2"> <font color="white"> </font> </para> @@ -200,10 +210,10 @@ <tr> <td> <para style="P3">[[ repeatIn(o.move_lines,'line') ]]</para> - <para style="P3">[[ '['+line.product_id.code +']' ]][[ line.product_id.name ]]</para> + <para style="P3">[[ '['+line.product_id.code +']' ]] [[ line.product_id.name ]]</para> </td> <td> - <para style="P5">[[ line.product_qty ]] [[line.product_uom.name]]</para> + <para style="P5">[[ '%.2f' % line.product_qty ]] [[line.product_uom.name]]</para> </td> </tr> </blockTable> diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index 7785ce8bcfa..c3bacf6e833 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -1,21 +1,32 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0 -access_mrp_property_group,mrp.property.group,model_mrp_property_group,mrp.group_mrp_user,1,0,0,0 -access_mrp_property,mrp.property,model_mrp_property,mrp.group_mrp_user,1,0,0,0 -access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0 -access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0 -access_mrp_bom,mrp.bom,model_mrp_bom,mrp.group_mrp_user,1,0,0,0 -access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,mrp.group_mrp_user,1,0,0,0 -access_mrp_production,mrp.production,model_mrp_production,mrp.group_mrp_user,1,1,1,1 -access_mrp_production_workcenter_line,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1 -access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,mrp.group_mrp_user,1,1,1,1 -access_mrp_procurement,mrp.procurement,model_mrp_procurement,mrp.group_mrp_user,1,1,1,1 -access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0 -access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint.manager,model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,1,1,1 -access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_user,1,1,1,1 -access_mrp_property_group_manager,mrp.property.group.manager,model_mrp_property_group,mrp.group_mrp_user,1,1,1,1 -access_mrp_property_manager,mrp.property.manager,model_mrp_property,mrp.group_mrp_user,1,1,1,1 -access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_user,1,1,1,1 -access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_user,1,1,1,1 -access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_user,1,1,1,1 -access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0 +"access_mrp_property_group","mrp.property.group","model_mrp_property_group","mrp.group_mrp_user",1,0,0,0 +"access_mrp_property","mrp.property","model_mrp_property","mrp.group_mrp_user",1,0,0,0 +"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0 +"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0 +"access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0 +"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","mrp.group_mrp_user",1,0,0,0 +"access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1 +"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1 +"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1 +"access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1 +"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","mrp.group_mrp_user",1,0,0,0 +"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint.manager","model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,1,1,1 +"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1 +"access_mrp_property_group_manager","mrp.property.group.manager","model_mrp_property_group","mrp.group_mrp_user",1,1,1,1 +"access_mrp_property_manager","mrp.property.manager","model_mrp_property","mrp.group_mrp_user",1,1,1,1 +"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_user",1,1,1,1 +"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1 +"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_user",1,1,1,1 +"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1 +"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0 +"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,1 +"access_stock_picking_mrp_worker","stock.picking mrp_worker","stock.model_stock_picking","mrp.group_mrp_user",1,1,1,1 +"access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0 +"access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0 +"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0 +"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0 +"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0 +"access_hr_timesheet_group_mrp_worker","hr.timesheet.group mrp_worker","hr.model_hr_timesheet_group","mrp.group_mrp_user",1,0,0,0 +"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,0,0,0 +"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0 diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index 9118fe051ae..8cd84d7df6b 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_mrp_manager" model="res.groups"> <field name="name">Manufacturing / Manager</field> @@ -9,5 +9,12 @@ <field name="name">Manufacturing / Worker</field> </record> + + <!-- restrict access to menu --> + <record model='ir.ui.menu' id="mrp_Sched_all"> + <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/> + </record> + + </data> </openerp> diff --git a/addons/mrp_operations/i18n/fr_FR.po b/addons/mrp_operations/i18n/fr_FR.po index 25a483c9e4e..cbba5fd91e4 100755..100644 --- a/addons/mrp_operations/i18n/fr_FR.po +++ b/addons/mrp_operations/i18n/fr_FR.po @@ -4,32 +4,36 @@ # 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:29+0000\n" +"PO-Revision-Date: 2008-10-13 13:44+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 13:52+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: mrp_operations #: 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: mrp_operations #: selection:mrp.production.workcenter.line,state:0 #: view:mrp.production.workcenter.line:0 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #. module: mrp_operations #: selection:mrp_operations.operation.code,start_stop:0 msgid "Stop" -msgstr "" +msgstr "Arrêter" #. module: mrp_operations #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code @@ -39,27 +43,27 @@ msgstr "" #. module: mrp_operations #: selection:mrp_operations.operation.code,start_stop:0 msgid "Start" -msgstr "" +msgstr "Démarrer" #. module: mrp_operations #: field:mrp_operations.operation,production_id:0 msgid "Production" -msgstr "" +msgstr "Production" #. module: mrp_operations #: selection:mrp.production.workcenter.line,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: mrp_operations #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action msgid "Production Orders to Do" -msgstr "" +msgstr "Ordres de Production à Faire" #. module: mrp_operations #: view:mrp.production.workcenter.line:0 msgid "Set Draft" -msgstr "" +msgstr "Mettre en brouillon" #. module: mrp_operations #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action @@ -70,89 +74,79 @@ msgstr "" #: field:mrp_operations.operation.code,start_stop:0 #: field:mrp.production.workcenter.line,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: mrp_operations #: rml:mrp.code.barcode:0 msgid ")" -msgstr "" +msgstr ")" #. module: mrp_operations #: rml:mrp.code.barcode:0 msgid "(" -msgstr "" +msgstr "(" #. module: mrp_operations #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode msgid "Workcenters Barcode" -msgstr "" +msgstr "Code-barre des Centres de Travail" #. module: mrp_operations #: field:mrp.production.workcenter.line,delay:0 msgid "delay" -msgstr "" +msgstr "Délai" #. module: mrp_operations #: view:mrp_operations.operation:0 msgid "Production Operation" -msgstr "" +msgstr "Opération de Production" #. module: mrp_operations #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action msgid "Waiting Production Orders" -msgstr "" +msgstr "Ordres de Production en attente" #. module: mrp_operations #: field:mrp_operations.operation.code,name:0 msgid "Operation Name" -msgstr "" +msgstr "Nom de l'Opération" #. module: mrp_operations -#: field:mrp.production.workcenter.line,date_finnished:0 -msgid "End Date" -msgstr "" +#: view:mrp_operations.operation.code:0 +msgid "Production Operation Code" +msgstr "Code d'Opération de Production" #. module: mrp_operations #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: mrp_operations #: field:mrp_operations.operation,workcenter_id:0 msgid "Workcenter" -msgstr "" - -#. module: mrp_operations -#: view:mrp_operations.operation.code:0 -msgid "Production Operation Code" -msgstr "" +msgstr "Centre de Travail" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action msgid "Confirm Operations" -msgstr "" +msgstr "Confirmer les Opérations" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action msgid "Draft Operations" -msgstr "" - -#. module: mrp_operations -#: field:mrp.production.workcenter.line,date_start:0 -msgid "Start Date" -msgstr "" +msgstr "Opérations Brouillon" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action msgid "Operations" -msgstr "" +msgstr "Opérations" #. module: mrp_operations #: field:mrp_operations.operation.code,code:0 #: field:mrp_operations.operation,code_id:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: mrp_operations #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode @@ -162,14 +156,14 @@ msgstr "" #. module: mrp_operations #: selection:mrp.production.workcenter.line,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulé" #. module: mrp_operations #: selection:mrp_operations.operation.code,start_stop:0 #: selection:mrp.production.workcenter.line,state:0 #: view:mrp.production.workcenter.line:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: mrp_operations #: model:ir.model,name:mrp_operations.model_mrp_operations_operation @@ -180,15 +174,14 @@ msgstr "" #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action msgid "All Operations" -msgstr "" +msgstr "Toutes les Opérations" #. module: mrp_operations #: view:mrp.production.workcenter.line:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action msgid "Operation" -msgstr "" - +msgstr "Opération" diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index d9063f6c2d1..a16808be3ac 100755 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -2,160 +2,160 @@ <openerp> <data> - <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit"> - <field name="name">mrp.production.workcenter.line.inherit.tree</field> - <field name="model">mrp.production.workcenter.line</field> - <field name="inherit_id" ref="mrp.mrp_production_workcenter_tree_view"/> - <field name="type">tree</field> - <field name="arch" type="xml"> - <field name="hour" position="after"> - <button name="button_done" string="Finished" states="startworking"/> - <button name="button_start_working" string="Start working" states="draft,pause"/> - <field name="uom"/> - <field name="qty"/> - <field name="product"/> - <field name="production_id"/> - <field name="state" /> - </field> - </field> - </record> - - <record model="ir.ui.view" id="mrp_production_workcenter_form_view_inherit"> - <field name="name">mrp.production.workcenter.line.form.inherit</field> - <field name="model">mrp.production.workcenter.line</field> - <field name="type">form</field> - <field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/> - <field name="arch" type="xml"> - <field name="hour" position="after"> - <group colspan="8" col="8"> - <field name="state" select="2"/> - <button name="button_draft" string="Set Draft" states="cancel"/> - <button name="button_start_working" string="Start working" states="draft"/> - <button name="button_resume" string="Resume" states="pause"/> - <button name="button_done" string="Finished" states="startworking"/> - <button name="button_pause" string="Pause" states="startworking"/> - <button name="button_cancel" string="Cancel" states="draft,startworking"/> - </group> - <field name="delay"/> - <field name="production_id"/> - </field> - </field> - </record> - - <!-- Action for tree view of workcenter line --> - - <record model="ir.actions.act_window" id="mrp_production_wc_action_form"> - <field name="name">Work Order</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production.workcenter.line</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="domain">[('id','=',active_id)]</field> - </record> - - <!-- Action for All Operations --> - - <record model="ir.actions.act_window" id="mrp_production_wc_action"> - <field name="name">All Work Order</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production.workcenter.line</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> - </record> - - <!-- Action for Confirm Operations --> - - <record model="ir.actions.act_window" id="mrp_production_wc_confirm_action"> - <field name="name">Confirm Work Order</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production.workcenter.line</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> - <field name="domain">[('state','=','confirm')]</field> - </record> - - <!-- Action for Draft Operations --> - - <record model="ir.actions.act_window" id="mrp_production_wc_draft_action"> - <field name="name">Draft Work Order</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production.workcenter.line</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,graph</field> - <field name="domain">[('state','=','draft')]</field> - </record> - - <record model="ir.values" id="mrp_production_wc_action_open"> - <field name="key2" eval="'tree_but_open'"/> - <field name="model" eval="'mrp.production.workcenter.line'"/> - <field name="name">Work Order</field> - <field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/> - <field name="object" eval="True"/> - - </record> - - <menuitem name="All Work Order" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/> - <menuitem name="Production Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/> - <menuitem name="Waiting Production Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/> + <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit"> + <field name="name">mrp.production.workcenter.line.inherit.tree</field> + <field name="model">mrp.production.workcenter.line</field> + <field name="inherit_id" ref="mrp.mrp_production_workcenter_tree_view"/> + <field name="type">tree</field> + <field name="arch" type="xml"> + <field name="hour" position="after"> + <button name="button_done" string="Finished" states="startworking"/> + <button name="button_start_working" string="Start working" states="draft,pause"/> + <field name="uom"/> + <field name="qty"/> + <field name="product"/> + <field name="production_id"/> + <field name="state" /> + </field> + </field> + </record> + + <record model="ir.ui.view" id="mrp_production_workcenter_form_view_inherit"> + <field name="name">mrp.production.workcenter.line.form.inherit</field> + <field name="model">mrp.production.workcenter.line</field> + <field name="type">form</field> + <field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/> + <field name="arch" type="xml"> + <field name="hour" position="after"> + <group colspan="8" col="8"> + <field name="state" select="2"/> + <button name="button_draft" string="Set Draft" states="cancel"/> + <button name="button_start_working" string="Start working" states="draft"/> + <button name="button_resume" string="Resume" states="pause"/> + <button name="button_done" string="Finished" states="startworking"/> + <button name="button_pause" string="Pause" states="startworking"/> + <button name="button_cancel" string="Cancel" states="draft,startworking"/> + </group> + <field name="delay"/> + <field name="production_id"/> + </field> + </field> + </record> + + <!-- Action for tree view of workcenter line --> + + <record model="ir.actions.act_window" id="mrp_production_wc_action_form"> + <field name="name">Work Order</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production.workcenter.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('id','=',active_id)]</field> + </record> + + <!-- Action for All Operations --> + + <record model="ir.actions.act_window" id="mrp_production_wc_action"> + <field name="name">All Work Order</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production.workcenter.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,graph</field> + </record> + + <!-- Action for Confirm Operations --> + + <record model="ir.actions.act_window" id="mrp_production_wc_confirm_action"> + <field name="name">Confirm Work Order</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production.workcenter.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,graph</field> + <field name="domain">[('state','=','confirm')]</field> + </record> + + <!-- Action for Draft Operations --> + + <record model="ir.actions.act_window" id="mrp_production_wc_draft_action"> + <field name="name">Draft Work Order</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production.workcenter.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,graph</field> + <field name="domain">[('state','=','draft')]</field> + </record> + + <record model="ir.values" id="mrp_production_wc_action_open"> + <field name="key2" eval="'tree_but_open'"/> + <field name="model" eval="'mrp.production.workcenter.line'"/> + <field name="name">Work Order</field> + <field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/> + <field name="object" eval="True"/> + + </record> + + <menuitem name="All Work Order" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/> + <menuitem name="Work Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/> + <menuitem name="Waiting Work Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/> <!-- Operation codes --> - <record model="ir.ui.view" id="mrp_production_code_tree_view"> - <field name="name">mrp.production.code.tree</field> - <field name="model">mrp_operations.operation.code</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree string="Production Operation Code"> - <field name="name" select="1"/> - <field name="code" select="1"/> - <field name="start_stop" select="1"/> - </tree> - </field> - </record> - - <record model="ir.ui.view" id="mrp_production_code_form_view"> - <field name="name">mrp.production.code.form</field> - <field name="model">mrp_operations.operation.code</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Production Operation Code"> - <field name="name" select="1"/> - <field name="code" select="1"/> - <field name="start_stop" select="1"/> - </form> - </field> - </record> - - <record model="ir.actions.act_window" id="mrp_production_code_action"> - <field name="name">Operations Code</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp_operations.operation.code</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" ref="mrp_production_code_tree_view"/> - </record> - - <menuitem name="Start - Stop Codes" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_code_action" action="mrp_production_code_action"/> + <record model="ir.ui.view" id="mrp_production_code_tree_view"> + <field name="name">mrp.production.code.tree</field> + <field name="model">mrp_operations.operation.code</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Production Operation Code"> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="start_stop" select="1"/> + </tree> + </field> + </record> + + <record model="ir.ui.view" id="mrp_production_code_form_view"> + <field name="name">mrp.production.code.form</field> + <field name="model">mrp_operations.operation.code</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Production Operation Code"> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="start_stop" select="1"/> + </form> + </field> + </record> + + <record model="ir.actions.act_window" id="mrp_production_code_action"> + <field name="name">Operations Code</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp_operations.operation.code</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="view_id" ref="mrp_production_code_tree_view"/> + </record> + + <menuitem name="Start - Stop Codes" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_code_action" action="mrp_production_code_action"/> <!-- Operations --> - <record model="ir.ui.view" id="mrp_production_operation_tree_view"> - <field name="name">mrp.production.operation.tree</field> - <field name="model">mrp_operations.operation</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree string="Production Operation" editable="top"> - <field name="production_id"/> - <field name="workcenter_id"/> - <field name="code_id"/> - <field name="date_start"/> - <field name="date_finished"/> - <field name="order_date"/> - </tree> - </field> - </record> - - <record id="graph_in_hrs_workcenter" model="ir.ui.view"> + <record model="ir.ui.view" id="mrp_production_operation_tree_view"> + <field name="name">mrp.production.operation.tree</field> + <field name="model">mrp_operations.operation</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Production Operation" editable="top"> + <field name="production_id"/> + <field name="workcenter_id"/> + <field name="code_id"/> + <field name="date_start"/> + <field name="date_finished"/> + <field name="order_date"/> + </tree> + </field> + </record> + + <record id="graph_in_hrs_workcenter" model="ir.ui.view"> <field name="name">graph.in.hrs.workcenter</field> <field name="model">mrp.production.workcenter.line</field> <field name="type">graph</field> @@ -169,42 +169,46 @@ - <!--<record model="ir.ui.view" id="mrp_production_operation_form_view"> - <field name="name">mrp.production.operation.form</field> - <field name="model">mrp_operations.operation</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Production Operation"> - <field name="production_id" select="1"/> - <field name="workcenter_id" select="1"/> - <field name="code_id" select="1"/> - </form> - </field> - </record> + <!--<record model="ir.ui.view" id="mrp_production_operation_form_view"> + <field name="name">mrp.production.operation.form</field> + <field name="model">mrp_operations.operation</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Production Operation"> + <field name="production_id" select="1"/> + <field name="workcenter_id" select="1"/> + <field name="code_id" select="1"/> + </form> + </field> + </record> --> - <record model="ir.actions.act_window" id="mrp_production_operation_action"> - <field name="name">Operations</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp_operations.operation</field> - <field name="view_type">form</field> - <field name="view_mode">tree,calendar,form</field> - <field name="view_id" ref="mrp_production_operation_tree_view"/> - </record> - <menuitem name="Operations to Manufacturing" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_main"/> - <menuitem name="Operations" parent="menu_mrp_production_operation_main" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/> - - <record model="ir.ui.view" id="operation_calendar_view"> - <field name="name">mrp.perations.calendar</field> - <field name="model">mrp_operations.operation</field> - <field name="type">calendar</field> - <field name="priority" eval="2"/> - <field name="arch" type="xml"> - <calendar string="Calendar View" date_start="order_date" color="workcenter_id"> - <field name="date_start"/> - <field name="date_finished"/> - </calendar> - </field> - </record> + <record model="ir.actions.act_window" id="mrp_production_operation_action"> + <field name="name">Operations</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp_operations.operation</field> + <field name="view_type">form</field> + <field name="view_mode">tree,calendar,form</field> + <field name="view_id" ref="mrp_production_operation_tree_view"/> + </record> + + <menuitem + name="Work Order Events Using Bar Codes" + parent="mrp.menu_mrp_root" + id="menu_mrp_production_operation_action" + action="mrp_production_operation_action"/> + + <record model="ir.ui.view" id="operation_calendar_view"> + <field name="name">mrp.perations.calendar</field> + <field name="model">mrp_operations.operation</field> + <field name="type">calendar</field> + <field name="priority" eval="2"/> + <field name="arch" type="xml"> + <calendar string="Calendar View" date_start="order_date" color="workcenter_id"> + <field name="date_start"/> + <field name="date_finished"/> + </calendar> + </field> + </record> </data> </openerp> diff --git a/addons/partner_ldap/__init__.py b/addons/partner_ldap/__init__.py new file mode 100644 index 00000000000..3ce9f39c009 --- /dev/null +++ b/addons/partner_ldap/__init__.py @@ -0,0 +1,5 @@ +# -*- encoding: utf-8 -*- +import partner +import wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/partner_ldap/__terp__.py b/addons/partner_ldap/__terp__.py new file mode 100644 index 00000000000..a04691edf52 --- /dev/null +++ b/addons/partner_ldap/__terp__.py @@ -0,0 +1,18 @@ +# -*- encoding: utf-8 -*- +{ + "name" : "Partner extension to synchronize TinyERP with ldap", + "version" : "1.0", + "author" : "Tiny", + "depends" : ["base", "hr", "process"], + "category" : "Generic Modules/Inventory Control", + "description": "Synchronise partners through a LDAP module. Has been used to synchronise partners in Outlook and Tiny ERP.", + "init_xml" : [], + "demo_xml" : [], + "update_xml" : ["wizard.xml", + "process/partner_ldap_process.xml" + ], + "active": False, + "installable": True +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/partner_ldap/partner.py b/addons/partner_ldap/partner.py new file mode 100644 index 00000000000..1bc3376356f --- /dev/null +++ b/addons/partner_ldap/partner.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 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. +# +############################################################################## + +from osv import osv, fields + +class address_ldap(osv.osv): + _inherit = 'res.partner.address' + + _columns = { + 'dn' : fields.char('Distinguished name', size=128), + } + +address_ldap() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/partner_ldap/process/partner_ldap_process.xml b/addons/partner_ldap/process/partner_ldap_process.xml new file mode 100644 index 00000000000..71b3a1d2182 --- /dev/null +++ b/addons/partner_ldap/process/partner_ldap_process.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="process_node_ldap0" model="process.node"> + <field name="model_id" ref="base.model_res_partner_address"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""LDAP"""" name="name"/> + <field eval=""""LDAP (all services)"""" name="note"/> + <field name="process_id" ref="hr.process_process_employeecontractworkflow0"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_transition_employeeldap0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Employee LDAP"""" name="name"/> + <field eval=""""Employee get all services of that company"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_ldap0"/> + <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/> + </record> + + <record id="process_transition_ldapuser0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""LDAP User"""" name="name"/> + <field eval=""""Create your own openerp user"""" name="note"/> + <field model="process.node" name="target_node_id" ref="hr.process_node_openerpuser0"/> + <field model="process.node" name="source_node_id" ref="process_node_ldap0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/partner_ldap/wizard.xml b/addons/partner_ldap/wizard.xml new file mode 100644 index 00000000000..1785d5c7328 --- /dev/null +++ b/addons/partner_ldap/wizard.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" ?> +<terp> + <data> + <wizard string="Synchronize with ldap" model="res.partner.address" name="partners.sync_ldap" id="wizard_ldap_sync" /> + <menuitem name="Partners/Synchronize With Ldap" action="wizard_ldap_sync" type="wizard" /> + </data> +</terp> diff --git a/addons/partner_ldap/wizard/__init__.py b/addons/partner_ldap/wizard/__init__.py new file mode 100644 index 00000000000..4f0d100c6ac --- /dev/null +++ b/addons/partner_ldap/wizard/__init__.py @@ -0,0 +1,4 @@ +# -*- encoding: utf-8 -*- +import synchronize +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/partner_ldap/wizard/synchronize.py b/addons/partner_ldap/wizard/synchronize.py new file mode 100644 index 00000000000..8cf96f9a727 --- /dev/null +++ b/addons/partner_ldap/wizard/synchronize.py @@ -0,0 +1,149 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2005-2006 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 sys +if sys.version_info[:2] < (2, 4): + from sets import Set as set + +import time +import ldap +import ldap.modlist + +import wizard +import pooler + +BASE_DN = 'ou=addressbook,dc=localdomain' + +def terp2ldap(data): + res = {} + for ldap_name, terp in LDAP_TERP_MAPPER.items(): + if callable(terp) and terp(data): + res[ldap_name] = [terp(data)] + elif isinstance(terp, basestring) and data[terp]: + res[ldap_name] = ['%s' % data[terp]] + return res + +def get_lastname(dico): + lnames = dico['name'].split(' ', 1)[1:] + if lnames: + return ' '.join(lnames) + else: + return dico['name'] + +def get_street(dico): + return ' '.join([dico[x] for x in ('street', 'street2') if dico[x]]) + +def get_name(attribute): + def func(dico): + return dico[attribute][1] + return func + + +LDAP_TERP_MAPPER = { + 'displayname': 'name', + 'mail': 'email', + 'o': get_name('partner_id'), + 'telephoneNumber': 'phone', + 'street': get_street, + 'postalcode': 'zip', + 'l': 'city', + 'cn': 'name', + 'sn': get_lastname, + 'uid': 'id', + } + + +class sync_ldap(wizard.interface): + + _login_arch = '''<?xml version="1.0" ?> + <form string="LDAP Credentials"> + <field name="ldap_host" colspan="4" /> + <field name="dn" colspan="4" /> + <field name="password" colspan="4" /> + </form> + ''' + + _login_fields = { + 'ldap_host': {'string': 'LDAP Host', 'type': 'char', 'size': 128}, + 'dn': {'string': 'Distinguished name', 'type': 'char', 'size': 128}, + 'password': {'string': 'Password', 'type': 'char', 'size': 128}, + } + + def _do_sync(self, cr, uid, data, context): + l = ldap.open(data['form']['ldap_host']) + l.simple_bind_s(data['form']['dn'], data['form']['password']) + ldap_objs = dict(l.search_s(BASE_DN, ldap.SCOPE_ONELEVEL, 'objectclass=*', + LDAP_TERP_MAPPER.keys())) + address = pooler.get_pool(cr.dbname).get('res.partner.address') + terp_objs = dict([(x['id'], x) for x in address.read(cr, uid, address.search(cr, uid, []))]) + ldap_set = [int(x['uid'][0]) for x in ldap_objs.values()] + terp_set = terp_objs.keys() + for to_delete in ldap_set: + if to_delete in terp_set: + continue + l.delete_s('uid=%s,%s' % (to_delete, BASE_DN)) + for to_add in terp_set: + if to_add in ldap_set: + continue + new_dn = 'uid=%s,%s' % (to_add, BASE_DN) + ldap_data = {'objectclass' : ['organizationalPerson', 'inetOrgPerson']} + ldap_data.update(terp2ldap(terp_objs[to_add])) + l.add_s(new_dn, ldap.modlist.addModlist(ldap_data)) + address.write(cr, uid, [to_add], {'dn' : new_dn}) + for to_update in terp_set: + if to_update not in ldap_set: + continue + current_dn = 'uid=%s,%s' % (to_update, BASE_DN) + modlist = ldap.modlist.modifyModlist(ldap_objs[current_dn], terp2ldap(terp_objs[to_update])) + if modlist: + l.modify_s(current_dn, modlist) + return {} + + states = { + 'init' : { + 'actions' : [], + 'result' : { + 'type' : 'form', + 'arch' : _login_arch, + 'fields' : _login_fields, + 'state' : (('end', 'Cancel'),('sync', 'Synchronize')) + }, + }, + 'sync' : { + 'actions' : [ _do_sync ], + 'result' : { 'type' : 'state', 'state' : 'end' }, + }, + } + + +sync_ldap('partners.sync_ldap') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/point_of_sale/i18n/fr_FR.po b/addons/point_of_sale/i18n/fr_FR.po index f3273f9ad65..d4592e134ca 100644 --- a/addons/point_of_sale/i18n/fr_FR.po +++ b/addons/point_of_sale/i18n/fr_FR.po @@ -4,113 +4,114 @@ # 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:32+0000\n" +"PO-Revision-Date: 2008-10-13 14:37+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 14:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: point_of_sale +#: rml:pos.invoice:0 +msgid "Invoice Date:" +msgstr "Date de Facture :" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Total paid" -msgstr "" +msgstr "Total Payé" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Qty of product" -msgstr "" +msgstr "Qté de Produits" #. module: point_of_sale #: view:pos.order:0 msgid "Set to draft" -msgstr "" +msgstr "Mettre en brouillon" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_transaction_pos msgid "transaction for the pos" -msgstr "" +msgstr "Transaction du Point de vente" #. module: point_of_sale #: wizard_view:pos.discount,init:0 msgid "Discount :" -msgstr "" +msgstr "Remise :" #. module: point_of_sale #: field:pos.order,name:0 msgid "Order Description" -msgstr "" +msgstr "Description de la Commande" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Document" -msgstr "" +msgstr "Document" #. module: point_of_sale #: wizard_view:pos.add_product,init:0 msgid "Add product :" -msgstr "" +msgstr "Ajouter Produit :" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2 msgid "Orders of the day" -msgstr "" +msgstr "Commandes du jour" #. module: point_of_sale #: wizard_view:pos.sale.get,init:0 msgid "Select an Open Sale Order" -msgstr "" - -#. module: point_of_sale -#: rml:pos.invoice:0 -msgid "Invoice Date" -msgstr "" - -#. module: point_of_sale -#: rml:pos.invoice:0 -msgid "Total (inclu. taxes):" -msgstr "" +msgstr "Sélectionnez une Commande Ouverte" #. module: point_of_sale #: rml:pos.receipt:0 msgid "," -msgstr "" +msgstr "," #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail msgid "Details of Sales" -msgstr "" +msgstr "Détail de la vente" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Base" -msgstr "" +msgstr "Base" + +#. module: point_of_sale +#: rml:pos.invoice:0 +msgid "Fax :" +msgstr "Fax :" #. module: point_of_sale #: field:pos.order.line,price_subtotal:0 msgid "Subtotal" -msgstr "" +msgstr "Sous-total" #. module: point_of_sale #: wizard_view:pos.payment,ask_pay:0 msgid "Add payment :" -msgstr "" +msgstr "Ajouter un paiement :" #. module: point_of_sale #: field:pos.order,shop_id:0 msgid "Shop" -msgstr "" +msgstr "Magasin" #. module: point_of_sale #: wizard_button:pos.refund_order,init,refund_n_quit:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: point_of_sale #: field:pos.order,last_out_picking:0 @@ -126,63 +127,63 @@ msgstr "" #: field:pos.order,note:0 #: view:pos.order:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: point_of_sale #: wizard_field:pos.sale.get,init,picking_id:0 msgid "Sale Order" -msgstr "" +msgstr "Commande client" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Detail of Sales" -msgstr "" +msgstr "Détail des Ventes" #. module: point_of_sale #: rml:pos.invoice:0 #: rml:pos.lines:0 #: field:pos.order,amount_tax:0 msgid "Taxes" -msgstr "" +msgstr "Taxes" #. module: point_of_sale #: field:report.transaction.pos,no_trans:0 msgid "Number of transaction" -msgstr "" +msgstr "Nombre de Transactions" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day msgid "Sale line" -msgstr "" +msgstr "Ligne de Vente" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Mode of Taxes" -msgstr "" +msgstr "Mode des Taxes" #. module: point_of_sale #: rml:pos.details:0 #: field:pos.config.journal,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: point_of_sale #: wizard_field:pos.refund_order,init,date_validity:0 #: field:pos.order,date_validity:0 msgid "Validity Date" -msgstr "" +msgstr "Date de validité" #. module: point_of_sale -#: rml:pos.invoice:0 -msgid "Partner Code" -msgstr "" +#: wizard_field:pos.config.journal,init,default_journal_gift:0 +msgid "Default gift journal" +msgstr "Journal des Bons par défaut" #. module: point_of_sale #: rml:pos.details:0 msgid "VAT" -msgstr "" +msgstr "TVA" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_refund @@ -192,12 +193,12 @@ msgstr "" #. module: point_of_sale #: wizard_view:pos.config.journal,init:0 msgid "Select default journals" -msgstr "" +msgstr "Sélectionnez le Journal par défaut" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Tax" -msgstr "" +msgstr "Taxe" #. module: point_of_sale #: view:report.transaction.pos:0 @@ -207,118 +208,108 @@ msgstr "" #. module: point_of_sale #: rml:pos.details:0 msgid "Disc" -msgstr "" +msgstr "Rem." #. module: point_of_sale #: rml:pos.lines:0 msgid "Journal:" -msgstr "" - -#. module: point_of_sale -#: rml:pos.invoice:0 -msgid "Fax :" -msgstr "" +msgstr "Journal :" #. module: point_of_sale #: field:pos.order,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partenaire" #. module: point_of_sale #: view:pos.order:0 msgid "Payments" -msgstr "" +msgstr "Paiements" #. module: point_of_sale #: field:pos.order,payments:0 msgid "Order Payments" -msgstr "" +msgstr "Paiements des commandes" #. module: point_of_sale #: rml:pos.receipt:0 msgid "Tel :" -msgstr "" +msgstr "Tél. :" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Total of the day" -msgstr "" +msgstr "Total du Jour" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_confirm #: wizard_button:pos.sale.get,init,set:0 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #. module: point_of_sale #: view:pos.order:0 msgid "POS Orders" -msgstr "" +msgstr "Commandes Point de Vente" #. module: point_of_sale #: rml:pos.invoice:0 #: rml:pos.lines:0 msgid "Disc. (%)" -msgstr "" +msgstr "Rem. (%)" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Sales total" -msgstr "" +msgstr "Total des Ventes" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Supplier Invoice" -msgstr "" +msgstr "Facture fournisseur" #. module: point_of_sale #: field:pos.order,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: point_of_sale #: view:pos.order.line:0 msgid "Sum of subtotals" -msgstr "" +msgstr "Somme des sous-totaux" #. module: point_of_sale #: field:pos.order,lines:0 msgid "Order Lines" -msgstr "" - -#. module: point_of_sale -#: wizard_field:pos.config.journal,init,default_journal_gift:0 -msgid "Default gift journal" -msgstr "" +msgstr "Lignes de la commande" #. module: point_of_sale #: rml:pos.lines:0 msgid "Total Sold" -msgstr "" +msgstr "Total Vendu." #. module: point_of_sale #: rml:pos.receipt:0 msgid "User :" -msgstr "" +msgstr "Utilisateur :" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 #: rml:pos.lines:0 msgid "Print Date:" -msgstr "" +msgstr "Date d'impression :" #. module: point_of_sale #: view:pos.order.line:0 msgid "POS Order lines" -msgstr "" +msgstr "Lignes de commandes Point de Vente" #. module: point_of_sale #: rml:pos.receipt:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep @@ -328,37 +319,37 @@ msgstr "Reporting" #. module: point_of_sale #: view:report.transaction.pos:0 msgid "POS " -msgstr "" +msgstr "Point de Vente " #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_config_journal msgid "Point of Sale journal configuration." -msgstr "" +msgstr "Configuration des Journaux utilisés par les Points de Vente." #. module: point_of_sale #: field:pos.order,invoice_wanted:0 msgid "Create invoice" -msgstr "" +msgstr "Créer une facture" #. module: point_of_sale #: wizard_field:pos.config.journal,init,default_journal:0 msgid "Default journal" -msgstr "" +msgstr "Journal par défault" #. module: point_of_sale #: rml:pos.lines:0 msgid "Product Name" -msgstr "" +msgstr "Nom du Produit" #. module: point_of_sale #: field:pos.order,account_receivable:0 msgid "Default Receivable" -msgstr "" +msgstr "Recevable par défaut" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_sale_get msgid "Get From Order" -msgstr "" +msgstr "Obtenir à partir d'une commande" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_config @@ -368,48 +359,53 @@ msgstr "Configuration" #. module: point_of_sale #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day msgid "POS Lines of the day" -msgstr "" +msgstr "Lignes du Point de Vente du Jour" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal msgid "Default journals" -msgstr "" +msgstr "Journaux par défaut" #. module: point_of_sale #: field:pos.order.line,order_id:0 #: field:pos.payment,order_id:0 msgid "Order Ref" -msgstr "" +msgstr "Réf. Commande" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Draft Invoice" -msgstr "" +msgstr "Facture brouillon" #. module: point_of_sale #: field:pos.order.line,discount:0 msgid "Discount (%)" -msgstr "" +msgstr "Ristourne (%)" + +#. module: point_of_sale +#: rml:pos.invoice:0 +msgid "VAT :" +msgstr "TVA :" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_add_product msgid "Add products" -msgstr "" +msgstr "Ajouter des Produits" #. module: point_of_sale #: view:pos.order.line:0 msgid "Total qty" -msgstr "" +msgstr "Qté Totale" #. module: point_of_sale -#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line -msgid "POS Lines" -msgstr "" +#: rml:pos.invoice:0 +msgid "(incl. taxes):" +msgstr "(taxes incl.):" #. module: point_of_sale #: view:pos.order:0 @@ -419,7 +415,12 @@ msgstr "" #. module: point_of_sale #: wizard_button:pos.config.journal,init,set_default_journal:0 msgid "Define default journals" -msgstr "" +msgstr "Définir les journaux par défaut" + +#. module: point_of_sale +#: rml:pos.invoice:0 +msgid "Tel. :" +msgstr "Tél. :" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2 @@ -429,48 +430,53 @@ msgstr "" #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale #: model:ir.ui.menu,name:point_of_sale.menu_point_root msgid "Point of Sale" -msgstr "" +msgstr "Point de Vente" #. module: point_of_sale #: field:pos.order,user_id:0 msgid "Salesman" -msgstr "" +msgstr "Vendeur" #. module: point_of_sale #: rml:pos.details:0 #: selection:pos.order,state:0 msgid "Invoiced" -msgstr "" +msgstr "Facturée" #. module: point_of_sale #: rml:pos.receipt:0 msgid "Date :" -msgstr "" +msgstr "Date :" + +#. module: point_of_sale +#: rml:pos.invoice:0 +msgid "Partner Code:" +msgstr "Code Partenaire :" #. module: point_of_sale #: rml:pos.lines:0 msgid "Total No. of Articles" -msgstr "" +msgstr "Nombre Total d'Articles" #. module: point_of_sale #: wizard_field:pos.config.journal,init,default_journal_rebate:0 msgid "Default rebate journal" -msgstr "" +msgstr "Journal des Remises par défaut" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal msgid "Wizard default journals" -msgstr "" +msgstr "Assistant des journaux par défaut" #. module: point_of_sale #: rml:pos.receipt:0 msgid "Disc :" -msgstr "" +msgstr "Rem :" #. module: point_of_sale #: selection:pos.order,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: point_of_sale #: view:pos.order.line:0 @@ -480,94 +486,89 @@ msgstr "" #. module: point_of_sale #: rml:pos.lines:0 msgid "Total Taxes" -msgstr "" - -#. module: point_of_sale -#: rml:pos.invoice:0 -msgid "VAT :" -msgstr "" +msgstr "Taxes totales" #. module: point_of_sale #: rml:pos.invoice:0 msgid "PRO-FORMA" -msgstr "" +msgstr "PRO-FORMA" #. module: point_of_sale #: rml:pos.receipt:0 msgid "E-mail :" -msgstr "" +msgstr "E-mail :" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Total invoiced" -msgstr "" +msgstr "Total Facturé" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today msgid "Sales of the day" -msgstr "" +msgstr "Ventes du jour" #. module: point_of_sale #: field:pos.order,amount_paid:0 #: field:pos.order,amount_return:0 msgid "unknown" -msgstr "" +msgstr "inconnu" #. module: point_of_sale #: selection:pos.order,state:0 msgid "Paid" -msgstr "" +msgstr "Payé" #. module: point_of_sale #: rml:pos.receipt:0 msgid "." -msgstr "" +msgstr "." #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_discount msgid "Discount" -msgstr "" +msgstr "Remise" #. module: point_of_sale #: field:report.transaction.pos,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: point_of_sale #: rml:pos.details:0 #: rml:pos.lines:0 #: field:report.transaction.pos,date_create:0 msgid "Date" -msgstr "" +msgstr "Date" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today msgid "Sales by user" -msgstr "" +msgstr "Ventes par utilisateur" #. module: point_of_sale -#: rml:pos.receipt:0 -msgid ":" -msgstr "" +#: wizard_button:pos.discount,init,apply_discount:0 +msgid "Apply Discount" +msgstr "Appliquer la Remise" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Period:" -msgstr "" +msgstr "Période :" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree msgid "All the sales" -msgstr "" +msgstr "Toutes les ventes" #. module: point_of_sale #: view:pos.order:0 msgid "Compute" -msgstr "" +msgstr "Calculer" #. module: point_of_sale #: field:pos.order,pickings:0 @@ -577,71 +578,72 @@ msgstr "" #. module: point_of_sale #: field:pos.order.line,create_date:0 msgid "Creation date" -msgstr "" +msgstr "Date de création" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Total discount" -msgstr "" +msgstr "Remise totale" #. module: point_of_sale #: field:pos.order,pricelist_id:0 msgid "Pricelist" -msgstr "" +msgstr "Liste de prix" #. module: point_of_sale #: view:pos.order:0 msgid "Create _Invoice" -msgstr "" +msgstr "Créer Facture" #. module: point_of_sale #: rml:pos.invoice:0 #: wizard_field:pos.add_product,init,quantity:0 #: field:pos.order.line,qty:0 msgid "Quantity" -msgstr "" +msgstr "Quantité" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Refund" -msgstr "" +msgstr "Remboursement" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Mode of payment" -msgstr "" +msgstr "Mode de paiement" #. module: point_of_sale #: wizard_button:pos.payment,ask_pay,add_pay:0 msgid "Ma_ke payment" -msgstr "" +msgstr "Effectuer le paiement" #. module: point_of_sale -#: wizard_button:pos.discount,init,apply_discount:0 -msgid "Apply Discount" -msgstr "" +#: rml:pos.invoice:0 +#: rml:pos.receipt:0 +msgid ":" +msgstr ":" #. module: point_of_sale #: rml:pos.lines:0 msgid "Total Paid" -msgstr "" +msgstr "Total payé" #. module: point_of_sale #: rml:pos.details:0 msgid "VAT(%)" -msgstr "" +msgstr "TVA(%)" #. module: point_of_sale #: wizard_field:pos.discount,init,discount:0 msgid "Discount percentage" -msgstr "" +msgstr "Pourcentage de remise" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_receipt msgid "Receipt" -msgstr "" +msgstr "Reçu" #. module: point_of_sale #: wizard_view:pos.refund_order,init:0 @@ -652,17 +654,17 @@ msgstr "" #: rml:pos.details:0 #: rml:pos.receipt:0 msgid "Qty" -msgstr "" +msgstr "Qté" #. module: point_of_sale #: view:pos.order:0 msgid "Other" -msgstr "" +msgstr "Autre" #. module: point_of_sale #: selection:pos.order,state:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: point_of_sale #: rml:pos.invoice:0 @@ -671,7 +673,7 @@ msgstr "" #: field:pos.order,invoice_id:0 #: field:report.transaction.pos,invoice_id:0 msgid "Invoice" -msgstr "" +msgstr "Facture" #. module: point_of_sale #: wizard_button:pos.add_product,init,end:0 @@ -683,77 +685,80 @@ msgstr "" #: selection:pos.order,state:0 #: view:pos.order:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: point_of_sale #: view:pos.order:0 msgid "Close" -msgstr "" +msgstr "Fermer" #. module: point_of_sale #: view:pos.order:0 msgid "Order lines" -msgstr "" +msgstr "Lignes de commande" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary msgid "Sales (summary)" -msgstr "" +msgstr "Ventes (résumé)" #. module: point_of_sale #: field:pos.order.line,name:0 msgid "Line Description" -msgstr "" +msgstr "Description de la ligne" #. module: point_of_sale #: 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: point_of_sale #: view:pos.order:0 msgid "Ma_ke Payment" -msgstr "" +msgstr "Effectuer le paiement" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_payment msgid "Pos Payment" -msgstr "" +msgstr "Paiement Point de Vente" #. module: point_of_sale #: rml:pos.invoice:0 #: rml:pos.lines:0 #: field:pos.order.line,price_unit:0 msgid "Unit Price" -msgstr "" +msgstr "Prix unitaire" #. module: point_of_sale #: wizard_view:pos.refund_order,init:0 msgid "Refund " -msgstr "" +msgstr "Remise " #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_order_line msgid "Lines of Point of Sale" -msgstr "" +msgstr "Lignes de Points de Vente" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "Taxes :" #. module: point_of_sale #: view:pos.order:0 #: view:report.transaction.pos:0 msgid "Amount total" -msgstr "" +msgstr "Montant total" #. module: point_of_sale #: rml:pos.details:0 #: wizard_field:pos.add_product,init,product:0 #: field:pos.order.line,product_id:0 msgid "Product" -msgstr "" +msgstr "Produit" #. module: point_of_sale #: rml:pos.invoice:0 @@ -761,29 +766,29 @@ msgstr "" #: field:pos.config.journal,name:0 #: field:pos.payment,name:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: point_of_sale #: field:pos.order,nb_print:0 msgid "Number of print" -msgstr "" +msgstr "Nombre d'impressions" #. module: point_of_sale #: rml:pos.invoice:0 #: rml:pos.details:0 #: rml:pos.receipt:0 msgid "Price" -msgstr "" +msgstr "Prix" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Canceled Invoice" -msgstr "" +msgstr "Facture annulée" #. module: point_of_sale #: view:report.transaction.pos:0 msgid "POS" -msgstr "" +msgstr "Point de vente" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report @@ -791,82 +796,82 @@ msgid "Pos Lines" msgstr "" #. module: point_of_sale -#: rml:pos.invoice:0 -msgid "Tel. :" -msgstr "" - -#. module: point_of_sale #: rml:pos.receipt:0 msgid "Operation N° :" -msgstr "" +msgstr "Operation N° :" #. module: point_of_sale #: model:ir.actions.wizard,name:point_of_sale.pos_payment #: view:pos.order:0 msgid "Payment" +msgstr "Paiement" + +#. module: point_of_sale +#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line +msgid "POS Lines" msgstr "" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3 msgid "All orders" -msgstr "" +msgstr "Toutes les commandes" #. module: point_of_sale #: field:stock.picking,pos_order:0 msgid "Pos order" -msgstr "" +msgstr "Commande Point de Vente" #. module: point_of_sale #: rml:pos.lines:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month msgid "Sales of the month" -msgstr "" +msgstr "Ventes du Mois" #. module: point_of_sale #: view:pos.order:0 msgid "D_iscount" -msgstr "" +msgstr "Remise" #. module: point_of_sale #: field:pos.order,date_order:0 msgid "Date Ordered" -msgstr "" +msgstr "Date de Commande" #. module: point_of_sale #: rml:pos.receipt:0 msgid "Ce bon est valide jusqu'au" -msgstr "" +msgstr "Ce bon est valide jusqu'au" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Total (excl. taxes):" -msgstr "" +msgstr "Total (Hors Taxes) :" #. module: point_of_sale #: wizard_button:pos.add_product,init,add:0 #: view:pos.order:0 msgid "_Add product" -msgstr "" +msgstr "_Ajouter Produit" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 msgid "Summary" -msgstr "" +msgstr "Résumé" #. module: point_of_sale #: view:pos.order:0 msgid "Invoicing" -msgstr "" +msgstr "Facturation" #. module: point_of_sale #: field:pos.order,account_move:0 msgid "Account Entry" -msgstr "" +msgstr "Écriture comptable" #. module: point_of_sale #: rml:pos.invoice:0 @@ -874,29 +879,30 @@ msgstr "" #: field:pos.payment,amount:0 #: field:report.transaction.pos,amount:0 msgid "Amount" -msgstr "" +msgstr "Montant" #. module: point_of_sale #: view:pos.order:0 msgid "Actions" -msgstr "" +msgstr "Actions" #. module: point_of_sale #: rml:pos.details_summary:0 #: rml:pos.details:0 #: rml:pos.lines:0 msgid "Company:" -msgstr "" +msgstr "Société :" #. module: point_of_sale #: rml:pos.invoice:0 msgid "Supplier Refund" -msgstr "" +msgstr "Note de Crédit Fournisseur" #. module: point_of_sale +#: rml:pos.invoice:0 #: field:pos.order,amount_total:0 msgid "Total" -msgstr "" +msgstr "Total" #. module: point_of_sale #: wizard_field:pos.payment,ask_pay,journal:0 @@ -905,5 +911,4 @@ msgstr "" #: field:pos.payment,journal_id:0 #: field:report.transaction.pos,journal_id:0 msgid "Journal" -msgstr "" - +msgstr "Journal" diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 84caf98b877..f3f9df7842b 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -335,9 +335,11 @@ class pos_order(osv.osv): self.pool.get('stock.move').create(cr, uid, { 'name': 'Stock move (POS %d)' % (order.id, ), 'product_uom': line.product_id.uom_id.id, + 'product_uos': line.product_id.uom_id.id, 'picking_id': picking_id, 'product_id': line.product_id.id, 'product_uos_qty': line.qty, + 'product_qty': line.qty, 'tracking_id': False, 'state': 'waiting', 'location_id': location_id, diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv index 04469045410..36fa9c41d46 100644 --- a/addons/point_of_sale/security/ir.model.access.csv +++ b/addons/point_of_sale/security/ir.model.access.csv @@ -1,7 +1,14 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_pos_config_journal,pos.config.journal,model_pos_config_journal,point_of_sale.group_pos_user,1,0,0,0 -access_pos_order,pos.order,model_pos_order,point_of_sale.group_pos_user,1,1,1,1 -access_pos_order_line,pos.order.line,model_pos_order_line,point_of_sale.group_pos_user,1,1,1,1 -access_pos_payment,pos.payment,model_pos_payment,point_of_sale.group_pos_user,1,1,1,1 -access_report_transaction_pos,report.transaction.pos,model_report_transaction_pos,point_of_sale.group_pos_manager,1,0,0,0 -access_pos_config_journal_manager,pos.config.journal.manager,model_pos_config_journal,point_of_sale.group_pos_manager,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_pos_config_journal","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_order","pos.order","model_pos_order","point_of_sale.group_pos_user",1,1,1,1 +"access_pos_order_line","pos.order.line","model_pos_order_line","point_of_sale.group_pos_user",1,1,1,1 +"access_pos_payment","pos.payment","model_pos_payment","point_of_sale.group_pos_user",1,1,1,1 +"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","point_of_sale.group_pos_manager",1,0,0,0 +"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","point_of_sale.group_pos_manager",1,1,1,1 +"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","point_of_sale.group_pos_manager",1,0,0,0 +"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","point_of_sale.group_pos_user",1,0,0,0 +"access_account_move_pos_user","account.move pos_user","account.model_account_move","point_of_sale.group_pos_user",1,0,0,0 +"access_account_account_pos_user","account.account pos_user","account.model_account_account","point_of_sale.group_pos_user",1,0,0,0 +"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","point_of_sale.group_pos_user",1,1,1,1 +"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0 diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po index 09d5cc50860..efb2294f76e 100644 --- a/addons/process/i18n/fr_FR.po +++ b/addons/process/i18n/fr_FR.po @@ -1,232 +1,232 @@ -# Translation of OpenERP Server. -# This file containt the translation of the following modules: -# * process +# French translation for openobject-addons +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. # 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: process -#: model:ir.actions.act_window,name:process.action_process_node_form -#: model:ir.ui.menu,name:process.menu_partner_address_form -#: view:process.node:0 -msgid "Process Node" -msgstr "" - -#. module: process +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2008-09-05 13:34+0000\n" +"PO-Revision-Date: 2008-10-13 14:46+0000\n" +"Last-Translator: Olivier Laurent <Unknown>\n" +"Language-Team: French <fr@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 14:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: processus #: 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: process -#: view:process.node:0 -msgid "Node Description" -msgstr "" +#. module: processus +#: model:ir.ui.menu,name:processus.menu_processus +msgid "Enterprise Processus" +msgstr "Processus d'entreprise" -#. module: process -#: field:process.node,menu_id:0 +#. module: processus +#: field:processus.node,menu_id:0 msgid "Related Menu" -msgstr "" +msgstr "Menu Relatif" -#. module: process -#: field:process.transition,action_ids:0 +#. module: processus +#: field:processus.transition,action_ids:0 msgid "Buttons" -msgstr "" +msgstr "Boutons" -#. module: process -#: selection:process.node,kind:0 +#. module: processus +#: selection:processus.node,kind:0 msgid "State" -msgstr "" +msgstr "État" -#. module: process -#: field:process.transition,node_to_id:0 +#. module: processus +#: field:processus.transition,node_to_id:0 msgid "Destination Node" -msgstr "" +msgstr "Noeud de Destination" -#. module: process -#: field:process.node,flow_start:0 +#. module: processus +#: field:processus.node,flow_start:0 msgid "Starting Flow" -msgstr "" - -#. module: process -#: model:ir.model,name:process.model_process_node -msgid "Process Nodes" -msgstr "" +msgstr "Flux de Départ" -#. module: process -#: field:process.process,node_ids:0 -#: view:process.process:0 +#. module: processus +#: field:processus.processus,node_ids:0 +#: view:processus.processus:0 msgid "Nodes" -msgstr "" +msgstr "Nœuds" -#. module: process -#: field:process.transition.action,state:0 +#. module: processus +#: field:processus.transition.action,state:0 msgid "Type" -msgstr "" +msgstr "Type" -#. module: process -#: selection:process.transition.action,state:0 +#. module: processus +#: selection:processus.transition.action,state:0 msgid "Workflow Trigger" -msgstr "" +msgstr "Déclenchement du Flux d'Entreprise" -#. module: process -#: field:process.transition,note:0 -#: view:process.node:0 -#: view:process.transition:0 +#. module: processus +#: field:processus.transition,note:0 +#: view:processus.node:0 +#: view:processus.transition:0 msgid "Description" -msgstr "" +msgstr "Description" -#. module: process -#: model:ir.model,name:process.model_process_transition_action -msgid "Process Transitions Actions" -msgstr "" - -#. module: process -#: field:process.node,model_id:0 +#. module: processus +#: field:processus.node,model_id:0 msgid "Object" -msgstr "" +msgstr "Objet" -#. module: process -#: field:process.transition,transition_ids:0 +#. module: processus +#: field:processus.transition,transition_ids:0 msgid "Workflow Transitions" -msgstr "" +msgstr "Transitions du Flux de Travail" -#. module: process -#: model:ir.actions.report.xml,name:process.report_process -msgid "Print Process" -msgstr "" +#. module: processus +#: field:processus.node,kind:0 +msgid "Kind of Node" +msgstr "Type de Noeud" -#. module: process -#: field:process.process,active:0 -msgid "Active" -msgstr "" +#. module: processus +#: field:processus.transition.action,action:0 +msgid "Action ID" +msgstr "ID de l'Action" -#. module: process -#: field:process.node,model_states:0 +#. module: processus +#: field:processus.node,model_states:0 msgid "States Expression" msgstr "" -#. module: process -#: view:process.node:0 +#. module: processus +#: view:processus.node:0 msgid "Outgoing Transitions" -msgstr "" +msgstr "Transitions sortantes" -#. module: process -#: selection:process.transition.action,state:0 +#. module: processus +#: selection:processus.transition.action,state:0 msgid "Dummy" -msgstr "" +msgstr "Factice" -#. module: process +#. module: processus #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" -#. module: process -#: field:process.node,name:0 -#: field:process.process,name:0 -#: field:process.transition.action,name:0 -#: field:process.transition,name:0 -msgid "Name" -msgstr "" - -#. module: process -#: field:process.node,transition_in:0 +#. module: processus +#: field:processus.node,transition_in:0 msgid "Starting Transitions" -msgstr "" +msgstr "Transitions de Départ" -#. module: process -#: field:process.node,note:0 -#: field:process.process,note:0 +#. module: processus +#: field:processus.node,note:0 +#: field:processus.processus,note:0 msgid "Notes" -msgstr "" +msgstr "Notes" -#. module: process -#: field:process.transition.action,transition_id:0 +#. module: processus +#: field:processus.transition.action,transition_id:0 msgid "Transition" -msgstr "" +msgstr "Transition" -#. module: process -#: selection:process.node,kind:0 +#. module: processus +#: selection:processus.node,kind:0 msgid "Subflow" -msgstr "" - -#. module: process -#: view:process.node:0 -msgid "Extra Information" -msgstr "" - -#. module: process -#: field:process.transition.action,action:0 -msgid "Action ID" -msgstr "" - -#. module: process -#: selection:process.transition.action,state:0 +msgstr "Sous-flux" + +#. module: processus +#: model:ir.actions.act_window,name:processus.action_processus_node_form +#: model:ir.ui.menu,name:processus.menu_partner_address_form +#: view:processus.node:0 +msgid "Processus Node" +msgstr "Noeud de Processus" + +#. module: processus +#: model:ir.actions.report.xml,name:processus.report_processus +msgid "Print Processus" +msgstr "Imprimer Processus" + +#. module: processus +#: selection:processus.transition.action,state:0 msgid "Action" -msgstr "" +msgstr "Action" -#. module: process -#: selection:process.node,kind:0 +#. module: processus +#: selection:processus.node,kind:0 msgid "Router" msgstr "" -#. module: process -#: field:process.node,transition_out:0 -msgid "Ending Transitions" -msgstr "" - -#. module: process -#: model:ir.actions.act_window,name:process.action_transition_open -#: model:ir.model,name:process.model_process_transition -#: model:ir.ui.menu,name:process.menu_action_transition_open -msgid "Process Transitions" -msgstr "" +#. module: processus +#: view:processus.node:0 +msgid "Node Description" +msgstr "Description du Noeud" -#. module: process -#: model:ir.ui.menu,name:process.menu_process -msgid "Enterprise Process" -msgstr "" +#. module: processus +#: field:processus.transition.action,name:0 +#: field:processus.transition,name:0 +#: view:processus.node:0 +#: view:processus.transition:0 +msgid "Transitions" +msgstr "Transitions" -#. module: process -#: view:process.transition:0 +#. module: processus +#: field:processus.node,transition_out:0 +msgid "Ending Transitions" +msgstr "Transitions finales" + +#. module: processus +#: model:ir.model,name:processus.model_processus_processus +#: field:processus.node,name:0 +#: field:processus.node,processus_id:0 +#: field:processus.processus,name:0 +#: model:ir.ui.menu,name:processus.menu_processus_form +#: view:processus.processus:0 +msgid "Processus" +msgstr "Processus" + +#. module: processus +#: view:processus.transition:0 msgid "Actions" -msgstr "" +msgstr "Actions" -#. module: process -#: field:process.transition,node_from_id:0 +#. module: processus +#: field:processus.transition,node_from_id:0 msgid "Origin Node" -msgstr "" +msgstr "Noeud d'Origine" -#. module: process -#: model:ir.model,name:process.model_process_process -#: field:process.node,process_id:0 -#: model:ir.ui.menu,name:process.menu_process_form -#: view:process.process:0 -msgid "Process" -msgstr "" +#. module: processus +#: model:ir.model,name:processus.model_processus_transition_action +msgid "Processus Transitions Actions" +msgstr "Actions des Transitions du Processus" -#. module: process -#: field:process.node,kind:0 -msgid "Kind of Node" -msgstr "" - -#. module: process -#: view:process.node:0 -#: view:process.transition:0 -msgid "Transitions" -msgstr "" - -#. module: process -#: selection:process.transition.action,state:0 +#. module: processus +#: view:processus.node:0 +msgid "Extra Information" +msgstr "Information supplémentaire" + +#. module: processus +#: model:ir.actions.act_window,name:processus.action_transition_open +#: model:ir.model,name:processus.model_processus_transition +#: model:ir.ui.menu,name:processus.menu_action_transition_open +msgid "Processus Transitions" +msgstr "Transitions du Processus" + +#. module: processus +#: model:ir.model,name:processus.model_processus_node +msgid "Processus Nodes" +msgstr "Noeuds de Processus" + +#. module: processus +#: selection:processus.transition.action,state:0 msgid "Object Method" -msgstr "" +msgstr "Méthode de l'objet" +#. module: processus +#: field:processus.processus,active:0 +msgid "Active" +msgstr "Actif" diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv index 9d56bb541f0..064f0454d02 100644 --- a/addons/process/security/ir.model.access.csv +++ b/addons/process/security/ir.model.access.csv @@ -1,9 +1,11 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_process_process,process.process,model_process_process,base.group_user,1,0,0,0 -access_process_node,process.node,model_process_node,base.group_user,1,0,0,0 -access_process_transition,process.transition,model_process_transition,base.group_user,1,0,0,0 -access_process_transition_action,process.transition.action,model_process_transition_action,base.group_user,1,0,0,0 -access_process_process_manager,process.process,model_process_process,base.group_system,1,1,1,1 -access_process_node_manager,process.node,model_process_node,base.group_system,1,1,1,1 -access_process_transition_manager,process.transition,model_process_transition,base.group_system,1,1,1,1 -access_process_transition_action_manager,process.transition.action,model_process_transition_action,base.group_system,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_process_process","process.process","model_process_process","base.group_user",1,0,0,0 +"access_process_node","process.node","model_process_node","base.group_user",1,0,0,0 +"access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0 +"access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0 +"access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0 +"access_process_process_manager","process.process manager","model_process_process","base.group_system",1,1,1,1 +"access_process_node_manager","process.node manager","model_process_node","base.group_system",1,1,1,1 +"access_process_transition_manager","process.transition manager","model_process_transition","base.group_system",1,1,1,1 +"access_process_transition_action_manager","process.transition.action manager","model_process_transition_action","base.group_system",1,1,1,1 +"access_process_condition_manager","process.condition manager","model_process_condition","base.group_system",1,1,1,1 diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 9b675a11a84..d7e985eca7d 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -13,7 +13,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_product0" model="process.node"> diff --git a/addons/product/product.py b/addons/product/product.py index 8be135b4a68..757abb2df8a 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -535,6 +535,7 @@ class product_packaging(osv.osv): _description = "Packaging" _rec_name = 'ean' _columns = { + 'sequence': fields.integer('Sequence'), 'name' : fields.char('Description', size=64), 'qty' : fields.float('Quantity by Package', help="The total number of products you can put by palet or box."), @@ -563,6 +564,7 @@ class product_packaging(osv.osv): _defaults = { 'rows' : lambda *a : 3, + 'sequence' : lambda *a : 1, 'ul' : _get_1st_ul, } diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 8d2a47f6836..a81fe9c3476 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -131,6 +131,7 @@ <field colspan="4" name="packaging" nolabel="1"> <form string="Packaging"> <field name="ean" select="1"/> + <field name="sequence"/> <newline/> <field name="qty" select="1"/> <field name="ul"/> @@ -332,6 +333,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Packaging"> + <field name="sequence"/> <field name="ean"/> <field name="qty"/> <field name="ul"/> @@ -346,7 +348,9 @@ <field name="arch" type="xml"> <form string="Packaging"> <field name="product_id" select="1"/> + <newline/> <field name="ean" select="1"/> + <field name="sequence"/> <newline/> <field name="qty" select="1"/> <field name="ul"/> diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv index cf628e592f8..62d5079afce 100644 --- a/addons/product/security/ir.model.access.csv +++ b/addons/product/security/ir.model.access.csv @@ -1,29 +1,31 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_product_uom_categ,product.uom.categ,model_product_uom_categ,product.group_product_manager,1,1,1,1 -access_product_uom,product.uom,model_product_uom,base.group_user,1,1,1,1 -access_product_ul,product.ul,model_product_ul,base.group_user,1,1,1,1 -access_product_category,product.category,model_product_category,base.group_user,1,1,1,1 -access_product_template,product.template,model_product_template,base.group_user,1,1,1,1 -access_product_product,product.product,model_product_product,base.group_user,1,1,1,1 -access_product_packaging,product.packaging,model_product_packaging,base.group_user,1,1,1,1 -access_product_supplierinfo,product.supplierinfo,model_product_supplierinfo,base.group_user,1,1,1,1 -access_pricelist_partnerinfo,pricelist.partnerinfo,model_pricelist_partnerinfo,base.group_user,1,1,1,1 -access_product_price_type,product.price.type,model_product_price_type,base.group_user,1,1,1,1 -access_product_pricelist_type,product.pricelist.type,model_product_pricelist_type,base.group_user,1,1,1,1 -access_product_pricelist,product.pricelist,model_product_pricelist,base.group_user,1,1,1,1 -access_product_pricelist_version,product.pricelist.version,model_product_pricelist_version,base.group_user,1,1,1,1 -access_product_pricelist_item,product.pricelist.item,model_product_pricelist_item,base.group_user,1,1,1,1 -access_product_uom_categ_user,product.uom.categ.user,model_product_uom_categ,product.group_product_manager,1,0,0,0 -access_product_uom_user,product.uom.user,model_product_uom,base.group_user,1,0,0,0 -access_product_ul_user,product.ul.user,model_product_ul,base.group_user,1,0,0,0 -access_product_category_user,product.category.user,model_product_category,base.group_user,1,0,0,0 -access_product_template_user,product.template.user,model_product_template,base.group_user,1,0,0,0 -access_product_product_user,product.product.user,model_product_product,base.group_user,1,0,0,0 -access_product_packaging_user,product.packaging.user,model_product_packaging,base.group_user,1,0,0,0 -access_product_supplierinfo_user,product.supplierinfo.user,model_product_supplierinfo,base.group_user,1,0,0,0 -access_pricelist_partnerinfo_user,pricelist.partnerinfo.user,model_pricelist_partnerinfo,base.group_user,1,0,0,0 -access_product_price_type_user,product.price.type.user,model_product_price_type,base.group_user,1,0,0,0 -access_product_pricelist_type_user,product.pricelist.type.user,model_product_pricelist_type,base.group_user,1,0,0,0 -access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0 -access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0 -access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_product_uom_categ_manager","product.uom.categ manager","model_product_uom_categ","product.group_product_manager",1,1,1,1 +"access_product_uom_manager","product.uom manager","model_product_uom","product.group_product_manager",1,1,1,1 +"access_product_ul_manager","product.ul manager","model_product_ul","product.group_product_manager",1,1,1,1 +"access_product_category_manager","product.category manager","model_product_category","product.group_product_manager",1,1,1,1 +"access_product_template_manager","product.template manager","model_product_template","product.group_product_manager",1,1,1,1 +"access_product_product_manager","product.product manager","model_product_product","product.group_product_manager",1,1,1,1 +"access_product_packaging_manager","product.packaging manager","model_product_packaging","product.group_product_manager",1,1,1,1 +"access_product_supplierinfo_manager","product.supplierinfo manager","model_product_supplierinfo","product.group_product_manager",1,1,1,1 +"access_pricelist_partnerinfo_manager","pricelist.partnerinfo manager","model_pricelist_partnerinfo","product.group_product_manager",1,1,1,1 +"access_product_price_type_manager","product.price.type manager","model_product_price_type","product.group_product_manager",1,1,1,1 +"access_product_pricelist_type_manager","product.pricelist.type manager","model_product_pricelist_type","product.group_product_manager",1,1,1,1 +"access_product_pricelist_manager","product.pricelist manager","model_product_pricelist","product.group_product_manager",1,1,1,1 +"access_product_pricelist_version_manager","product.pricelist.version manager","model_product_pricelist_version","product.group_product_manager",1,1,1,1 +"access_product_pricelist_item_manager","product.pricelist.item manager","model_product_pricelist_item","product.group_product_manager",1,1,1,1 +"access_product_uom_categ_user","product.uom.categ.user","model_product_uom_categ","base.group_user",1,0,0,0 +"access_product_uom_user","product.uom.user","model_product_uom","base.group_user",1,0,0,0 +"access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0 +"access_product_category_user","product.category.user","model_product_category","base.group_user",1,0,0,0 +"access_product_template_user","product.template.user","model_product_template","base.group_user",1,0,0,0 +"access_product_product_user","product.product.user","model_product_product","base.group_user",1,0,0,0 +"access_product_packaging_user","product.packaging.user","model_product_packaging","base.group_user",1,0,0,0 +"access_product_supplierinfo_user","product.supplierinfo.user","model_product_supplierinfo","base.group_user",1,0,0,0 +"access_pricelist_partnerinfo_user","pricelist.partnerinfo.user","model_pricelist_partnerinfo","base.group_user",1,0,0,0 +"access_product_price_type_user","product.price.type.user","model_product_price_type","base.group_user",1,0,0,0 +"access_product_pricelist_type_user","product.pricelist.type.user","model_product_pricelist_type","base.group_user",1,0,0,0 +"access_product_pricelist_user","product.pricelist.user","model_product_pricelist","base.group_user",1,0,0,0 +"access_product_pricelist_version_user","product.pricelist.version.user","model_product_pricelist_version","base.group_user",1,0,0,0 +"access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0 +"access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0 +"access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0 diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index 484204c4c86..260dbc40665 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -76,8 +76,8 @@ class product_product(osv.osv): from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) left join product_template product on (product.id=l.product_id) - where l.product_id = %s and i.state in ('%s') and i.type in ('%s') - """%(val.id,"','".join(states),"','".join(invoice_types)) + where l.product_id = %s and i.state in ('%s') and i.type in ('%s') and i.date_invoice>='%s' and i.date_invoice<='%s' + """%(val.id,"','".join(states),"','".join(invoice_types),date_from,date_to) cr.execute(sql) result=cr.fetchall()[0] if 'sale_avg_price' in field_names or 'sale_num_invoiced' in field_names or 'turnover' in field_names or 'sale_expected' in field_names: diff --git a/addons/profile_accounting/i18n/fr_FR.po b/addons/profile_accounting/i18n/fr_FR.po index 99bb679985f..9774d5dfb02 100644 --- a/addons/profile_accounting/i18n/fr_FR.po +++ b/addons/profile_accounting/i18n/fr_FR.po @@ -4,94 +4,79 @@ # 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:21+0000\n" +"PO-Revision-Date: 2008-10-13 14:51+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 15:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: profile_accounting #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: profile_accounting -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,name:0 -msgid "Name" -msgstr "" - -#. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,account_payment:0 -msgid "Suppliers Payment Management" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: profile_accounting -#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard -msgid "profile.accounting.config.install_modules_wizard" -msgstr "" +#: field:config.install_extra_modules,hr_timesheet_invoice:0 +msgid "Invoice on Timesheets" +msgstr "Factures d'après Feuilles de Présence" #. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Services Management" -msgstr "" +msgstr "Gestion des Services" #. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0 -msgid "Analytic Accounting" -msgstr "" - -#. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0 -msgid "Multiple Analytic Plans" -msgstr "" - -#. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 -msgid "Cancel" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Resources Management" +msgstr "Gestion des Ressources" #. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0 -msgid "Invoice on Analytic Entries" +#: help:config.install_extra_modules,account_budget_crossover:0 +msgid "" +"Allows you to manage analytic budgets by journals. This module is used to " +"manage budgets of your projects." msgstr "" +"Vous permet de gérer les budgets analytiques par journaux. Ce module est " +"utilisé pour gérer les budgets de vos projets." #. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Accounting Management" -msgstr "" +msgstr "Gestion de la comptabilité" #. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install" -msgstr "" +msgstr "Installer" #. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,account_asset:0 -msgid "Asset Management" +#: help:config.install_extra_modules,hr_timesheet_invoice:0 +msgid "" +"There are different invoicing methods in OpenERP: from sale orders, from " +"shippings, ... Install this module if you plan to invoice your customers " +"based on time spent on projects." msgstr "" +"Il existe différentes méthodes de facturation dans OpenERP: d'après vente, " +"d'après la livraison, ... Installer ce module si vous prévoyez de facturer " +"vos clients d'après le temps passé sur les projets." #. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 -msgid "Resources Management" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Cancel" +msgstr "Annuler" #. module: profile_accounting -#: view:profile.accounting.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install Extra Module" -msgstr "" +msgstr "Installer Module Supplémentaire" #. module: profile_accounting -#: field:profile.accounting.config.install_modules_wizard,account_budget_crossover:0 +#: field:config.install_extra_modules,account_budget_crossover:0 msgid "Analytic Budgets" -msgstr "" - +msgstr "Budgets Analytiques" diff --git a/addons/profile_accounting/security/ir.model.access.csv b/addons/profile_accounting/security/ir.model.access.csv index 08145a00f54..d60aaef3dc2 100644 --- a/addons/profile_accounting/security/ir.model.access.csv +++ b/addons/profile_accounting/security/ir.model.access.csv @@ -1,2 +1,2 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink - +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_profile_accounting_wizard_install","profile accounting wizard install","model_profile_accounting_config_install_modules_wizard","base.group_system",1,1,1,1 diff --git a/addons/profile_association/i18n/fr_FR.po b/addons/profile_association/i18n/fr_FR.po index 29464ccf410..086b2c27a2e 100644 --- a/addons/profile_association/i18n/fr_FR.po +++ b/addons/profile_association/i18n/fr_FR.po @@ -4,90 +4,94 @@ # 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: " - -#. module: profile_association -#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard -msgid "profile.association.config.install_modules_wizard" -msgstr "" +"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 15:24+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:12+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: profile_association #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: profile_association #: 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: profile_association -#: field:profile.association.config.install_modules_wizard,event:0 -msgid "Events Organisation" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Relationship Management" +msgstr "Gestion de la Relation" #. module: profile_association -#: view:profile.association.config.install_modules_wizard:0 -msgid "Relationship Management" +#: help:config.install_extra_modules,hr_expense:0 +msgid "" +"Tracks the personal expenses process, from the employee expense encoding, to " +"the reimbursement of the employee up to the reinvoicing to the final " +"customer." msgstr "" +"Permet le suivi du processus des dépenses personelles, de l'encodage des " +"dépenses de l'employé, au remboursement de l'employé, jusqu'à la facturation " +"au client final." #. module: profile_association -#: help:profile.association.config.install_modules_wizard,hr_expense:0 -msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer." +#: model:ir.model,name:profile_association.model_config_install_extra_modules +msgid "config.install_extra_modules" msgstr "" #. module: profile_association -#: field:profile.association.config.install_modules_wizard,crm_configuration:0 +#: field:config.install_extra_modules,crm_configuration:0 msgid "CRM & Calendars" -msgstr "" +msgstr "CRM & Calendriers" #. module: profile_association -#: view:profile.association.config.install_modules_wizard:0 -msgid "Resources Management" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Cancel" +msgstr "Annuler" #. module: profile_association -#: help:profile.association.config.install_modules_wizard,crm_configuration:0 -msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on." +#: help:config.install_extra_modules,crm_configuration:0 +msgid "" +"This installs the customer relationship features like: leads and " +"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so " +"on." msgstr "" +"Cela installera le suivi de la relation client comme: les affaires et la " +"gestion des opportunités, le calendrier partagé, le suivi des emplois, etc, " +"..." #. module: profile_association -#: view:profile.association.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install" -msgstr "" +msgstr "Installer" #. module: profile_association -#: field:profile.association.config.install_modules_wizard,hr_expense:0 +#: field:config.install_extra_modules,hr_expense:0 msgid "Expenses Tracking" -msgstr "" - -#. module: profile_association -#: field:profile.association.config.install_modules_wizard,crm:0 -msgid "Fund Raising" -msgstr "" +msgstr "Suivi des dépenses" #. module: profile_association -#: view:profile.association.config.install_modules_wizard:0 -msgid "Cancel" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Resources Management" +msgstr "Gestion des Ressources" #. module: profile_association -#: view:profile.association.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install Extra Module" -msgstr "" +msgstr "Installer Module Supplémentaire" #. module: profile_association -#: field:profile.association.config.install_modules_wizard,project:0 -#: view:profile.association.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Project Management" -msgstr "" - +msgstr "Gestion de projets" diff --git a/addons/profile_association/security/ir.model.access.csv b/addons/profile_association/security/ir.model.access.csv index 97dd8b917b8..2fb5590818e 100644 --- a/addons/profile_association/security/ir.model.access.csv +++ b/addons/profile_association/security/ir.model.access.csv @@ -1 +1,2 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_profile_association_wizard_install","profile association wizard install","model_profile_association_config_install_modules_wizard","base.group_system",1,1,1,1 diff --git a/addons/profile_manufacturing/i18n/fr_FR.po b/addons/profile_manufacturing/i18n/fr_FR.po index bfbdd0d80f4..747df6b1a3b 100644 --- a/addons/profile_manufacturing/i18n/fr_FR.po +++ b/addons/profile_manufacturing/i18n/fr_FR.po @@ -4,129 +4,54 @@ # 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: profile_manufacturing -#: field:config.install_extra_modules.mrp,mrp_operation:0 -msgid "Manufacturing Operations" -msgstr "" - -#. module: profile_manufacturing -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,mrp_jit:0 -msgid "Just in Time Scheduling" -msgstr "" - -#. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,sale_journal:0 -msgid "Manage by Journals" -msgstr "" - -#. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 -msgid "Relationship Management" -msgstr "" - -#. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,sale_journal:0 -msgid "This module allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc." -msgstr "" - -#. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,mrp_jit:0 -msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements." -msgstr "" - -#. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,mrp_operation:0 -msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order" -msgstr "" - -#. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 -msgid "Stock & Manufacturing" -msgstr "" +"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 15:55+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 16:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: profile_manufacturing #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 -msgid "Cancel" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Manufacturing Management" +msgstr "Gestion de la Production" #. module: profile_manufacturing -#: model:ir.model,name:profile_manufacturing.model_config_install_extra_modules_mrp -msgid "config.install_extra_modules.mrp" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Relationship Management" +msgstr "Gestion de la Relation" #. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install" -msgstr "" - -#. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,crm_configuration:0 -msgid "CRM and Calendars" -msgstr "" +msgstr "Installer" #. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,point_of_sale:0 -msgid "Point of Sale" -msgstr "" - -#. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,point_of_sale:0 -msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware." -msgstr "" - -#. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 -msgid "Sales Management" -msgstr "" - -#. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,sale_margin:0 -msgid "Margins on Sales Order" -msgstr "" - -#. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,stock_location:0 -msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc." -msgstr "" - -#. module: profile_manufacturing -#: view:profile.manufacturing.config.install_modules_wizard:0 -msgid "Manufacturing Profile : Install Extra Module" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Cancel" +msgstr "Annuler" #. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,sale_margin:0 -msgid "Display margins on the sale order form." -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Sale Management" +msgstr "Gestion des Ventes" #. module: profile_manufacturing -#: field:config.install_extra_modules.mrp,stock_location:0 -msgid "Advanced Locations" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Install Extra Module" +msgstr "Installer Module Supplémentaire" #. module: profile_manufacturing -#: help:config.install_extra_modules.mrp,crm_configuration:0 -msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on." -msgstr "" - +#: view:config.install_extra_modules:0 +msgid "Project Management" +msgstr "Gestion de projets" diff --git a/addons/profile_manufacturing/security/ir.model.access.csv b/addons/profile_manufacturing/security/ir.model.access.csv index 08145a00f54..dc32d522e81 100644 --- a/addons/profile_manufacturing/security/ir.model.access.csv +++ b/addons/profile_manufacturing/security/ir.model.access.csv @@ -1,2 +1,2 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink - +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_profile_manufacturing_wizard_install","profile manufacturing wizard install","model_profile_manufacturing_config_install_modules_wizard","base.group_system",1,1,1,1 diff --git a/addons/profile_service/i18n/fr_FR.po b/addons/profile_service/i18n/fr_FR.po index 13aaa69d97d..a9080965c1a 100644 --- a/addons/profile_service/i18n/fr_FR.po +++ b/addons/profile_service/i18n/fr_FR.po @@ -4,149 +4,124 @@ # 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: " - -#. module: profile_service -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 -msgid "Services Management" -msgstr "" - -#. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 -msgid "Relationship Management" -msgstr "" - -#. module: profile_service -#: help:profile.service.config.install_modules_wizard,project_gtd:0 -msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management." -msgstr "" - -#. module: profile_service -#: help:profile.service.config.install_modules_wizard,account_budget_crossover:0 -msgid "Allows you to manage analytic budgets by journals. This module is used to manage budgets of your projects." -msgstr "" - -#. module: profile_service -#: field:profile.service.config.install_modules_wizard,project_timesheet:0 -msgid "Timesheets" +"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 16:01+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 16:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: profile_service +#: field:config.install_extra_modules,project_gtd:0 +msgid "Getting Things Done" msgstr "" #. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 -msgid "Resources Management" +#: help:config.install_extra_modules,scrum:0 +msgid "" +"Scrum is an 'agile development methodology', mainly used in IT projects. It " +"helps you to manage teams, long term roadmaps, sprints, and so on." msgstr "" +"SCRUM est une méthode de développement agile, principalement utilisée dans " +"les projets IT. Il vous aide à gérer les équipes, les feuilles de route, les " +"sprints de développement, etc, ..." #. module: profile_service -#: help:profile.service.config.install_modules_wizard,hr_holidays:0 -msgid "Tracks the full holidays management process, from the employee's request to the global planning." +#: help:config.install_extra_modules,hr_timesheet:0 +msgid "" +"Timesheets allows you to track time and costs spent on different projects, " +"represented by analytic accounts." msgstr "" +"Les feuilles de présence vous permettent de suivre le temps et les coûts " +"dépensés sur les différents projets, représentés par des comptes analytiques." #. module: profile_service -#: field:profile.service.config.install_modules_wizard,base_contact:0 +#: field:config.install_extra_modules,base_contact:0 msgid "Contacts Management" -msgstr "" +msgstr "Gestion des Contacts" #. module: profile_service -#: help:profile.service.config.install_modules_wizard,base_contact:0 -msgid "Allows you to manage partners (enterprises), addresses of partners and contacts of these partners (employee/people). Install this if you plan to manage your relationships with partners and contacts." -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Relationship Management" +msgstr "Gestion de la Relation" #. module: profile_service -#: field:profile.service.config.install_modules_wizard,crm_configuration:0 -msgid "CRM & Calendars" +#: help:config.install_extra_modules,base_contact:0 +msgid "" +"Allows you to manage partners (enterprises), addresses of partners and " +"contacts of these partners (employee/people). Install this if you plan to " +"manage your relationships with partners and contacts." msgstr "" +"Vous permet de gérer des partenaires (entreprises), les adresses des " +"partenaires et les contacts de ces partenaires (employés/personnes). " +"Installer ce module si vous prévoyez de gérer les relations entre " +"partenaires et contacts." #. module: profile_service -#: field:profile.service.config.install_modules_wizard,account_budget_crossover:0 -msgid "Analytic Budgets" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Services Management" +msgstr "Gestion des Services" #. module: profile_service #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: profile_service -#: help:profile.service.config.install_modules_wizard,scrum:0 -msgid "Scrum is an 'agile development methodology', mainly used in IT projects. It helps you to manage teams, long term roadmaps, sprints, and so on." +#: help:config.install_extra_modules,project_gtd:0 +msgid "" +"GTD is a methodology to efficiently organise yourself and your tasks. This " +"module fully integrates GTD principle with OpenERP's project management." msgstr "" +"GTD est une méthodologie qui permet de vous organiser, vous et vos tâches. " +"Ce module intégre pleinement les principes GTD avec la gestion de projets " +"d'OpenERP." #. module: profile_service -#: field:profile.service.config.install_modules_wizard,hr_holidays:0 +#: field:config.install_extra_modules,hr_holidays:0 msgid "Holidays Management" -msgstr "" +msgstr "Gestion des Congés" #. module: profile_service -#: help:profile.service.config.install_modules_wizard,crm_configuration:0 -msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on." -msgstr "" - -#. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 -msgid "Install" -msgstr "" - -#. module: profile_service -#: field:profile.service.config.install_modules_wizard,hr_expense:0 -msgid "Expenses Tracking" -msgstr "" - -#. module: profile_service -#: help:profile.service.config.install_modules_wizard,hr_timesheet_invoice:0 -msgid "There are different invoicing methods in OpenERP: from sale orders, from shippings, ... Install this module if you plan to invoice your customers based on time spent on projects." -msgstr "" - -#. module: profile_service -#: model:ir.model,name:profile_service.model_profile_service_config_install_modules_wizard -msgid "profile.service.config.install_modules_wizard" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Cancel" +msgstr "Annuler" #. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 +#: view:config.install_extra_modules:0 msgid "Install Extra Module" -msgstr "" - -#. module: profile_service -#: field:profile.service.config.install_modules_wizard,project_gtd:0 -msgid "Getting Things Done" -msgstr "" +msgstr "Installer Module Supplémentaire" #. module: profile_service -#: help:profile.service.config.install_modules_wizard,project_timesheet:0 -msgid "Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts." -msgstr "" +#: field:config.install_extra_modules,hr_timesheet:0 +msgid "Timesheets" +msgstr "Feuilles de présence" #. module: profile_service -#: field:profile.service.config.install_modules_wizard,hr_timesheet_invoice:0 -msgid "Invoice on Timesheets" -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Install" +msgstr "Installer" #. module: profile_service -#: help:profile.service.config.install_modules_wizard,hr_expense:0 -msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer." -msgstr "" +#: view:config.install_extra_modules:0 +msgid "Resources Management" +msgstr "Gestion des Ressources" #. module: profile_service -#: field:profile.service.config.install_modules_wizard,scrum:0 +#: field:config.install_extra_modules,scrum:0 msgid "Scrum Methodology" -msgstr "" +msgstr "Méthodologie SCRUM" #. module: profile_service -#: view:profile.service.config.install_modules_wizard:0 -msgid "Cancel" +#: help:config.install_extra_modules,hr_holidays:0 +msgid "" +"Tracks the full holidays management process, from the employee's request to " +"the global planning." msgstr "" - +"Permet de suivre le processus entier de gestion des congés, de la demande de " +"l'employé à la plannification globale." diff --git a/addons/profile_service/security/ir.model.access.csv b/addons/profile_service/security/ir.model.access.csv index 97dd8b917b8..ee3fd0efd37 100644 --- a/addons/profile_service/security/ir.model.access.csv +++ b/addons/profile_service/security/ir.model.access.csv @@ -1 +1,2 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_profile_service_wizard_install","profile service wizard install","model_profile_service_config_install_modules_wizard","base.group_system",1,1,1,1 diff --git a/addons/project/i18n/fr_FR.po b/addons/project/i18n/fr_FR.po index 3bb8b464706..0291f600abc 100644 --- a/addons/project/i18n/fr_FR.po +++ b/addons/project/i18n/fr_FR.po @@ -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:19+0000\n" +"PO-Revision-Date: 2008-10-13 15:06+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:36+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: project #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened @@ -21,20 +22,19 @@ msgid "Assigned tasks" msgstr "Tâches assignées" #. module: project +#: field:project.project,members:0 +msgid "Project members" +msgstr "Membres du projet" + +#. module: project #: model:ir.actions.report.xml,name:project.report_project_desc msgid "Project Description" msgstr "Description du projet" #. module: project -#, python-format -#: code:addons/project/wizard/close_task.py:0 -msgid "Couldn't send mail because the contact for this task (%s) has no email address!" -msgstr "" - -#. module: project #: wizard_field:project.task.delegate,init,name:0 msgid "Title" -msgstr "" +msgstr "Titre" #. module: project #: model:ir.actions.wizard,name:project.wizard_close_task @@ -47,24 +47,25 @@ msgid "Toggle activity" msgstr "Changer l'activité" #. module: project +#: field:project.task,effective_hours:0 +msgid "Eff. Hours" +msgstr "Heures Eff." + +#. module: project #: view:project.task:0 msgid "Delegations" -msgstr "" +msgstr "Délégations" #. module: project #: wizard_field:project.task.delegate,init,planned_hours_me:0 msgid "Hours to Validate" -msgstr "" +msgstr "Heures à Validé" #. module: project #: field:project.project,progress_rate:0 +#: field:project.task,progress_rate:0 msgid "Progress" -msgstr "" - -#. module: project -#: selection:res.company,project_time_mode:0 -msgid "Weeks" -msgstr "" +msgstr "Achevé" #. module: project #: field:project.project,child_id:0 @@ -72,31 +73,45 @@ msgid "Subproject" msgstr "Sous projet" #. module: project -#: field:project.project,members:0 -msgid "Project Members" -msgstr "" +#: field:project.task,history:0 +msgid "Task Details" +msgstr "Détails des tâches" #. module: project -#: field:project.task,child_ids:0 -msgid "Delegated Tasks" -msgstr "" +#: field:project.project,tax_ids:0 +msgid "Applicable taxes" +msgstr "Taxes applicables" #. module: project -#: field:project.task,progress:0 -msgid "Progress (%)" -msgstr "" +#: field:project.task,child_ids:0 +msgid "Delegated Tasks" +msgstr "Tâches déléguées" #. module: project #: model:ir.actions.act_window,name:project.action_view_task4 #: model:ir.ui.menu,name:project.menu_action_view_task4 msgid "My Tasks" -msgstr "Mes tâches " +msgstr "Mes tâches" #. module: project -#, python-format -#: code:addons/project/wizard/close_task.py:0 -msgid "Couldn't send mail because your email address is not configured!" -msgstr "" +#: field:project.project,tariff:0 +msgid "Sales price" +msgstr "Prix de ventes" + +#. module: project +#: view:project.project:0 +msgid "Set pending" +msgstr "Mettre en attente" + +#. module: project +#: view:project.project:0 +msgid "Open task" +msgstr "Tâches ouvertes" + +#. module: project +#: model:ir.actions.wizard,name:project.wizard_billing +msgid "Bill tasks" +msgstr "Facturer tâches" #. module: project #: selection:project.task,priority:0 @@ -106,7 +121,7 @@ msgstr "Très urgent" #. module: project #: wizard_button:project.task.delegate,init,valid:0 msgid "Validate" -msgstr "" +msgstr "Valider" #. module: project #: model:ir.actions.act_window,name:project.action_view_task5_prog @@ -115,15 +130,30 @@ msgid "My Tasks in Progress" msgstr "Mes tâches en cours" #. module: project +#: field:project.task,start_sequence:0 +msgid "Wait for previous sequences" +msgstr "Attente d'une étape précédente" + +#. module: project +#: view:project.project:0 +msgid "Task Information" +msgstr "Informations de la tâche" + +#. module: project #: model:ir.model,name:project.model_project_task #: field:project.task.work,task_id:0 msgid "Task" msgstr "Tâche" #. module: project +#: wizard_button:project.wiz_bill,init,bill:0 +msgid "Ok" +msgstr "Ok" + +#. module: project #: model:ir.actions.wizard,name:project.wizard_delegate_task msgid "Delegate Task" -msgstr "" +msgstr "Délégué Tâche" #. module: project #: field:project.project,notes:0 @@ -134,9 +164,9 @@ msgid "Notes" msgstr "Notes" #. module: project -#: selection:res.company,project_time_mode:0 -msgid "Days" -msgstr "" +#: view:project.project:0 +msgid "Taxes" +msgstr "Taxes" #. module: project #: model:ir.model,name:project.model_project_project @@ -147,12 +177,6 @@ msgid "Project" msgstr "Projet" #. module: project -#: model:ir.actions.act_window,name:project.action_view_task_new -#: model:ir.ui.menu,name:project.menu_action_view_task_new -msgid "New Task" -msgstr "" - -#. module: project #: selection:project.project,state:0 #: selection:project.task,state:0 msgid "Cancelled" @@ -165,11 +189,6 @@ msgid "My Open Tasks" msgstr "Mes tâches ouvertes" #. module: project -#: view:project.project:0 -msgid "Mail Header" -msgstr "" - -#. module: project #: field:project.project,warn_footer:0 msgid "Mail footer" msgstr "Pied de page mail" @@ -178,23 +197,33 @@ msgstr "Pied de page mail" #: model:ir.actions.act_window,name:project.open_task_type_form #: model:ir.ui.menu,name:project.menu_task_types msgid "Task Types" -msgstr "" +msgstr "Types de taxes" #. module: project #: model:ir.ui.menu,name:project.menu_definitions -#: view:res.company:0 msgid "Configuration" msgstr "Configuration" #. module: project -#: field:project.task.work,user_id:0 -msgid "Done by" -msgstr "Assigné à" +#: field:project.project,warn_customer:0 +msgid "Warn customer" +msgstr "Avertir le client" + +#. module: project +#: model:ir.actions.act_window,name:project.action_view_task2 +#: model:ir.ui.menu,name:project.menu_action_view_task2 +msgid "Unbilled closed tasks" +msgstr "Tâches fermées non facturés" #. module: project #: view:project.task:0 msgid "Set Pending" -msgstr "" +msgstr "Mettre en attente" + +#. module: project +#: field:project.task,invoice_id:0 +msgid "Generated Invoice" +msgstr "Générer les factures" #. module: project #: field:project.project,category_id:0 @@ -202,15 +231,14 @@ msgid "Analytic Account" msgstr "Classif. de comptabilité" #. module: project -#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all -#: model:ir.ui.menu,name:project.menu_action_view_task -msgid "All Tasks" -msgstr "Toutes les tâches" +#: field:project.task.work,user_id:0 +msgid "Done by" +msgstr "Assigné à" #. module: project -#: view:project.task:0 -msgid "Planning" -msgstr "" +#: field:project.project,mode:0 +msgid "Price setting mode" +msgstr "Mode de calcul du prix" #. module: project #: field:project.task,date_deadline:0 @@ -218,16 +246,24 @@ msgid "Deadline" msgstr "Date limite" #. module: project -#: field:project.project,partner_id:0 -#: field:project.task,partner_id:0 -msgid "Partner" -msgstr "" +#: field:project.project,warn_manager:0 +msgid "Warn manager" +msgstr "Prévenir le responsable" + +#. module: project +#: view:project.project:0 +msgid "Mail texts" +msgstr "Textes du Mail" + +#. module: project +#: selection:project.task,state:0 +msgid "Draft" +msgstr "Brouillon" #. module: project #: wizard_field:project.task.delegate,init,planned_hours:0 -#: field:project.task,planned_hours:0 msgid "Planned Hours" -msgstr "" +msgstr "Heures planifiés" #. module: project #: view:project.project:0 @@ -240,26 +276,26 @@ msgid "Send Message" msgstr "Envoyer un message" #. module: project +#: field:project.project,name:0 +msgid "Project name" +msgstr "Nom du projet" + +#. module: project #: model:ir.actions.act_window,name:project.open_view_my_project #: model:ir.ui.menu,name:project.menu_open_view_my_project #: view:project.project:0 msgid "My projects" -msgstr "Mes projets " - -#. module: project -#: view:project.task:0 -msgid "Dates" -msgstr "" +msgstr "Mes projets" #. module: project -#: help:project.project,progress_rate:0 -msgid "Percent of tasks closed according to the total of tasks todo." -msgstr "" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML non valide pour l'architecture de la vue!" #. module: project -#: field:project.project,parent_id:0 -msgid "Parent Project" -msgstr "" +#: wizard_field:project.wiz_bill,init,sale_account_id:0 +msgid "Income account" +msgstr "Compte de revenues" #. module: project #: field:project.task,type:0 @@ -268,10 +304,9 @@ msgid "Type" msgstr "Type" #. module: project -#: model:ir.actions.act_window,name:project.open_view_project -#: model:ir.ui.menu,name:project.menu_open_view_project -msgid "New Project" -msgstr "" +#: wizard_field:project.wiz_bill,init,total:0 +msgid "Total Price" +msgstr "Prix Total" #. module: project #: selection:project.task,priority:0 @@ -285,9 +320,9 @@ msgid "Task Work" msgstr "Travail effectué" #. module: project -#: selection:res.company,project_time_mode:0 -msgid "Hours" -msgstr "" +#: model:ir.ui.menu,name:project.menu_action_view_task +msgid "All Tasks" +msgstr "Toutes les tâches" #. module: project #: model:ir.actions.act_window,name:project.action_view_task5_pending @@ -304,7 +339,12 @@ msgstr "Tâches non-assignées" #. module: project #: view:project.task:0 msgid "Extra Info" -msgstr "" +msgstr "Infos Complémentaires" + +#. module: project +#: field:project.project,pricelist_id:0 +msgid "Pricelist" +msgstr "Liste de prix" #. module: project #: field:project.project,warn_header:0 @@ -312,25 +352,23 @@ msgid "Mail header" msgstr "Entête de mail" #. module: project -#: field:project.project,date_start:0 -msgid "Starting Date" -msgstr "" +#: model:ir.model,name:project.model_project_task_type +msgid "Project task type" +msgstr "Type de tâche" #. module: project +#: model:ir.actions.act_window,name:project.open_view_project +#: model:ir.ui.menu,name:project.menu_open_view_project #: model:ir.ui.menu,name:project.next_id_54 #: view:project.project:0 msgid "Projects" -msgstr "" +msgstr "Projets" #. module: project -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: project -#: field:project.task,history:0 -msgid "Task Details" -msgstr "" +#: model:ir.actions.act_window,name:project.action_view_task3 +#: model:ir.ui.menu,name:project.menu_action_view_task3 +msgid "Unbilled open tasks" +msgstr "Tâches ouvertes non facturées" #. module: project #: view:project.project:0 @@ -338,11 +376,6 @@ msgid "User: %(user_id)s" msgstr "Utilisateur: %(user_id)s" #. module: project -#: field:project.task,delay_hours:0 -msgid "Delay Hours" -msgstr "" - -#. module: project #: model:ir.actions.act_window,name:project.open_view_my_project_open #: model:ir.ui.menu,name:project.menu_open_view_my_project_open msgid "My open projects" @@ -354,27 +387,18 @@ msgid "Contact" msgstr "Contact" #. module: project +#: view:project.project:0 #: view:project.task:0 msgid "Delegate" -msgstr "" - -#. module: project -#: view:project.task:0 -msgid "Project Tasks" -msgstr "" +msgstr "Délégué" #. module: project #: model:ir.ui.menu,name:project.menu_main -#: view:res.company:0 msgid "Project Management" -msgstr "Gestion de projet" - -#. module: project -#: field:res.company,project_time_mode:0 -msgid "Project Time Unit" -msgstr "" +msgstr "Gestion de projets" #. module: project +#: view:project.project:0 #: view:project.task:0 msgid "Tasks" msgstr "Tâches" @@ -385,9 +409,10 @@ msgid "Task type" msgstr "Type de tâche" #. module: project -#: field:project.project,warn_customer:0 -msgid "Warn Partner" -msgstr "" +#: model:ir.actions.act_window,name:project.action_view_task_new +#: model:ir.ui.menu,name:project.menu_action_view_task_new +msgid "New Task" +msgstr "Nouvelle tâche" #. module: project #: view:project.project:0 @@ -401,23 +426,35 @@ msgstr "Tâches de projet" #. module: project #: view:project.project:0 +#: view:project.task:0 +msgid "Re-open" +msgstr "Ré-ouvrir" + +#. module: project +#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened +msgid "Opened tasks" +msgstr "Tâches ouvertes" + +#. module: project +#: view:project.project:0 msgid "Status: %(state)s" msgstr "Statut: %(state)s" #. module: project -#: view:project.task:0 -msgid "Planned" -msgstr "" +#: field:project.task,billable:0 +msgid "To be invoiced" +msgstr "A facturer" #. module: project -#: view:project.task:0 -msgid "Delegated tasks" -msgstr "" +#: model:ir.ui.menu,name:project.menu_action_billable +msgid "Billable Tasks" +msgstr "Tâches facturables" #. module: project -#: model:ir.model,name:project.model_project_task_type -msgid "Project task type" -msgstr "Type de tâche" +#: view:project.project:0 +#: view:project.task:0 +msgid "Delegated tasks" +msgstr "Tâches déléguées" #. module: project #: view:project.project:0 @@ -425,6 +462,11 @@ msgid "Administration" msgstr "Administration" #. module: project +#: selection:project.project,mode:0 +msgid "By Task" +msgstr "Par tâche" + +#. module: project #: wizard_field:project.task.close,mail_ask,email:0 msgid "E-Mails" msgstr "E-mails" @@ -435,9 +477,9 @@ msgid "Partner Info" msgstr "Infos partenaire" #. module: project -#: selection:project.task,state:0 -msgid "Draft" -msgstr "Brouillon" +#: wizard_view:project.wiz_bill,init:0 +msgid "Billing wizard" +msgstr "Fenêtres de Facturation" #. module: project #: selection:project.task,priority:0 @@ -445,14 +487,10 @@ msgid "Low" msgstr "Basse" #. module: project +#: view:project.project:0 #: view:project.task:0 msgid "Set Draft" -msgstr "" - -#. module: project -#: field:project.project,manager:0 -msgid "Project Manager" -msgstr "" +msgstr "Mettre en brouillon" #. module: project #: selection:project.project,state:0 @@ -464,17 +502,7 @@ msgstr "En attente" #: field:project.project,state:0 #: field:project.task,state:0 msgid "Status" -msgstr "" - -#. module: project -#: field:project.task.work,hours:0 -msgid "Time Spent" -msgstr "" - -#. module: project -#: field:project.project,name:0 -msgid "Project Name" -msgstr "" +msgstr "État" #. module: project #: model:ir.actions.act_window,name:project.open_view_all_project_unclosed_open @@ -485,10 +513,10 @@ msgid "Open projects" msgstr "Projets ouverts" #. module: project -#: field:project.task,date_start:0 -#: field:project.task.work,date:0 -msgid "Date" -msgstr "" +#: field:project.project,active:0 +#: field:project.task,active:0 +msgid "Active" +msgstr "Actif" #. module: project #: model:ir.actions.act_window,name:project.action_view_task6_prog @@ -497,42 +525,31 @@ msgid "Tasks in Progress" msgstr "Tâches en cours" #. module: project +#: view:project.project:0 #: view:project.task:0 msgid "Task edition" msgstr "Édition de tâche" #. module: project -#: field:project.task,parent_id:0 -msgid "Parent Task" -msgstr "" - -#. module: project -#: selection:res.company,project_time_mode:0 -msgid "Months" -msgstr "" +#: view:project.project:0 +msgid "Others" +msgstr "Autres" #. module: project #: wizard_field:project.task.delegate,init,prefix:0 msgid "Prefix of Task" -msgstr "" - -#. module: project -#: field:project.project,active:0 -#: field:project.task,active:0 -msgid "Active" -msgstr "Actif" +msgstr "Préfixe de la Tâche" #. module: project -#: help:res.company,project_time_mode:0 -msgid "This will set the unit of measure used in projects and tasks.\n" -"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees." -msgstr "" +#: field:project.task,date_start:0 +#: field:project.task.work,date:0 +msgid "Date" +msgstr "Date" #. module: project -#, python-format -#: code:addons/project/wizard/close_task.py:0 -msgid "Error" -msgstr "" +#: wizard_field:project.wiz_bill,init,task_total:0 +msgid "Number of tasks" +msgstr "Nombres de tâches" #. module: project #: model:ir.actions.act_window,name:project.act_res_users_2_project_project @@ -540,6 +557,11 @@ msgid "User's projects" msgstr "Projets de l'utilisateur" #. module: project +#: selection:project.task,priority:0 +msgid "Urgent" +msgstr "Urgent" + +#. module: project #: model:ir.actions.act_window,name:project.open_view_all_project_unclosed #: model:ir.ui.menu,name:project.menu_all_project_unclosed msgid "Unclosed projects" @@ -548,7 +570,7 @@ msgstr "Projets non-clôturés" #. module: project #: wizard_view:project.task.delegate,init:0 msgid "Delegate this task to a user" -msgstr "" +msgstr "Délégué cette tâche à un utilisateur" #. module: project #: field:project.task,date_close:0 @@ -561,11 +583,6 @@ msgid "Assigned to" msgstr "Assigné à" #. module: project -#: view:project.task:0 -msgid "Delay" -msgstr "" - -#. module: project #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month msgid "Month works" msgstr "Travail mensuel" @@ -577,6 +594,11 @@ msgid "Gantt Representation" msgstr "Diagramme de Gantt" #. module: project +#: view:project.project:0 +msgid "All tasks" +msgstr "Toutes les tâches" + +#. module: project #: field:project.task,name:0 msgid "Task summary" msgstr "Résumé de la tâche" @@ -589,23 +611,21 @@ msgstr "Date de début: %(date_start)s" #. module: project #: selection:project.project,state:0 #: selection:project.task,state:0 +#: view:project.project:0 #: view:project.task:0 msgid "Done" msgstr "Effectué" #. module: project +#: wizard_button:project.wiz_bill,init,end:0 #: wizard_button:project.task.close,mail_ask,end:0 #: wizard_button:project.task.delegate,init,end:0 +#: view:project.project:0 #: view:project.task:0 msgid "Cancel" msgstr "Annuler" #. module: project -#: help:project.project,category_id:0 -msgid "Link this project to an analytic account if you need financial management on projects. It ables to connect projects with budgets, plannings, costs and revenues analysis, timesheet on projects, etc." -msgstr "" - -#. module: project #: selection:project.project,state:0 #: selection:project.task,state:0 #: view:project.task:0 @@ -613,6 +633,11 @@ msgid "Open" msgstr "Ouvert" #. module: project +#: view:project.task:0 +msgid "Effective hours" +msgstr "Heures effectives" + +#. module: project #: view:project.project:0 msgid "ID: %(task_id)s" msgstr "ID: %(task_id)s" @@ -620,7 +645,7 @@ msgstr "ID: %(task_id)s" #. module: project #: view:project.task:0 msgid "Information" -msgstr "" +msgstr "Information" #. module: project #: model:ir.actions.act_window,name:project.open_view_my_project_open_unclosed @@ -630,23 +655,26 @@ msgstr "Mes projets non-clôturés" #. module: project #: 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: project -#: field:project.task,remaining_hours:0 -msgid "Remaining Hours" -msgstr "" +#: field:project.task,parent_id:0 +msgid "Parent Task" +msgstr "Tâche parente" #. module: project -#: field:project.project,timesheet_id:0 -msgid "Working Time" -msgstr "" +#: field:project.project,date_start:0 +msgid "Project started on" +msgstr "Projet démarré le" #. module: project #: wizard_view:project.task.delegate,init:0 msgid "Delegated Task" -msgstr "" +msgstr "Tache délégué" #. module: project #: selection:project.task,priority:0 @@ -659,51 +687,61 @@ msgid "Send mail to customer" msgstr "Envoyer mail au client" #. module: project -#: field:project.project,warn_manager:0 -msgid "Warn Manager" -msgstr "" - -#. module: project -#: constraint:project.project:0 -msgid "Error ! You can not create recursive projects." -msgstr "" +#: field:project.project,timesheet_id:0 +msgid "Working hours" +msgstr "Heures travaillées" #. module: project #: field:project.project,planned_hours:0 +#: view:project.task:0 msgid "Planned hours" msgstr "Heures planifiées" #. module: project -#: field:project.task,total_hours:0 -msgid "Total Hours" -msgstr "" - -#. module: project #: wizard_field:project.task.close,mail_ask,description:0 #: field:project.task,description:0 #: field:project.task.type,description:0 +#: view:project.project:0 +#: view:project.task:0 msgid "Description" msgstr "Description" #. module: project -#: selection:project.task,priority:0 -msgid "Urgent" -msgstr "Urgent" +#: field:project.project,date_end:0 +msgid "Project should end on" +msgstr "Date de fin de projet" + +#. module: project +#: view:project.project:0 +msgid "Task definition" +msgstr "Définition de la tâche" + +#. module: project +#: wizard_field:project.wiz_bill,init,journal_id:0 +msgid "Journal" +msgstr "Journal" #. module: project #: field:project.task,work_ids:0 +#: view:project.project:0 msgid "Work done" msgstr "Travail effectué" #. module: project #: field:project.project,effective_hours:0 +#: field:project.task.work,hours:0 msgid "Hours spent" msgstr "Heures travaillées" #. module: project +#: field:project.task,progress:0 +msgid "Progress (0-100)" +msgstr "Avancement (0-100)" + +#. module: project #: wizard_field:project.task.delegate,init,include_info:0 msgid "Copy Description" -msgstr "" +msgstr "Copier la description" #. module: project #: field:project.project,tasks:0 @@ -711,9 +749,20 @@ msgid "Project tasks" msgstr "Tâches du projet" #. module: project -#: help:project.project,warn_manager:0 -msgid "If you check this field, the project manager will receive a request each time a task is completed by his team." -msgstr "" +#: field:project.project,parent_id:0 +msgid "Parent project" +msgstr "Project Parent" + +#. module: project +#: field:project.project,partner_id:0 +#: field:project.task,partner_id:0 +msgid "Customer" +msgstr "Client" + +#. module: project +#: field:project.task,planned_hours:0 +msgid "Plan. hours" +msgstr "Heures Plan." #. module: project #: field:project.task.work,name:0 @@ -726,18 +775,17 @@ msgid "Project task" msgstr "Tâche de projet" #. module: project -#: field:project.task,effective_hours:0 -msgid "Hours Spent" -msgstr "" +#: selection:project.project,mode:0 +msgid "By Effective Hour" +msgstr "Par Heure Effective" #. module: project -#: view:project.task:0 -msgid "Re-open" -msgstr "Ré-ouvrir" +#: selection:project.project,mode:0 +msgid "By Hour" +msgstr "Par Heure" #. module: project #: model:ir.actions.act_window,name:project.action_view_task6 -#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened #: model:ir.ui.menu,name:project.menu_action_view_task6 msgid "Open Tasks" msgstr "Tâches ouvertes" @@ -746,23 +794,23 @@ msgstr "Tâches ouvertes" #: field:project.project,priority:0 #: field:project.task,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Séquence" #. module: project #: wizard_view:project.task.delegate,init:0 msgid "Validation Task" -msgstr "" +msgstr "Tâche Validée" #. module: project #: model:ir.actions.act_window,name:project.open_view_all_project #: model:ir.ui.menu,name:project.menu_all_project msgid "All Projects" -msgstr "" +msgstr "Tous les projets" #. module: project #: wizard_field:project.task.delegate,init,state:0 msgid "Validation State" -msgstr "" +msgstr "État de Validation" #. module: project #: wizard_button:project.task.close,mail_ask,close:0 @@ -772,12 +820,12 @@ msgstr "Fermer (sans mail)" #. module: project #: wizard_field:project.task.delegate,init,user_id:0 msgid "Assign To" -msgstr "" +msgstr "Attribué à" #. module: project #: field:project.task,priority:0 msgid "Importance" -msgstr "" +msgstr "Important" #. module: project #: view:project.project:0 @@ -785,12 +833,16 @@ msgid "Date Stop: %(date_stop)s" msgstr "Date d'arrêt: %(date_stop)s" #. module: project -#: field:project.project,date_end:0 -msgid "Expected End" -msgstr "" +#: wizard_field:project.wiz_bill,init,invoice_num:0 +msgid "Generated invoices" +msgstr "Factures Générées" #. module: project -#: view:project.project:0 -msgid "Mail Footer" -msgstr "" +#: wizard_field:project.wiz_bill,init,task_invoice:0 +msgid "Tasks to invoice" +msgstr "Tâches a facturer" +#. module: project +#: field:project.project,manager:0 +msgid "Project manager" +msgstr "Directeur de projet" diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 6be52bd3490..9ba6a39b9dc 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -112,5 +112,44 @@ <field model="process.node" name="source_node_id" ref="process_node_donetask0"/> </record> + <!-- + Process Action + --> + + <record id="process_transition_action_draftopentask0" model="process.transition.action"> + <field eval=""""do_open"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Open"""" name="name"/> + <field name="transition_id" ref="process_transition_draftopentask0"/> + </record> + + <record id="process_transition_action_draftcanceltask0" model="process.transition.action"> + <field eval=""""do_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_draftopentask0"/> + </record> + + <record id="process_transition_action_openpendingtask0" model="process.transition.action"> + <field eval=""""do_pending"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Set pending"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + + <record id="process_transition_action_opendrafttask0" model="process.transition.action"> + <field eval=""""do_draft"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Draft"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + + <record id="process_transition_action_opencanceltask0" model="process.transition.action"> + <field eval=""""do_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/project/project.py b/addons/project/project.py index 55ed7b33df4..f27fa4f00c9 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -197,7 +197,7 @@ class project_task_type(osv.osv): _name = 'project.task.type' _description = 'Project task type' _columns = { - 'name': fields.char('Type', required=True, size=64), + 'name': fields.char('Type', required=True, size=64, translate=True), 'description': fields.text('Description'), } project_task_type() diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 0f518ab67b2..12f9a17491f 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -116,7 +116,7 @@ <field name="domain">[('state','=','open')]</field> <field name="view_id" ref="view_project"/> </record> - <menuitem id="next_id_54" name="Projects" parent="project.menu_definitions"/><menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="next_id_54"/> + <menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="menu_all_project"/> <record id="open_view_template_project" model="ir.actions.act_window"> <field name="name">Template projects</field> @@ -125,6 +125,7 @@ <field name="domain">[('state','=','template')]</field> <field name="view_id" ref="view_project"/> </record> + <menuitem id="next_id_54" name="Projects" parent="project.menu_definitions"/> <menuitem action="open_view_template_project" id="menu_template_project" parent="next_id_54"/> <record id="open_view_project" model="ir.actions.act_window"> @@ -184,7 +185,7 @@ <field name="name">My projects</field> <field name="res_model">project.project</field> <field name="view_type">tree</field> - <field name="domain">[('manager', '=', uid)]</field> + <field name="domain">[('parent_id','=',False),('manager', '=', uid)]</field> <field name="view_id" ref="view_my_project"/> </record> <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="project.menu_main"/> @@ -194,7 +195,7 @@ <field name="name">My unclosed projects</field> <field name="res_model">project.project</field> <field name="view_type">tree</field> - <field name="domain">[('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]</field> + <field name="domain">[('parent_id','=',False),('manager', '=', uid),('state','<>','cancelled'),('state','<>','done')]</field> <field name="view_id" ref="view_my_project"/> </record> <menuitem action="open_view_my_project_open_unclosed" id="menu_open_view_my_project_open_unclosed" parent="project.menu_open_view_my_project"/> @@ -204,7 +205,7 @@ <field name="name">My open projects</field> <field name="res_model">project.project</field> <field name="view_type">tree</field> - <field name="domain">[('manager', '=', uid),('state','=','open')]</field> + <field name="domain">[('parent_id','=',False),('manager', '=', uid),('state','=','open')]</field> <field name="view_id" ref="view_my_project"/> </record> <menuitem action="open_view_my_project_open" id="menu_open_view_my_project_open" parent="project.menu_open_view_my_project_open_unclosed"/> @@ -324,7 +325,7 @@ <field eval="2" name="priority"/> <field name="arch" type="xml"> <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks"> - <level object="project.project" domain="[]"> + <level object="project.project" link="project_id" domain="[]"> <field name="name"/> </level> </gantt> diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index e5826a931ca..40f5cfdb94b 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -1,5 +1,8 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1 -access_project_task_type,project.task.type,model_project_task_type,project.group_project_manager,1,1,1,1 -access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1 -access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1 +"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1 +"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1 +"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1 +"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1 +"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1 +"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1 diff --git a/addons/project_gtd/i18n/fr_FR.po b/addons/project_gtd/i18n/fr_FR.po index bf7690fef09..b218633cdcb 100644 --- a/addons/project_gtd/i18n/fr_FR.po +++ b/addons/project_gtd/i18n/fr_FR.po @@ -4,36 +4,40 @@ # 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:25+0000\n" +"PO-Revision-Date: 2008-10-14 10:24+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:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: project_gtd #: 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: project_gtd #: model:ir.model,name:project_gtd.model_project_gtd_timebox msgid "project.gtd.timebox" -msgstr "" +msgstr "project.gtd.timebox" #. module: project_gtd #: field:project.gtd.timebox,context1_id:0 msgid "Context 1" -msgstr "" +msgstr "Contexte 1" #. module: project_gtd #: selection:project.gtd.timebox,type:0 msgid "Monthly" -msgstr "" +msgstr "Mensuel" #. module: project_gtd #: field:project.gtd.timebox,parent_id:0 @@ -43,7 +47,7 @@ msgstr "" #. module: project_gtd #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML invalide pour la Visualisation de l'Architecture" #. module: project_gtd #: wizard_field:project.gtd.timebox.fill,init,task_ids:0 @@ -53,18 +57,18 @@ msgstr "Sélection des tâches" #. module: project_gtd #: field:project.gtd.timebox,col_priority:0 msgid "Priority" -msgstr "" +msgstr "Priorité" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox #: model:ir.ui.menu,name:project_gtd.menu_open_time_myinbox msgid "My Inbox" -msgstr "" +msgstr "Ma boîte de réception" #. module: project_gtd #: field:project.gtd.timebox,context3_id:0 msgid "Context 3" -msgstr "" +msgstr "Contexte 3" #. module: project_gtd #: view:project.gtd.timebox:0 @@ -74,7 +78,7 @@ msgstr "" #. module: project_gtd #: field:project.gtd.timebox,context4_id:0 msgid "Context 4" -msgstr "" +msgstr "Contexte 4" #. module: project_gtd #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0 @@ -84,7 +88,7 @@ msgstr "Définir dans la timebox" #. module: project_gtd #: field:project.gtd.timebox,type:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox @@ -101,13 +105,13 @@ msgstr "" #. module: project_gtd #: view:project.gtd.timebox:0 msgid "Visible Columns" -msgstr "" +msgstr "Colonnes visibles" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree_my #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_contexts msgid "My Contexts" -msgstr "" +msgstr "Mes Contextes" #. module: project_gtd #: wizard_view:project.gtd.timebox.fill,init:0 @@ -117,7 +121,7 @@ msgstr "Selection des tâches de la timebox" #. module: project_gtd #: field:project.gtd.timebox,col_effective_hours:0 msgid "Effective Hours" -msgstr "" +msgstr "Heures Effectives" #. module: project_gtd #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty @@ -137,7 +141,7 @@ msgstr "" #. module: project_gtd #: field:project.gtd.timebox,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: project_gtd #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily @@ -148,22 +152,22 @@ msgstr "" #. module: project_gtd #: model:ir.model,name:project_gtd.model_project_gtd_context msgid "project.gtd.context" -msgstr "" +msgstr "project.gtd.context" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open msgid "My Deadlines" -msgstr "" +msgstr "Mes dates limites" #. module: project_gtd #: field:project.gtd.timebox,context2_id:0 msgid "Context 2" -msgstr "" +msgstr "Contexte 2" #. module: project_gtd #: field:project.gtd.context,project_default_id:0 msgid "Default Project" -msgstr "" +msgstr "Projet par défaut" #. module: project_gtd #: wizard_button:project.gtd.timebox.fill,init,process:0 @@ -173,24 +177,24 @@ msgstr "Ajouter à la timebox" #. module: project_gtd #: field:project.gtd.timebox,context5_id:0 msgid "Context 5" -msgstr "" +msgstr "Contexte 5" #. module: project_gtd #: field:project.gtd.timebox,context6_id:0 msgid "Context 6" -msgstr "" +msgstr "Contexte 6" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts #: view:project.gtd.timebox:0 msgid "Contexts" -msgstr "" +msgstr "Contextes" #. module: project_gtd #: selection:project.gtd.timebox,type:0 msgid "Daily" -msgstr "" +msgstr "Quotidien" #. module: project_gtd #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill @@ -200,7 +204,7 @@ msgstr "" #. module: project_gtd #: field:project.gtd.timebox,col_project:0 msgid "Project" -msgstr "" +msgstr "Projet" #. module: project_gtd #: wizard_button:project.gtd.timebox.fill,init,end:0 @@ -219,7 +223,7 @@ msgstr "" #: field:project.task,context_id:0 #: view:project.gtd.context:0 msgid "Context" -msgstr "" +msgstr "Contexte" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open @@ -241,28 +245,28 @@ msgstr "Tâches" #. module: project_gtd #: field:project.gtd.context,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Séquence" #. module: project_gtd #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time #: model:ir.ui.menu,name:project_gtd.menu_open_time msgid "Time Management" -msgstr "" +msgstr "Gestion du Temps" #. module: project_gtd #: selection:project.gtd.timebox,type:0 msgid "Other" -msgstr "" +msgstr "Autre" #. module: project_gtd #: field:project.gtd.timebox,col_deadline:0 msgid "Deadline" -msgstr "" +msgstr "Date limite" #. module: project_gtd #: view:project.task:0 msgid "Est. Hours" -msgstr "" +msgstr "Heures est." #. module: project_gtd #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0 @@ -284,15 +288,14 @@ msgstr "" #. module: project_gtd #: field:project.gtd.timebox,col_date_start:0 msgid "Date Start" -msgstr "" +msgstr "Date de début" #. module: project_gtd #: field:project.gtd.timebox,col_planned_hours:0 msgid "Planned Hours" -msgstr "" +msgstr "Heures planifiés" #. module: project_gtd #: selection:project.gtd.timebox,type:0 msgid "Weekly" -msgstr "" - +msgstr "Hebdomadaire" diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml index 03503303311..003245aaf40 100644 --- a/addons/project_gtd/project_gtd_wizard.xml +++ b/addons/project_gtd/project_gtd_wizard.xml @@ -3,7 +3,7 @@ <data> <wizard string="My Daily Timebox" - model="ir.ui.menu" + model="project.gtd.timebox" name="project.gtd.timebox.daily" multi="True" id="open_gtd_timebox_daily"/> diff --git a/addons/project_mrp/i18n/fr_FR.po b/addons/project_mrp/i18n/fr_FR.po index 512286216e8..3108a9f2cb3 100644 --- a/addons/project_mrp/i18n/fr_FR.po +++ b/addons/project_mrp/i18n/fr_FR.po @@ -4,14 +4,14 @@ # 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-11 15:41:42+0000\n" +"PO-Revision-Date: 2008-09-11 15:41:42+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" diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 0c856b7a96d..125d325f223 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -9,10 +9,11 @@ <record id="process_node_tasks0" model="process.node"> <field name="menu_id" ref="project.menu_action_view_task"/> <field name="model_id" ref="project.model_project_task"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Tasks"""" name="name"/> <field eval=""""In case you sell services on sale order (task subflow)"""" name="note"/> <field name="process_id" ref="sale.process_process_salesworkflow0"/> + <field name="subflow_id" ref="project.process_process_tasksworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -35,6 +36,7 @@ <field eval=""""Procure task"""" name="name"/> <field eval=""""If Procure method is produce"""" name="note"/> <field name="process_id" ref="mrp.process_process_procurementworkflow0"/> + <field name="subflow_id" ref="project.process_process_tasksworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -78,6 +80,32 @@ <field eval=""""If procure method is Make to order and supply method is produce"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procuretask0"/> <field model="process.node" name="source_node_id" ref="mrp.process_node_maketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_orderconfirmtask0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> + </record> + + <record id="process_transition_action_ordercanceltask0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> + </record> + + <record id="process_transition_action_taskrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> </record> </data> diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv new file mode 100644 index 00000000000..407ab3716a0 --- /dev/null +++ b/addons/project_mrp/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_mrp_procurement_project_user","mrp.procurement project_user","model_mrp_procurement","project.group_project_user",1,1,1,1 +"access_mrp_procurement_project_manager","mrp.procurement project_manager","model_mrp_procurement","project.group_project_manager",1,1,1,1 diff --git a/addons/project_timesheet/i18n/fr_FR.po b/addons/project_timesheet/i18n/fr_FR.po index a88c47adcc0..47892ea8f3f 100644 --- a/addons/project_timesheet/i18n/fr_FR.po +++ b/addons/project_timesheet/i18n/fr_FR.po @@ -4,14 +4,14 @@ # 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-11 15:41:42+0000\n" +"PO-Revision-Date: 2008-09-11 15:41:42+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" diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po index faa8b4ce4a7..ac50f2b0c75 100644 --- a/addons/purchase/i18n/fr_FR.po +++ b/addons/purchase/i18n/fr_FR.po @@ -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:26+0000\n" +"PO-Revision-Date: 2008-10-14 14:21+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 15:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: purchase #: field:purchase.order,invoiced:0 @@ -21,30 +22,26 @@ msgid "Invoiced & Paid" msgstr "Facturé & payé" #. module: purchase -#: field:purchase.order,location_id:0 -msgid "Destination" -msgstr "" - -#. module: purchase -#: rml:purchase.order:0 -msgid "Validated By" -msgstr "" - -#. module: purchase #: field:purchase.order,partner_id:0 msgid "Supplier" -msgstr "" +msgstr "Fournisseur" #. module: purchase #: wizard_view:purchase.order.merge,init:0 -msgid "Please note that orders will only be merged if they are to the same partner and going to the same location, and lines will only be merged if they are exactly the same except for the quantity and unit." -msgstr "Veuillez noter que les commandes ne seront fusionnées que si elles sont destinées au même partenaire et vont à la même zone de stockage, et que les lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf pour la quantité et l'unité" +msgid "" +"Please note that orders will only be merged if they are to the same partner " +"and going to the same location, and lines will only be merged if they are " +"exactly the same except for the quantity and unit." +msgstr "" +"Veuillez noter que les commandes ne seront fusionnées que si elles sont " +"destinées au même partenaire et vont à la même zone de stockage, et que les " +"lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf " +"pour la quantité et l'unité" #. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "No Pricelist !" -msgstr "" +#: rml:purchase.order:0 +msgid "Your order reference :" +msgstr "Votre référence de commande :" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order @@ -54,7 +51,7 @@ msgstr "Commande fournisseur" #. module: purchase #: model:product.pricelist,name:purchase.list0 msgid "Default Purchase Pricelist" -msgstr "" +msgstr "Liste de prix d'achat par défaut" #. module: purchase #: rml:purchase.quotation:0 @@ -62,24 +59,29 @@ msgid "Thanks," msgstr "Merci," #. module: purchase -#: model:ir.actions.wizard,name:purchase.purchase_order_merge -msgid "Merge purchases" -msgstr "Fusionner les achats" - -#. module: purchase #: help:res.partner,property_product_pricelist_purchase:0 -msgid "This pricelist will be used, instead of the default one, for purchases from the current partner" -msgstr "Cette liste de prix sera utilisée, au lieu de celle par défaut, pour les achats du partenaire courant" +msgid "" +"This pricelist will be used, instead of the default one, for purchases from " +"the current partner" +msgstr "" +"Cette liste de prix sera utilisée, au lieu de celle par défaut, pour les " +"achats du partenaire courant" #. module: purchase #: rml:purchase.order:0 +#: rml:purchase.quotation:0 msgid "Fax :" msgstr "Fax :" #. module: purchase #: help:purchase.order,pricelist_id:0 -msgid "The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities." +msgid "" +"The pricelist sets the currency used for this purchase order. It also " +"computes the supplier price for the selected products/quantities." msgstr "" +"La liste de prix fixe la devise utilisée pour la commande d'achat. Elle " +"calcule également le prix fournisseur pour les quantités de produits " +"sélectionnées." #. module: purchase #: field:purchase.order.line,price_subtotal:0 @@ -98,20 +100,11 @@ msgid "Purchase Orders in Progress" msgstr "Ordres d'achat en cours" #. module: purchase -#: field:purchase.order.line,notes:0 -#: field:purchase.order,notes:0 -#: view:purchase.order:0 -#: view:purchase.order.line:0 -msgid "Notes" -msgstr "Notes" - -#. module: purchase -#: rml:purchase.order:0 -msgid "N°" -msgstr "" +#: field:purchase.order,minimum_planned_date:0 +msgid "Minimum Planned Date" +msgstr "Date Plannifiée Minimum" #. module: purchase -#: rml:purchase.order:0 #: field:purchase.order,amount_tax:0 #: field:purchase.order.line,taxes_id:0 msgid "Taxes" @@ -123,12 +116,7 @@ msgstr "Taxes" #: view:purchase.order:0 #: model:res.request.link,name:purchase.req_link_purchase_order msgid "Purchase Order" -msgstr "" - -#. module: purchase -#: rml:purchase.order:0 -msgid "Net Total :" -msgstr "" +msgstr "Commande d'achat" #. module: purchase #: selection:purchase.order,state:0 @@ -137,8 +125,21 @@ msgstr "Annulé" #. module: purchase #: help:purchase.order,state:0 -msgid "The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception." -msgstr "" +msgid "" +"The state of the purchase order or the quotation request. A quotation is a " +"purchase order in a 'Draft' state. Then the order has to be confirmed by the " +"user, the state switch to 'Confirmed'. Then the supplier must confirm the " +"order to change the state to 'Approved'. When the purchase order is paid and " +"received, the state becomes 'Done'. If a cancel action occurs in the invoice " +"or in the reception of goods, the state becomes in exception." +msgstr "" +"État de la commande d'achat ou du devis. Un devis est une commande d'achat à " +"l'état 'Brouillon'. La commande doit alors être confirmée par l'utilisateur, " +"l'état deviendra 'Confirmée'. Le fournisseur devra alors confirmer la " +"commande pour changer l'état à 'Appouvée'. Lorsque la commande d'achat est " +"payée et reçue, l'état devient 'Terminé'. Si une action 'Annuler' est " +"déclenchée dans la facturation ou dans la réception de marchandises, l'état " +"de la commande se met en exception." #. module: purchase #: field:purchase.order,origin:0 @@ -146,21 +147,12 @@ msgid "Origin" msgstr "Origine" #. module: purchase -#: view:purchase.order:0 -msgid "Reference" -msgstr "" - -#. module: purchase #: rml:purchase.order:0 +#: rml:purchase.quotation:0 msgid "TVA :" msgstr "TVA :" #. module: purchase -#: rml:purchase.quotation:0 -msgid "Tel.:" -msgstr "" - -#. module: purchase #: view:purchase.order:0 msgid "Invoice Done" msgstr "Facturé" @@ -173,7 +165,7 @@ msgstr "Compte analytique" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line msgid "Purchase Order lines" -msgstr "" +msgstr "Lignes de commande d'achat" #. module: purchase #: field:purchase.order,validator:0 @@ -191,18 +183,6 @@ msgid "Order Line" msgstr "Ligne de commande" #. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "You have to select a pricelist in the purchase form !\nPlease set one before choosing a product." -msgstr "" - -#. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "Wrong Product UOM !" -msgstr "" - -#. module: purchase #: selection:purchase.order,state:0 msgid "Confirmed" msgstr "Visé par acheteur" @@ -210,7 +190,7 @@ msgstr "Visé par acheteur" #. module: purchase #: view:purchase.order:0 msgid "Invoice Control" -msgstr "" +msgstr "Contrôle facture" #. module: purchase #: rml:purchase.quotation:0 @@ -235,12 +215,7 @@ msgstr "Entrepôt" #. module: purchase #: field:purchase.order,order_line:0 msgid "Order Lines" -msgstr "" - -#. module: purchase -#: rml:purchase.quotation:0 -msgid "Fax:" -msgstr "" +msgstr "Lignes de la commande" #. module: purchase #: view:purchase.order:0 @@ -253,14 +228,9 @@ msgid "Shipping address :" msgstr "Adresse de livraison :" #. module: purchase -#: field:res.partner,property_product_pricelist_purchase:0 -msgid "Purchase Pricelist" -msgstr "Liste de prix d'achat" - -#. module: purchase -#: field:purchase.order,minimum_planned_date:0 -msgid "Planned Date" -msgstr "" +#: rml:purchase.quotation:0 +msgid "Printed:" +msgstr "Imprimé:" #. module: purchase #: view:purchase.order:0 @@ -268,9 +238,9 @@ msgid "Approved by Supplier" msgstr "Approuvé par le fournisseur" #. module: purchase -#: rml:purchase.order:0 -msgid "Total :" -msgstr "" +#: model:ir.actions.wizard,name:purchase.purchase_order_merge +msgid "Merge purchases" +msgstr "Fusionner les achats" #. module: purchase #: field:purchase.order.line,move_dest_id:0 @@ -280,7 +250,7 @@ msgstr "Destination de la réservation" #. module: purchase #: field:purchase.order,name:0 msgid "Order Reference" -msgstr "" +msgstr "Référence commande" #. module: purchase #: field:purchase.order,pricelist_id:0 @@ -290,7 +260,17 @@ msgstr "Liste de prix" #. module: purchase #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" + +#. module: purchase +#: rml:purchase.order:0 +msgid "Date ordered :" +msgstr "Date de commande :" + +#. module: purchase +#: help:purchase.order,minimum_planned_date:0 +msgid "Minimum schedule date of all products." +msgstr "Date prévue minimum pour tous les produits" #. module: purchase #: selection:purchase.order,invoice_method:0 @@ -298,19 +278,14 @@ msgid "Manual" msgstr "Manuel" #. module: purchase -#: rml:purchase.quotation:0 -msgid "Request for quotation :" -msgstr "" - -#. module: purchase -#: selection:purchase.order,state:0 -msgid "Shipping Exception" -msgstr "Exception livraison" +#: rml:purchase.order:0 +msgid "Our order reference :" +msgstr "Notre référence de commande :" #. module: purchase -#: help:purchase.order,minimum_planned_date:0 -msgid "This is computed as the minimum scheduled date of all purchase order lines' products." -msgstr "" +#: rml:purchase.order:0 +msgid "N° :" +msgstr "N° :" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -318,6 +293,11 @@ msgid "Purchase orders" msgstr "Ordres d'achat" #. module: purchase +#: rml:purchase.order:0 +msgid "TOTAL :" +msgstr "TOTAL :" + +#. module: purchase #: selection:purchase.order,invoice_method:0 msgid "From picking" msgstr "Sur colisages" @@ -326,7 +306,12 @@ msgstr "Sur colisages" #: model:ir.actions.act_window,name:purchase.purchase_form_action3 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action3 msgid "Purchase Order Waiting Approval" -msgstr "" +msgstr "Commande d'achat en attente d'approbation" + +#. module: purchase +#: rml:purchase.quotation:0 +msgid "Tel. :" +msgstr "Tél. :" #. module: purchase #: view:purchase.order:0 @@ -335,8 +320,10 @@ msgstr "Confirmer cde fourn." #. module: purchase #: help:purchase.order,picking_ids:0 -msgid "This is the list of picking list that have been generated for this purchase" -msgstr "Ceci est la liste de la liste de picking ayant été généré pour cet achat" +msgid "" +"This is the list of picking list that have been generated for this purchase" +msgstr "" +"Ceci est la liste de la liste de picking ayant été généré pour cet achat" #. module: purchase #: field:purchase.order,partner_ref:0 @@ -344,20 +331,9 @@ msgid "Partner Ref." msgstr "Réf. Partenaire" #. module: purchase -#: rml:purchase.order:0 -msgid "Taxes :" -msgstr "" - -#. module: purchase #: field:purchase.order,invoiced_rate:0 msgid "Invoiced" -msgstr "" - -#. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "You have to select a product UOM in the same category than the purchase UOM of the product" -msgstr "" +msgstr "Facturée" #. module: purchase #: field:purchase.order,dest_address_id:0 @@ -365,6 +341,16 @@ msgid "Destination Address" msgstr "Adresse de destination" #. module: purchase +#: rml:purchase.order:0 +msgid "Applicable Taxes" +msgstr "Taxes Applicables" + +#. module: purchase +#: selection:purchase.order,state:0 +msgid "Shipping Exception" +msgstr "Exception livraison" + +#. module: purchase #: field:stock.move,purchase_line_id:0 #: view:purchase.order.line:0 msgid "Purchase Order Line" @@ -373,7 +359,7 @@ msgstr "Ligne de commande" #. module: purchase #: view:purchase.order:0 msgid "Calendar View" -msgstr "" +msgstr "Vue calendrier" #. module: purchase #: selection:purchase.order,state:0 @@ -381,14 +367,19 @@ msgid "Invoice Exception" msgstr "Exception facture" #. module: purchase +#: rml:purchase.order:0 +msgid "Taxes :" +msgstr "Taxes :" + +#. module: purchase #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Ventes & Achats" #. module: purchase #: view:purchase.order:0 msgid "Delivery & Invoices" -msgstr "" +msgstr "Livraisons & Factures" #. module: purchase #: rml:purchase.quotation:0 @@ -396,10 +387,9 @@ msgid "Date" msgstr "Date" #. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "There is no expense account defined for this product: \"%s\" (id:%d)" -msgstr "" +#: field:purchase.order,location_id:0 +msgid "Delivery destination" +msgstr "Destination de Livraison" #. module: purchase #: field:purchase.order.line,date_planned:0 @@ -407,16 +397,6 @@ msgid "Scheduled date" msgstr "Date prévue" #. module: purchase -#: rml:purchase.order:0 -msgid "Our Order Reference" -msgstr "" - -#. module: purchase -#: rml:purchase.quotation:0 -msgid "TVA:" -msgstr "" - -#. module: purchase #: view:purchase.order:0 msgid "Compute" msgstr "Calculer" @@ -427,6 +407,11 @@ msgid "Cancel Purchase Order" msgstr "Annuler cde fourn." #. module: purchase +#: rml:purchase.order:0 +msgid "Validated by :" +msgstr "Valider par :" + +#. module: purchase #: field:purchase.order.line,product_qty:0 msgid "Quantity" msgstr "Quantité" @@ -434,12 +419,12 @@ msgstr "Quantité" #. module: purchase #: view:res.partner:0 msgid "Purchases" -msgstr "" +msgstr "Achats" #. module: purchase #: field:purchase.order,state:0 msgid "Order Status" -msgstr "" +msgstr "État de la commande" #. module: purchase #: view:purchase.order:0 @@ -453,12 +438,6 @@ msgid "Qty" msgstr "Qté" #. module: purchase -#: rml:purchase.order:0 -#: field:purchase.order.line,price_unit:0 -msgid "Unit Price" -msgstr "Prix" - -#. module: purchase #: selection:purchase.order,state:0 msgid "Done" msgstr "Terminé" @@ -482,7 +461,12 @@ msgstr "Réf. Commande" #: model:ir.actions.act_window,name:purchase.purchase_form_action #: model:ir.ui.menu,name:purchase.menu_purchase_form_action msgid "Purchase Orders" -msgstr "" +msgstr "Commandes d'achats" + +#. module: purchase +#: rml:purchase.quotation:0 +msgid "Other reference :" +msgstr "Autre référence :" #. module: purchase #: wizard_view:purchase.order.merge,init:0 @@ -492,14 +476,17 @@ msgstr "Fusionner les commandes" #. module: purchase #: 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: purchase #: model:ir.actions.act_window,name:purchase.purchase_form_action_new #: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new msgid "New Purchase Order" -msgstr "" +msgstr "Nouvelles commandes d'achats" #. module: purchase #: field:purchase.order,shipped:0 @@ -509,6 +496,7 @@ msgstr "Reçu" #. module: purchase #: rml:purchase.order:0 +#: rml:purchase.quotation:0 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation #: selection:purchase.order,state:0 msgid "Request for Quotation" @@ -526,8 +514,9 @@ msgstr "Sur la commande" #. module: purchase #: rml:purchase.order:0 -msgid "Date Req." -msgstr "" +#: field:purchase.order.line,price_unit:0 +msgid "Unit Price" +msgstr "Prix" #. module: purchase #: field:purchase.order,date_approve:0 @@ -535,21 +524,35 @@ msgid "Date Approved" msgstr "Date approbation" #. module: purchase +#: rml:purchase.quotation:0 #: field:purchase.order.line,product_id:0 msgid "Product" msgstr "Produit" #. module: purchase -#: rml:purchase.order:0 -#: rml:purchase.quotation:0 #: field:purchase.order.line,name:0 msgid "Description" msgstr "Description" #. module: purchase +#: rml:purchase.order:0 +msgid "Product Description" +msgstr "Descriptif Produit" + +#. module: purchase +#: rml:purchase.order:0 +msgid "Date Requested" +msgstr "Date de Demande" + +#. module: purchase +#: rml:purchase.quotation:0 +msgid "-" +msgstr "-" + +#. module: purchase #: view:purchase.order:0 msgid "Delivery" -msgstr "" +msgstr "Livraison" #. module: purchase #: field:purchase.order.line,product_uom:0 @@ -567,9 +570,12 @@ msgid "Reservation" msgstr "Réservation" #. module: purchase -#: rml:purchase.order:0 -msgid "Your Order Reference" -msgstr "" +#: field:purchase.order.line,notes:0 +#: field:purchase.order,notes:0 +#: view:purchase.order:0 +#: view:purchase.order.line:0 +msgid "Notes" +msgstr "Notes" #. module: purchase #: view:purchase.order:0 @@ -582,27 +588,30 @@ msgid "Total amount" msgstr "Montant total" #. module: purchase -#: rml:purchase.order:0 #: field:purchase.order,date_order:0 msgid "Date Ordered" -msgstr "Date de commande" +msgstr "Date de Commande" + +#. module: purchase +#: rml:purchase.order:0 +msgid "Net Total :" +msgstr "Net à payer :" #. module: purchase #: view:purchase.order:0 msgid "Purchase Control" -msgstr "" +msgstr "Contrôle d'achat" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft msgid "Request For Quotations" -msgstr "" +msgstr "Demande de Devis" #. module: purchase -#, python-format -#: code:addons/purchase/purchase.py:0 -msgid "Error !" -msgstr "" +#: field:res.partner,property_product_pricelist_purchase:0 +msgid "Purchase Pricelist" +msgstr "Liste de prix d'achat" #. module: purchase #: field:purchase.order,invoice_method:0 @@ -628,6 +637,7 @@ msgstr "Total" #: constraint:product.pricelist.version:0 msgid "You can not have 2 pricelist version that overlaps!" msgstr "" +"Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent" #. module: purchase #: wizard_view:purchase.order.merge,init:0 @@ -638,4 +648,3 @@ msgstr "Êtes-vous sûr de vouloir fusionner ces commandes ?" #: field:purchase.order,amount_untaxed:0 msgid "Untaxed Amount" msgstr "Montant HT" - diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d100c4a772c..23891fda515 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -23,6 +23,7 @@ <field eval=""""Purchase Order"""" name="name"/> <field eval=""""After confirming purchase order, it is approved by supplier."""" name="note"/> <field name="process_id" ref="account.process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -67,6 +68,7 @@ <field eval=""""Invoice Control"""" name="name"/> <field eval=""""Draft invoices are pre-generated for control."""" name="note"/> <field name="process_id" ref="process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -89,6 +91,7 @@ <field eval=""""Invoice after packing"""" name="name"/> <field eval=""""In case you control based on delivery"""" name="note"/> <field name="process_id" ref="process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -96,7 +99,19 @@ <!-- Process Transition --> - + + <record id="res_roles_purchase0" model="res.roles"> + <field eval=""""Purchase"""" name="name"/> + </record> + + <record id="purchase.trans_draft_confirmed" model="workflow.transition"> + <field name="role_id" ref="res_roles_purchase0"/> + </record> + + <record id="purchase.trans_router_invoice" model="workflow.transition"> + <field name="role_id" ref="res_roles_purchase0"/> + </record> + <record id="process_transition_confirmingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -104,8 +119,9 @@ <field eval=""""Confirm Purchase order from Request for quotation"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/> <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/> + <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/> </record> - + <record id="process_transition_approvingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -122,6 +138,7 @@ <field eval=""""After approved purchase order , it comes into the supplier invoice"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/> <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/> + <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/> </record> <record id="process_transition_createpackinglist0" model="process.transition"> @@ -150,6 +167,45 @@ <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/> </record> - + + <!-- + Process Action + --> + + <record id="process_transition_action_confirmpurchaseorder0" model="process.transition.action"> + <field eval=""""wkf_confirm_order"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/> + </record> + + <record id="process_transition_action_cancelpurchaseorder0" model="process.transition.action"> + <field eval=""""write({'state':'cancel'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/> + </record> + + <record id="process_transition_action_approvingpurchaseorder0" model="process.transition.action"> + <field eval=""""wkf_approve_order"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Approve"""" name="name"/> + <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/> + </record> + + <record id="process_transition_action_approvingcancelpurchaseorder0" model="process.transition.action"> + <field eval=""""write({'state':'cancel'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/> + </record>. + + <record id="process_transition_action_invoicefrompurchaseorder0" model="process.transition.action"> + <field eval=""""action_invoice_create"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Create invoice"""" name="name"/> + <field name="transition_id" ref="process_transition_invoicefrompurchase0"/> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 7bbc1092229..f4cd733ecf0 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -238,11 +238,11 @@ class purchase_order(osv.osv): if not part: return {'value':{'partner_address_id': False}} addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default']) - pricelist = self.pool.get('res.partner').property_get(cr, uid, - part,property_pref=['property_product_pricelist_purchase']).get('property_product_pricelist_purchase',False) + part = self.pool.get('res.partner').browse(cr, uid, part) + pricelist = part.property_product_pricelist_purchase.id return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist}} - def wkf_approve_order(self, cr, uid, ids): + def wkf_approve_order(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')}) return True @@ -275,15 +275,15 @@ class purchase_order(osv.osv): }) def inv_line_create(self,a,ol): return (0, False, { - 'name': ol.name, - 'account_id': a, - 'price_unit': ol.price_unit or 0.0, - 'quantity': ol.product_qty, - 'product_id': ol.product_id.id or False, - 'uos_id': ol.product_uom.id or False, - 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])], - 'account_analytic_id': ol.account_analytic_id.id, - }) + 'name': ol.name, + 'account_id': a, + 'price_unit': ol.price_unit or 0.0, + 'quantity': ol.product_qty, + 'product_id': ol.product_id.id or False, + 'uos_id': ol.product_uom.id or False, + 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])], + 'account_analytic_id': ol.account_analytic_id.id, + }) def action_invoice_create(self, cr, uid, ids, *args): res = False @@ -299,17 +299,8 @@ class purchase_order(osv.osv): raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (ol.product_id.name, ol.product_id.id,)) else: a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category') + a = self.pool.get('account.fiscal.position').map_account(cr, uid, o.partner_id, a) il.append(self.inv_line_create(a,ol)) -# il.append((0, False, { -# 'name': ol.name, -# 'account_id': a, -# 'price_unit': ol.price_unit or 0.0, -# 'quantity': ol.product_qty, -# 'product_id': ol.product_id.id or False, -# 'uos_id': ol.product_uom.id or False, -# 'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])], -# 'account_analytic_id': ol.account_analytic_id.id, -# })) a = o.partner_id.property_account_payable.id inv = { @@ -457,21 +448,9 @@ class purchase_order_line(osv.osv): res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':prod['supplier_taxes_id'], 'date_planned': dt,'notes':prod['description_purchase'], 'product_uom': uom}} domain = {} - + partner = self.pool.get('res.partner').browse(cr, uid, partner_id) taxes = self.pool.get('account.tax').browse(cr, uid,prod['supplier_taxes_id']) - taxep = None - if partner_id: - taxep_id = self.pool.get('res.partner').property_get(cr, uid,partner_id,property_pref=['property_account_supplier_tax']).get('property_account_supplier_tax',False) - if taxep_id: - taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id) - if not taxep or not taxep.id: - res['value']['taxes_id'] = [x.id for x in prod['supplier_taxes_id']] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - res['value']['taxes_id'] = res5 + res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, taxes) res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id']) res3 = self.pool.get('product.uom').read(cr, uid, [prod_uom_po], ['category_id']) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 48a24bee967..bd447d01f68 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -50,7 +50,7 @@ <field domain="[('type','=','purchase')]" name="pricelist_id"/> <field name="partner_ref" select="2"/> <newline/> - <field colspan="4" name="order_line" nolabel="1" widget="one2many_list"/> + <field colspan="4" name="order_line" nolabel="1"/> <group col="7" colspan="4"> <field name="amount_untaxed" sum="Untaxed amount"/> <field name="amount_tax"/> @@ -195,7 +195,6 @@ <tree colors="red:date_planned<=current_date" string="Purchase Order Line"> <field name="date_planned"/> <field name="name"/> - <field name="product_id"/> <field name="product_qty"/> <field name="product_uom"/> <field name="price_unit"/> diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 86fb8008807..d8959d3663d 100644..100755 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -101,9 +101,9 @@ <paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P2" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P3" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11"/> - <paraStyle name="P5" fontName="Times-Bold" fontSize="10.0" leading="13"/> - <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P4" fontName="Times-Bold" fontSize="10.0" leading="13"/> + <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.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="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -140,7 +140,7 @@ <images/> <story> <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> - <para style="P6"> + <para style="P5"> <font color="white"> </font> </para> <blockTable colWidths="253.0,59.0,223.0" style="Tableau1"> @@ -149,52 +149,52 @@ <blockTable colWidths="253.0" style="Tableau2"> <tr> <td> - <para style="P6"> + <para style="P5"> <font color="white"> </font> </para> </td> </tr> <tr> <td> - <para style="P6">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> - <para style="P5">Shipping address :</para> - <para style="P6">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> - <para style="P6">[[ addr.title or '' ]] [[ addr.name ]]</para> - <para style="P6">[[ addr.street ]]</para> - <para style="P6">[[ addr.street2 or '' ]]</para> - <para style="P6">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para> - <para style="P6">[[ addr.state_id and addr.state_id.name or '' ]]</para> - <para style="P6">[[ addr.country_id and addr.country_id.name or '' ]]</para> + <para style="P5">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> + <para style="P4">Shipping address :</para> + <para style="P5">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> + <para style="P5">[[ addr.title or '' ]] [[ addr.name ]]</para> + <para style="P5">[[ addr.street ]]</para> + <para style="P5">[[ addr.street2 or '' ]]</para> + <para style="P5">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para> + <para style="P5">[[ addr.state_id and addr.state_id.name or '' ]]</para> + <para style="P5">[[ addr.country_id and addr.country_id.name or '' ]]</para> </td> </tr> </blockTable> - <para style="P6"> + <para style="P5"> <font color="white"> </font> </para> </td> <td> - <para style="P6"> + <para style="P5"> <font color="white"> </font> </para> </td> <td> - <para style="P6">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> - <para style="P6">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para> - <para style="P6">[[ o.partner_address_id.street ]]</para> - <para style="P6">[[ o.partner_address_id.street2 or '' ]]</para> - <para style="P6">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para> - <para style="P6">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para> - <para style="P6">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para> - <para style="P6"> + <para style="P5">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> + <para style="P5">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para> + <para style="P5">[[ o.partner_address_id.street ]]</para> + <para style="P5">[[ o.partner_address_id.street2 or '' ]]</para> + <para style="P5">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para> + <para style="P5">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para> + <para style="P5">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para> + <para style="P5"> <font color="white"> </font> </para> - <para style="P6">Tel. : [[ o.partner_address_id.phone or '' ]]</para> - <para style="P6">Fax : [[ o.partner_address_id.fax or '' ]]</para> - <para style="P6">TVA : [[ o.partner_id.vat or '' ]]</para> + <para style="P5">Tél. : [[ o.partner_address_id.phone or '' ]]</para> + <para style="P5">Fax : [[ o.partner_address_id.fax or '' ]]</para> + <para style="P5">TVA : [[ o.partner_id.vat or '' ]]</para> </td> </tr> </blockTable> - <para style="P6"> + <para style="P5"> <font color="white"> </font> </para> <para style="terp_default_8"> @@ -203,10 +203,7 @@ <para style="Standard"> <font color="white"> </font> </para> - <para style="terp_header"> [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]</para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> + <para style="P6">[[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]</para> <para style="terp_default_8"> <font color="white"> </font> </para> @@ -229,23 +226,23 @@ <blockTable colWidths="136.0,132.0,133.0,133.0" style="Content_Order_Reference_Table"> <tr> <td> - <para style="terp_default_Centre_9">[[ o.name or '' ]]</para> + <para style="terp_default_Centre_8">[[ o.name or '' ]]</para> </td> <td> - <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para> + <para style="terp_default_Centre_8">[[ o.partner_ref or '' ]]</para> </td> <td> - <para style="Standard">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para> + <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para> </td> <td> - <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para> + <para style="terp_default_Centre_8">[[ o.validator and o.validator.name or '' ]]</para> </td> </tr> </blockTable> <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="253.0,52.0,49.0,58.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> + <blockTable colWidths="251.0,53.0,62.0,47.0,59.0,62.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> <tr> <td> <para style="terp_tblheader_Details">Description</para> @@ -269,7 +266,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para> - <blockTable colWidths="254.0,52.0,57.0,34.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content"> + <blockTable colWidths="252.0,52.0,61.0,29.0,20.0,59.0,63.0" style="Table_Order_Pur_line_Content"> <tr> <td> <para style="terp_default_9">[[ line.name ]]</para> @@ -278,7 +275,7 @@ <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para> </td> <td> - <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para> + <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para> </td> <td> <para style="terp_default_Right_9">[[ line.product_qty ]] </para> @@ -330,7 +327,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="415.0,57.0,52.0,20.0" style="Table_All_Total_Detail"> + <blockTable colWidths="413.0,59.0,42.0,20.0" style="Table_All_Total_Detail"> <tr> <td> <para style="terp_default_9"> diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 15b888f360e..68be681fdf5 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -1,3 +1,9 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_purchase_order,purchase.order,model_purchase_order,purchase.group_purchase_user,1,1,1,1 -access_purchase_order_line,purchase.order.line,model_purchase_order_line,purchase.group_purchase_user,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_purchase_order","purchase.order","model_purchase_order","purchase.group_purchase_user",1,1,1,1 +"access_purchase_order_line","purchase.order.line","model_purchase_order_line","purchase.group_purchase_user",1,1,1,1 +"access_stock_location_purchase_user","stock.location purchase_user","stock.model_stock_location","purchase.group_purchase_user",1,0,0,0 +"access_stock_warehouse_purchase_user","stock.warehouse purchase_user","stock.model_stock_warehouse","purchase.group_purchase_user",1,0,0,0 +"access_stock_picking_purchase_user","stock.picking purchase_user","stock.model_stock_picking","purchase.group_purchase_user",1,1,1,1 +"access_stock_move_purchase_user","stock.move purchase_user","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1 +"access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0 +"access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0 diff --git a/addons/purchase_analytic_plans/i18n/fr_FR.po b/addons/purchase_analytic_plans/i18n/fr_FR.po index 0939ee6233c..dc322fd9e68 100644 --- a/addons/purchase_analytic_plans/i18n/fr_FR.po +++ b/addons/purchase_analytic_plans/i18n/fr_FR.po @@ -4,19 +4,19 @@ # 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 16: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-13 16:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: purchase_analytic_plans #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" - +msgstr "XML non valide pour l'architecture de la vue" diff --git a/addons/report_account/i18n/fr_FR.po b/addons/report_account/i18n/fr_FR.po index 6701710ca06..099515aedfa 100644 --- a/addons/report_account/i18n/fr_FR.po +++ b/addons/report_account/i18n/fr_FR.po @@ -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-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-11 15:41:43+0000\n" +"PO-Revision-Date: 2008-09-11 15:41:43+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: report_account #: constraint:ir.ui.view:0 diff --git a/addons/report_analytic/i18n/fr_FR.po b/addons/report_analytic/i18n/fr_FR.po index 4620c36384f..80561646c20 100644 --- a/addons/report_analytic/i18n/fr_FR.po +++ b/addons/report_analytic/i18n/fr_FR.po @@ -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:28+0000\n" +"PO-Revision-Date: 2008-10-13 16:54+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 17:32+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_analytic #: model:ir.model,name:report_analytic.model_report_analytic_account_close @@ -22,8 +23,11 @@ msgstr "Comptes analytiques à clôturer" #. module: report_analytic #: 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: report_analytic #: field:report.analytic.account.close,quantity_max:0 @@ -33,7 +37,7 @@ msgstr "Quantité Max." #. module: report_analytic #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: report_analytic #: field:report.analytic.account.close,name:0 @@ -64,10 +68,9 @@ msgstr "Balance" #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree #: view:report.analytic.account.close:0 msgid "Expired analytic accounts" -msgstr "" +msgstr "Comptes Analytiques Expirés" #. module: report_analytic #: field:report.analytic.account.close,quantity:0 msgid "Quantity" msgstr "Quantité" - diff --git a/addons/report_analytic_line/i18n/fr_FR.po b/addons/report_analytic_line/i18n/fr_FR.po index e152eef50a3..2648464e39d 100644 --- a/addons/report_analytic_line/i18n/fr_FR.po +++ b/addons/report_analytic_line/i18n/fr_FR.po @@ -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:34+0000\n" +"PO-Revision-Date: 2008-10-13 16:52+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 17:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_analytic_line #: field:report.account.analytic.line.to.invoice,product_id:0 @@ -22,8 +23,11 @@ msgstr "Produit" #. module: report_analytic_line #: 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: report_analytic_line #: model:ir.actions.act_window,name:report_analytic_line.action_account_analytic_line_to_invoice @@ -41,7 +45,7 @@ msgstr "Prix de vente" #. module: report_analytic_line #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: report_analytic_line #: field:report.account.analytic.line.to.invoice,name:0 @@ -72,4 +76,3 @@ msgstr "Unités" #: field:report.account.analytic.line.to.invoice,product_uom_id:0 msgid "UoM" msgstr "UdM" - diff --git a/addons/report_analytic_planning/i18n/fr_FR.po b/addons/report_analytic_planning/i18n/fr_FR.po index 8ebcdf621cc..3b2b9131f62 100644 --- a/addons/report_analytic_planning/i18n/fr_FR.po +++ b/addons/report_analytic_planning/i18n/fr_FR.po @@ -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:26+0000\n" +"PO-Revision-Date: 2008-10-13 16:52+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 17:24+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 @@ -22,8 +23,11 @@ msgstr "A:" #. module: report_analytic_planning #: 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: report_analytic_planning #: field:report_account_analytic.planning,stat_ids:0 @@ -43,7 +47,7 @@ msgstr "responsible" #. module: report_analytic_planning #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: report_analytic_planning #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat @@ -53,7 +57,7 @@ msgstr "Planning statistiques" #. module: report_analytic_planning #: field:report_account_analytic.planning,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: report_analytic_planning #: field:report_account_analytic.planning.line,account_id:0 @@ -64,12 +68,12 @@ msgstr "Compte analytique" #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my msgid "My Current Plannings" -msgstr "" +msgstr "Mon Planning Courant" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Planning by Account" -msgstr "" +msgstr "Planning par Compte" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 @@ -96,13 +100,13 @@ msgstr "Réel" #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager msgid "Planning Statistics of My Projects" -msgstr "" +msgstr "Statistiques des Plannings de mes Projets" #. module: report_analytic_planning #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat msgid "Planning Statistics" -msgstr "" +msgstr "Statistiques des Plannings" #. module: report_analytic_planning #: field:report_account_analytic.planning,name:0 @@ -129,12 +133,12 @@ msgstr "Planning RH" #: field:report_account_analytic.planning.stat,sum_amount_real:0 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0 msgid "Timesheet" -msgstr "" +msgstr "Feuille de présence" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Time by Account" -msgstr "" +msgstr "Temps par COmpte" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 @@ -163,12 +167,12 @@ msgstr "De:" #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2 msgid "My Plannings" -msgstr "" +msgstr "Mes Plannings" #. module: report_analytic_planning #: field:report_account_analytic.planning,date_to:0 msgid "End Date" -msgstr "" +msgstr "Date de fin" #. module: report_analytic_planning #: field:report_account_analytic.planning.stat,account_id:0 @@ -178,17 +182,17 @@ msgstr "Compte" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Time by User" -msgstr "" +msgstr "Temps par Utilisateur" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Quantities by Account" -msgstr "" +msgstr "Quantités par Compte" #. module: report_analytic_planning #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning msgid "Plannings" -msgstr "" +msgstr "Plannings" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 @@ -203,7 +207,7 @@ msgstr "Projet" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Total Timesheet" -msgstr "" +msgstr "Total des feuilles de présence" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 @@ -235,12 +239,12 @@ msgstr "Planning par compte" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 msgid "[" -msgstr "" +msgstr "[" #. module: report_analytic_planning #: rml:report_account_analytic.planning.print:0 msgid "]" -msgstr "" +msgstr "]" #. module: report_analytic_planning #: field:report_account_analytic.planning.line,amount:0 @@ -272,18 +276,18 @@ msgstr "Compte analytique" #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current msgid "Current Plannings" -msgstr "" +msgstr "Plannings Courants" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Quantities by User" -msgstr "" +msgstr "Quantités par Utilisateur" #. module: report_analytic_planning #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my msgid "My Planning Statistics" -msgstr "" +msgstr "Mes Statistiques de Planning" #. module: report_analytic_planning #: field:report_account_analytic.planning.stat,manager_id:0 @@ -306,17 +310,17 @@ msgstr "Planning" #. module: report_analytic_planning #: selection:report_account_analytic.planning,state:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: report_analytic_planning #: view:report_account_analytic.planning:0 msgid "Total Planned" -msgstr "" +msgstr "Total Plannifié" #. module: report_analytic_planning #: field:report_account_analytic.planning,date_from:0 msgid "Start Date" -msgstr "" +msgstr "Date de début" #. module: report_analytic_planning #: view:report_account_analytic.planning.stat:0 @@ -326,11 +330,10 @@ msgstr "Statistiques du planning" #. module: report_analytic_planning #: selection:report_account_analytic.planning,state:0 msgid "Open" -msgstr "" +msgstr "Ouvert" #. module: report_analytic_planning #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new msgid "New Planning" -msgstr "" - +msgstr "Nouveau Planning" diff --git a/addons/report_analytic_planning/security/ir.model.access.csv b/addons/report_analytic_planning/security/ir.model.access.csv index 473d252488b..c57a1581547 100644 --- a/addons/report_analytic_planning/security/ir.model.access.csv +++ b/addons/report_analytic_planning/security/ir.model.access.csv @@ -1,6 +1,10 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_report_account_analytic_planning,report_account_analytic.planning,model_report_account_analytic_planning,project.group_project_manager,1,1,1,1 -access_report_account_analytic_planning_line,report_account_analytic.planning.line,model_report_account_analytic_planning_line,project.group_project_manager,1,1,1,1 -access_report_account_analytic_planning_stat_account,report_account_analytic.planning.stat.account,model_report_account_analytic_planning_stat_account,project.group_project_user,1,0,0,0 -access_report_account_analytic_planning_stat,report_account_analytic.planning.stat,model_report_account_analytic_planning_stat,project.group_project_user,1,0,0,0 -access_report_account_analytic_planning_stat_user,report_account_analytic.planning.stat.user,model_report_account_analytic_planning_stat_user,project.group_project_user,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1 +"access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1 +"access_report_account_analytic_planning_stat_account_manager","report_account_analytic.planning.stat.account manager","model_report_account_analytic_planning_stat_account","project.group_project_manager",1,1,1,0 +"access_report_account_analytic_planning_stat_account","report_account_analytic.planning.stat.account","model_report_account_analytic_planning_stat_account","project.group_project_user",1,0,0,0 +"access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1 +"access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0 +"access_report_account_analytic_planning_stat_user_manager","report_account_analytic.planning.stat.user manager","model_report_account_analytic_planning_stat_user","project.group_project_manager",1,0,0,0 +"access_report_account_analytic_planning_stat_user","report_account_analytic.planning.stat.user","model_report_account_analytic_planning_stat_user","project.group_project_user",1,0,0,0 +"access_account_analytic_account_project_manager","account.analytic.account project manager","account.model_account_analytic_account","project.group_project_manager",1,1,1,1 diff --git a/addons/report_crm/i18n/fr_FR.po b/addons/report_crm/i18n/fr_FR.po index 7c90ce249e8..02dc2d1809e 100644 --- a/addons/report_crm/i18n/fr_FR.po +++ b/addons/report_crm/i18n/fr_FR.po @@ -4,72 +4,76 @@ # 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:33+0000\n" +"PO-Revision-Date: 2008-10-11 06:57+0000\n" +"Last-Translator: Christophe Chauvet <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:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_crm #: field:report.crm.case.categ,categ_id:0 msgid "Category" -msgstr "" +msgstr "Catégorie" #. module: report_crm #: field:report.crm.case.categ,probability:0 #: field:report.crm.case.user,probability:0 msgid "Avg. Probability" -msgstr "" +msgstr "Probabilité Moy." #. module: report_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: report_crm #: model:ir.model,name:report_crm.model_report_crm_case_categ msgid "Cases by section and category" -msgstr "" +msgstr "Cas par section et catégorie" #. module: report_crm #: field:report.crm.case.categ,section_id:0 #: field:report.crm.case.user,section_id:0 msgid "Section" -msgstr "" +msgstr "Section" #. module: report_crm #: field:report.crm.case.categ,nbr:0 #: field:report.crm.case.user,nbr:0 msgid "# of Cases" -msgstr "" +msgstr "# de cas" #. module: report_crm #: field:report.crm.case.categ,delay_close:0 msgid "Delay Close" -msgstr "" +msgstr "Delai de fermeture" #. module: report_crm #: selection:report.crm.case.categ,state:0 #: selection:report.crm.case.user,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: report_crm #: selection:report.crm.case.categ,state:0 #: selection:report.crm.case.user,state:0 msgid "Closed" -msgstr "" +msgstr "Fermé" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree_month #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree_month msgid "Cases by categories and section (this month)" -msgstr "" +msgstr "Cas oar catégories et section (ce mois)" #. module: report_crm #: model:ir.ui.menu,name:report_crm.next_id_66 @@ -80,30 +84,30 @@ msgstr "Tous les mois" #: field:report.crm.case.categ,amount_revenue_prob:0 #: field:report.crm.case.user,amount_revenue_prob:0 msgid "Est. Rev*Prob." -msgstr "" +msgstr "Rev*Proba Estim." #. module: report_crm #: selection:report.crm.case.categ,state:0 #: selection:report.crm.case.user,state:0 msgid "Pending" -msgstr "" +msgstr "En attente" #. module: report_crm #: field:report.crm.case.categ,state:0 #: field:report.crm.case.user,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_my #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_my msgid "My cases by section" -msgstr "" +msgstr "Mes cas par section" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_user msgid "Monthly cases by user" -msgstr "" +msgstr "Cas Mensuel par utilisateur" #. module: report_crm #: model:ir.ui.menu,name:report_crm.next_id_64 @@ -114,17 +118,17 @@ msgstr "Reporting" #: field:report.crm.case.categ,amount_costs:0 #: field:report.crm.case.user,amount_costs:0 msgid "Est.Cost" -msgstr "" +msgstr "Coût Estim." #. module: report_crm #: field:report.crm.case.user,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_categ msgid "Monthly cases by section" -msgstr "" +msgstr "Cas mensuel par section" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree @@ -132,12 +136,12 @@ msgstr "" #: view:report.crm.case.categ:0 #: view:report.crm.case.user:0 msgid "Cases by User and Section" -msgstr "" +msgstr "Cas par Utilisateur et Section" #. module: report_crm #: field:report.crm.case.user,delay_close:0 msgid "Delay to close" -msgstr "" +msgstr "Delai de fermeture" #. module: report_crm #: model:ir.ui.menu,name:report_crm.next_id_65 @@ -147,57 +151,56 @@ msgstr "Ce mois" #. module: report_crm #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.act_res_users_2_report_crm_case_user msgid "Monthly cases" -msgstr "" +msgstr "Ces mensuels" #. module: report_crm #: field:report.crm.case.categ,amount_revenue:0 #: field:report.crm.case.user,amount_revenue:0 msgid "Est.Revenue" -msgstr "" +msgstr "Revenu Estim." #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month msgid "Cases by user and section (this month)" -msgstr "" +msgstr "Cas par utilisateur et section (ce mois)" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree msgid "Cases by Categories and Section" -msgstr "" +msgstr "Cas par Catégories et Section" #. module: report_crm #: field:report.crm.case.categ,name:0 #: field:report.crm.case.user,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: report_crm #: selection:report.crm.case.categ,state:0 #: selection:report.crm.case.user,state:0 msgid "Canceled" -msgstr "" +msgstr "Annulée" #. module: report_crm #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month_my #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month_my msgid "My cases by section (this month)" -msgstr "" +msgstr "Mes cas par section (ce mois)" #. module: report_crm #: model:ir.model,name:report_crm.model_report_crm_case_user msgid "Cases by user and section" -msgstr "" +msgstr "Cas par utilisateur et section" #. module: report_crm #: selection:report.crm.case.categ,state:0 #: selection:report.crm.case.user,state:0 msgid "Open" -msgstr "" - +msgstr "Ouvert" diff --git a/addons/report_document/__terp__.py b/addons/report_document/__terp__.py index f0e19fe4de9..01baabbb6e1 100644 --- a/addons/report_document/__terp__.py +++ b/addons/report_document/__terp__.py @@ -12,7 +12,10 @@ """, "init_xml" : [], "demo_xml" : [], - "update_xml" : ["report_document_view.xml"], + "update_xml" : [ + "report_document_view.xml", + "security/ir.model.access.csv", + ], "active": False, "installable": True } diff --git a/addons/report_document/security/ir.model.access.csv b/addons/report_document/security/ir.model.access.csv new file mode 100644 index 00000000000..8577bf5a5f6 --- /dev/null +++ b/addons/report_document/security/ir.model.access.csv @@ -0,0 +1,9 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0 +"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0 +"access_report_files_partenr_group_document_manager","report.files.partenr document manager","model_report_files_partenr","document.group_document_manager",1,0,0,0 +"access_report_files_partenr_group_system","report.files.partenr group system","model_report_files_partenr","base.group_system",1,0,0,0 +"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0 +"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0 +"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0 +"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0 diff --git a/addons/report_intrastat/i18n/fr_FR.po b/addons/report_intrastat/i18n/fr_FR.po index 1536cce0c9b..d22c81106b0 100644 --- a/addons/report_intrastat/i18n/fr_FR.po +++ b/addons/report_intrastat/i18n/fr_FR.po @@ -4,51 +4,52 @@ # 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:28+0000\n" +"PO-Revision-Date: 2008-10-11 07:01+0000\n" +"Last-Translator: Christophe Chauvet <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:32+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_intrastat #: selection:report.intrastat,type:0 msgid "Import" -msgstr "" +msgstr "Import" #. module: report_intrastat #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: report_intrastat #: model:ir.model,name:report_intrastat.model_report_intrastat msgid "Intrastat report" -msgstr "" +msgstr "Rapport Intrastat" #. module: report_intrastat #: field:report.intrastat.code,description:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: report_intrastat #: field:report.intrastat,weight:0 msgid "Weight" -msgstr "" +msgstr "Poids" #. module: report_intrastat #: field:report.intrastat,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: report_intrastat #: field:res.country,intrastat:0 msgid "Intrastat member" -msgstr "" +msgstr "Membre Intrastat" #. module: report_intrastat #: model:ir.ui.menu,name:report_intrastat.next_id_89 @@ -58,34 +59,34 @@ msgstr "Ce mois" #. module: report_intrastat #: field:report.intrastat,code:0 msgid "Country code" -msgstr "" +msgstr "Code pays" #. module: report_intrastat #: field:report.intrastat,value:0 msgid "Value" -msgstr "" +msgstr "Valeur" #. module: report_intrastat #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat msgid "Intrastat (this month)" -msgstr "" +msgstr "Intrastat (ce mois)" #. module: report_intrastat #: field:report.intrastat,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Devise" #. module: report_intrastat #: selection:report.intrastat,type:0 msgid "Export" -msgstr "" +msgstr "Export" #. module: report_intrastat #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all msgid "Intrastat" -msgstr "" +msgstr "Intrastat" #. module: report_intrastat #: model:ir.ui.menu,name:report_intrastat.next_id_90 @@ -94,24 +95,27 @@ msgstr "Tous les mois" #. module: report_intrastat #: 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: report_intrastat #: field:report.intrastat.code,name:0 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code msgid "Intrastat Code" -msgstr "" +msgstr "Code Intrastat" #. module: report_intrastat #: field:report.intrastat,type:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: report_intrastat #: view:report.intrastat:0 msgid "Intrastat Data" -msgstr "" +msgstr "Données Intrastat" #. module: report_intrastat #: model:ir.model,name:report_intrastat.model_report_intrastat_code @@ -119,5 +123,4 @@ msgstr "" #: field:report.intrastat,intrastat_id:0 #: view:report.intrastat.code:0 msgid "Intrastat code" -msgstr "" - +msgstr "Code Intrastat" diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv index 7696a6cd9e3..55218658330 100644 --- a/addons/report_intrastat/security/ir.model.access.csv +++ b/addons/report_intrastat/security/ir.model.access.csv @@ -1,3 +1,4 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_report_intrastat_code,report.intrastat.code,model_report_intrastat_code,account.group_account_manager,1,1,1,1 -access_report_intrastat,report.intrastat,model_report_intrastat,account.group_account_manager,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1 +"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0 +"access_report_intrastat_code_product_manager","report.intrastat.code product manager","model_report_intrastat_code","product.group_product_manager",1,1,1,1 diff --git a/addons/report_mrp/i18n/fr_FR.po b/addons/report_mrp/i18n/fr_FR.po index 362abb3790d..ba0a0185707 100644 --- a/addons/report_mrp/i18n/fr_FR.po +++ b/addons/report_mrp/i18n/fr_FR.po @@ -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 16:30+0000\n" +"PO-Revision-Date: 2008-10-13 16:40+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 17:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_mrp #: field:report.mrp.inout,date:0 @@ -34,8 +35,11 @@ msgstr "Variation de la valeur de stock" #. module: report_mrp #: 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: report_mrp #: model:ir.ui.menu,name:report_mrp.next_id_77 @@ -60,7 +64,7 @@ msgstr "Nbre de cycles" #. module: report_mrp #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: report_mrp #: field:report.workcenter.load,workcenter_id:0 @@ -81,10 +85,9 @@ msgstr "Charge du centre de travail" #: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree #: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load msgid "Workcenter Loads" -msgstr "" +msgstr "Charges du Centre de Travail" #. module: report_mrp #: view:report.workcenter.load:0 msgid "Workcenters load" msgstr "Charge des centres de travail" - diff --git a/addons/report_project/i18n/fr_FR.po b/addons/report_project/i18n/fr_FR.po index 8ba4da764a5..a7044273806 100644 --- a/addons/report_project/i18n/fr_FR.po +++ b/addons/report_project/i18n/fr_FR.po @@ -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-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-11 15:41:43+0000\n" +"PO-Revision-Date: 2008-09-11 15:41:43+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: report_project #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree diff --git a/addons/report_purchase/i18n/fr_FR.po b/addons/report_purchase/i18n/fr_FR.po index dab4b653856..2ec78c38cde 100644 --- a/addons/report_purchase/i18n/fr_FR.po +++ b/addons/report_purchase/i18n/fr_FR.po @@ -4,39 +4,43 @@ # 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:19+0000\n" +"PO-Revision-Date: 2008-10-11 06:39+0000\n" +"Last-Translator: Christophe Chauvet <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:24+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_purchase #: field:report.purchase.order.category,price_average:0 #: field:report.purchase.order.product,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Prix moyen" #. module: report_purchase #: 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: report_purchase #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree_all #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all #: view:report.purchase.order.category:0 msgid "Purchases by Category of Products" -msgstr "" +msgstr "Commandes d'achats par catégorie de produits" #. module: report_purchase #: model:ir.model,name:report_purchase.model_report_purchase_order_product msgid "Purchases Orders by Products" -msgstr "" +msgstr "Commandes d'a" #. module: report_purchase #: model:ir.ui.menu,name:report_purchase.next_id_75 @@ -47,35 +51,35 @@ msgstr "Tous les mois" #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all msgid "Purchases by Products" -msgstr "" +msgstr "Commandes d'achats par Produits" #. module: report_purchase #: field:report.purchase.order.category,state:0 #: field:report.purchase.order.product,state:0 msgid "Order State" -msgstr "" +msgstr "État commande" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Waiting Schedule" -msgstr "" +msgstr "Attente d'exécution" #. module: report_purchase #: field:report.purchase.order.category,price_total:0 #: field:report.purchase.order.product,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Prix Total" #. module: report_purchase #: model:ir.model,name:report_purchase.model_report_purchase_order_category msgid "Purchases Orders by Categories" -msgstr "" +msgstr "Commandes d'achats par Catégories" #. module: report_purchase #: field:report.purchase.order.product,product_id:0 msgid "Product" -msgstr "" +msgstr "Produit" #. module: report_purchase #: model:ir.ui.menu,name:report_purchase.next_id_73 @@ -86,30 +90,30 @@ msgstr "Reporting" #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "Exception de facture" #. module: report_purchase #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree #: model:ir.ui.menu,name:report_purchase.menu_report_order_product msgid "Purchases by Products (this month)" -msgstr "" +msgstr "Commandes d'achats par Produit (ce mois)" #. module: report_purchase #: field:report.purchase.order.category,quantity:0 #: field:report.purchase.order.product,quantity:0 msgid "# of Products" -msgstr "" +msgstr "# de Produits" #. module: report_purchase #: view:report.purchase.order.product:0 msgid "Purchases by products" -msgstr "" +msgstr "Commandes d'achats par produits" #. module: report_purchase #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product msgid "Monthly purchases" -msgstr "" +msgstr "Commandes d'achats Mensuelle" #. module: report_purchase #: model:ir.ui.menu,name:report_purchase.next_id_74 @@ -119,63 +123,62 @@ msgstr "Ce mois" #. module: report_purchase #: field:report.purchase.order.category,category_id:0 msgid "Categories" -msgstr "" +msgstr "Catégories" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Quotation" -msgstr "" +msgstr "Proposition" #. module: report_purchase #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Manual in progress" -msgstr "" +msgstr "Manuel en cours" #. module: report_purchase #: model:ir.ui.menu,name:report_purchase.menu_report_order_category msgid "Purchases by Category of Product (this month)" -msgstr "" +msgstr "Commandes d'achats par Catégorie de Produits (ce mois)" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Shipping Exception" -msgstr "" +msgstr "Exception de livraison" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "In progress" -msgstr "" +msgstr "En cours" #. module: report_purchase #: field:report.purchase.order.category,name:0 #: field:report.purchase.order.product,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: report_purchase #: field:report.purchase.order.category,count:0 #: field:report.purchase.order.product,count:0 msgid "# of Lines" -msgstr "" +msgstr "# de lignes" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Done" -msgstr "" +msgstr "Terminer" #. module: report_purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Cancel" -msgstr "" - +msgstr "Annuler" diff --git a/addons/report_sale/i18n/fr_FR.po b/addons/report_sale/i18n/fr_FR.po index f6c6cf85b63..1ea4892a0af 100644 --- a/addons/report_sale/i18n/fr_FR.po +++ b/addons/report_sale/i18n/fr_FR.po @@ -4,44 +4,45 @@ # 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:23+0000\n" +"PO-Revision-Date: 2008-10-11 06:26+0000\n" +"Last-Translator: Christophe Chauvet <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:01+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_sale #: field:report.sale.order.category,price_average:0 #: field:report.sale.order.product,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Prix moyen" #. module: report_sale #: field:report.sale.order.category,state:0 #: field:report.sale.order.product,state:0 msgid "Order State" -msgstr "" +msgstr "État commande" #. module: report_sale #: view:report.sale.order.category:0 msgid "Sales Orders by category" -msgstr "" +msgstr "Commmande de ventes par catégories" #. module: report_sale #: model:ir.model,name:report_sale.model_report_sale_order_product msgid "Sales Orders by Products" -msgstr "" +msgstr "Commandes de ventes par Produits" #. module: report_sale #: model:ir.report.custom,title:report_sale.ir_report_custom_6 #: model:ir.report.custom,name:report_sale.ir_report_custom_6 msgid "Monthly cumulated sales turnover over one year" -msgstr "" +msgstr "Chiffres d'affaires Mensuel des ventes cumules depuis un an" #. module: report_sale #: model:ir.ui.menu,name:report_sale.next_id_82 @@ -50,74 +51,77 @@ msgstr "Tous les mois" #. module: report_sale #: 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: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Waiting Schedule" -msgstr "" +msgstr "Attente d'exécution" #. module: report_sale #: field:report.sale.order.category,price_total:0 #: field:report.sale.order.product,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Prix Total" #. module: report_sale #: field:report.sale.order.product,product_id:0 msgid "Product" -msgstr "" +msgstr "Produit" #. module: report_sale #: model:ir.model,name:report_sale.model_report_sale_order_category msgid "Sales Orders by Categories" -msgstr "" +msgstr "Commandes de ventes par Catégories" #. module: report_sale #: model:ir.actions.act_window,name:report_sale.action_order_sale_list #: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list msgid "Sales of the Month" -msgstr "" +msgstr "Ventes du Mois" #. module: report_sale #: model:ir.actions.act_window,name:report_sale.action_order_product_tree #: model:ir.ui.menu,name:report_sale.menu_report_order_product msgid "Sales by Product (this month)" -msgstr "" +msgstr "Ventes par Produit (Ce mois)" #. module: report_sale #: model:ir.report.custom,title:report_sale.ir_report_custom_4 #: model:ir.report.custom,name:report_sale.ir_report_custom_4 msgid "Monthly sales turnover over one year" -msgstr "" +msgstr "Chiffres d'affaires mensuel depuis un an" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "Exception de facture" #. module: report_sale #: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all #: model:ir.ui.menu,name:report_sale.menu_report_order_category_all #: view:report.sale.order.category:0 msgid "Sales by Category of Products" -msgstr "" +msgstr "Ventes par Catégorie de Produits" #. module: report_sale #: field:report.sale.order.category,quantity:0 #: field:report.sale.order.product,quantity:0 msgid "# of Products" -msgstr "" +msgstr "# de Produits" #. module: report_sale #: model:ir.actions.act_window,name:report_sale.action_order_product_tree_all #: model:ir.ui.menu,name:report_sale.menu_report_order_product_all #: view:report.sale.order.product:0 msgid "Sales by Product" -msgstr "" +msgstr "Ventes par Produit" #. module: report_sale #: model:ir.ui.menu,name:report_sale.next_id_81 @@ -127,23 +131,23 @@ msgstr "Ce mois" #. module: report_sale #: field:report.sale.order.category,category_id:0 msgid "Categories" -msgstr "" +msgstr "Catégories" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Quotation" -msgstr "" +msgstr "Proposition" #. module: report_sale #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: report_sale #: model:ir.ui.menu,name:report_sale.ir_ui_menu1 msgid "Monthly Sales Turnover Over One Year" -msgstr "" +msgstr "Chiffres d'affaires mensuel depuis un an" #. module: report_sale #: model:ir.ui.menu,name:report_sale.next_id_80 @@ -153,12 +157,12 @@ msgstr "Reporting" #. module: report_sale #: model:ir.ui.menu,name:report_sale.ir_ui_menu2 msgid "Daily Sales Turnover Over One Year" -msgstr "" +msgstr "Chiffres d'affaires journalier depuis un an" #. module: report_sale #: model:ir.ui.menu,name:report_sale.ir_ui_menu3 msgid "Monthly Cumulated Sales Turnover Over One Year" -msgstr "" +msgstr "Chiffres d'affaires mensuel des ventes cumulés depuis un an" #. module: report_sale #: view:sale.order:0 @@ -168,58 +172,57 @@ msgstr "Commandes" #. module: report_sale #: model:ir.ui.menu,name:report_sale.menu_report_order_category msgid "Sales by Category of Product (this month)" -msgstr "" +msgstr "Ventes par Catgorie de Produit (ce mois)" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Manual in progress" -msgstr "" +msgstr "Manuel en cours" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Shipping Exception" -msgstr "" +msgstr "Exception de livraison" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "In progress" -msgstr "" +msgstr "En cours" #. module: report_sale #: model:ir.ui.menu,name:report_sale.next_id_83 msgid "Graphs" -msgstr "" +msgstr "Graphes" #. module: report_sale #: model:ir.report.custom,title:report_sale.ir_report_custom_5 #: model:ir.report.custom,name:report_sale.ir_report_custom_5 msgid "Daily sales turnover over one year" -msgstr "" +msgstr "Chiffres d'affaires journalier depuis un an" #. module: report_sale #: field:report.sale.order.category,name:0 #: field:report.sale.order.product,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: report_sale #: field:report.sale.order.category,count:0 #: field:report.sale.order.product,count:0 msgid "# of Lines" -msgstr "" +msgstr "# de lignes" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Done" -msgstr "" +msgstr "Terminer" #. module: report_sale #: selection:report.sale.order.category,state:0 #: selection:report.sale.order.product,state:0 msgid "Cancel" -msgstr "" - +msgstr "Annuler" diff --git a/addons/report_timesheet/i18n/fr_FR.po b/addons/report_timesheet/i18n/fr_FR.po index c0901d6098d..339aba59689 100644 --- a/addons/report_timesheet/i18n/fr_FR.po +++ b/addons/report_timesheet/i18n/fr_FR.po @@ -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: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:24+0000\n" +"PO-Revision-Date: 2008-10-11 07:04+0000\n" +"Last-Translator: Christophe Chauvet <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:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: report_timesheet #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my @@ -28,8 +29,11 @@ msgstr "Timesheets par utilisateur" #. module: report_timesheet #: 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: report_timesheet #: model:ir.model,name:report_timesheet.model_report_timesheet_account_date @@ -67,7 +71,7 @@ msgstr "Timesheet à facturer" #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all msgid "Daily Timesheet by Account" -msgstr "" +msgstr "Feuilles de présences jounalière par Compte" #. module: report_timesheet #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user @@ -86,7 +90,7 @@ msgstr "Utilisateur" #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all msgid "Timesheet by Account" -msgstr "" +msgstr "Feuilles de présence par Compte" #. module: report_timesheet #: field:report_timesheet.account.date,name:0 @@ -119,13 +123,13 @@ msgstr "Feuilles de présence par compte" #. module: report_timesheet #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: report_timesheet #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all msgid "Timesheet by User" -msgstr "" +msgstr "Feuilles de présences par Utilisateur" #. module: report_timesheet #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my @@ -152,7 +156,7 @@ msgstr "Timesheet journalière par compte" #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all msgid "Timesheet by Invoice" -msgstr "" +msgstr "Feuilles de présence par Facture" #. module: report_timesheet #: field:report_timesheet.account.date,quantity:0 @@ -199,4 +203,3 @@ msgstr "Coût" #: model:ir.ui.menu,name:report_timesheet.next_id_69 msgid "This Month" msgstr "Ce mois" - diff --git a/addons/sale/i18n/fr_FR.po b/addons/sale/i18n/fr_FR.po index ddebdfdb64d..73dfc22901e 100644 --- a/addons/sale/i18n/fr_FR.po +++ b/addons/sale/i18n/fr_FR.po @@ -4,21 +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: " - -#. module: sale -#: rml:sale.shipping:0 -msgid "Order Ref." -msgstr "" +"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-13 16: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 16:24+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: sale #: view:sale.order:0 @@ -26,14 +22,10 @@ msgid "Recreate Procurement" msgstr "Recréer l'approvisionnement" #. module: sale -#: selection:sale.order,picking_policy:0 -msgid "Partial Delivery" -msgstr "" - -#. module: sale #: selection:sale.config.picking_policy,picking_policy:0 +#: selection:sale.order,picking_policy:0 msgid "All at once" -msgstr "" +msgstr "Tout en une fois" #. module: sale #: field:sale.order.line,address_allotment_id:0 @@ -51,6 +43,11 @@ msgid "Waiting Schedule" msgstr "Attente de programmation" #. module: sale +#: rml:sale.order:0 +msgid "Total VAT:" +msgstr "Total TVA:" + +#. module: sale #: view:sale.order:0 #: view:sale.order.line:0 msgid "Automatic Declaration" @@ -58,9 +55,8 @@ msgstr "Déclaration automatique" #. module: sale #: rml:sale.shipping:0 -#: model:ir.actions.report.xml,name:sale.report_shipping -msgid "Delivery order" -msgstr "Commande de livraison" +msgid "Order date" +msgstr "Date de commande" #. module: sale #: selection:sale.order,state:0 @@ -69,24 +65,25 @@ msgstr "Exception de facture" #. module: sale #: help:sale.order,picking_ids:0 -msgid "This is the list of picking list that have been generated for this invoice" -msgstr "C'est le liste de liste de picking qui ont été généré pour cette facture" +msgid "" +"This is the list of picking list that have been generated for this invoice" +msgstr "" +"C'est le liste de liste de picking qui ont été généré pour cette facture" #. module: sale -#: field:sale.order,client_order_ref:0 -msgid "Customer Ref." -msgstr "" +#: rml:sale.order:0 +msgid "Fax :" +msgstr "Fax :" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "You must first cancel all invoices attached to this sale order." -msgstr "" +#: field:sale.order,client_order_ref:0 +msgid "Customer Ref." +msgstr "Réf. Client" #. module: sale -#: view:sale.order:0 -msgid "Make Invoice" -msgstr "" +#: selection:sale.order,state:0 +msgid "In progress" +msgstr "En cours" #. module: sale #: field:sale.order.line,price_subtotal:0 @@ -111,7 +108,7 @@ msgstr "Origine" #. module: sale #: view:sale.order:0 msgid "Stock Moves" -msgstr "" +msgstr "Mouvements de stocks" #. module: sale #: selection:sale.order,order_policy:0 @@ -141,11 +138,6 @@ msgid "Taxes" msgstr "Taxes" #. module: sale -#: rml:sale.order:0 -msgid "Net Total :" -msgstr "" - -#. module: sale #: field:sale.order,order_policy:0 msgid "Shipping Policy" msgstr "Méthode d'expédition" @@ -158,7 +150,7 @@ msgstr "Nom du magasin" #. module: sale #: rml:sale.order:0 msgid "VAT" -msgstr "" +msgstr "TVA" #. module: sale #: field:sale.order,amount_total:0 @@ -170,7 +162,7 @@ msgstr "Total" #: field:sale.order,shop_id:0 #: model:ir.ui.menu,name:sale.menu_action_shop_form msgid "Shop" -msgstr "" +msgstr "Magasin" #. module: sale #: field:sale.order,partner_invoice_id:0 @@ -206,19 +198,15 @@ msgid "Procure Method" msgstr "Méthode d'appro." #. module: sale -#: help:sale.order,state:0 -msgid "Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the packing list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to be on the date 'Date Ordered'." -msgstr "Donne l'état du devis ou de la commande. L'état d'exception est automatiquement défini quand une opération d'annulation arrive dans la validation de facture (Exception de facture) ou dans le processus de colisage (Exception d'expédition). L'état 'En attente de planninfication' est défini lorsque la facture est confirmée mais en attente que le plannificateur soit à la date 'Date commandée'." - -#. module: sale -#: rml:sale.order:0 -msgid "Fax :" +#: rml:sale.shipping:0 +msgid "Batch reference :" msgstr "" #. module: sale -#: field:sale.order.line,price_net:0 -msgid "Net Price" -msgstr "Prix net" +#: model:ir.actions.act_window,name:sale.action_order_tree3 +#: model:ir.ui.menu,name:sale.menu_action_order_tree3 +msgid "Sales Order To Be Invoiced" +msgstr "Commandes de ventes Facturables" #. module: sale #: view:sale.order:0 @@ -226,6 +214,20 @@ msgid "Order Line" msgstr "Commande client" #. module: sale +#: help:sale.order,invoice_quantity:0 +msgid "" +"The sale order will automatically create the invoice proposition (draft " +"invoice). Ordered and delivered quantities may not be the same. You have to " +"choose if you invoice based on ordered or shipped quantities. If the product " +"is a service, shipped quantities means hours spent on the associated tasks." +msgstr "" +"La commande créera une proposition de facturation (facture brouillon). Les " +"quantités commandées et facturées peuvent ne pas être les mêmes. Vous devez " +"choisir si vous facturez sur base des quantités commandées ou expédiées. Si " +"le produit est un service, les quantitées expédiées signifies les heures " +"dépensées aux tâches associées." + +#. module: sale #: rml:sale.order:0 msgid "Order N° :" msgstr "N° d'ordre :" @@ -252,6 +254,11 @@ msgid "Shipping Address" msgstr "Adresse d'expédition" #. module: sale +#: rml:sale.order:0 +msgid "Disc. (%)" +msgstr "Rem. (%)" + +#. module: sale #: selection:sale.order,invoice_quantity:0 msgid "Shipped Quantities" msgstr "Quantités livrées" @@ -278,9 +285,9 @@ msgid "Order Lines" msgstr "Lignes de la commande" #. module: sale -#: rml:sale.order:0 -msgid "Disc.(%)" -msgstr "" +#: view:sale.order:0 +msgid "Set to Draft" +msgstr "Mettre en brouillon" #. module: sale #: field:sale.order.line,invoice_lines:0 @@ -310,27 +317,16 @@ msgid "Shipping address :" msgstr "Adresse de livraison :" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "Error !" -msgstr "" - -#. module: sale #: view:sale.order:0 msgid "Manual Description" msgstr "Description manuelle" #. module: sale -#: field:sale.order.line,product_uom_qty:0 -msgid "Quantity (UoM)" -msgstr "" - -#. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree1 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1 #: view:sale.order.line:0 msgid "Sales Order Lines" -msgstr "" +msgstr "Lignes de ventes" #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -338,6 +334,11 @@ msgid "Ordered Quantities" msgstr "Quantités commandées" #. module: sale +#: view:sale.order:0 +msgid "Extra Info" +msgstr "Info supplémentaires" + +#. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree3 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3 msgid "Uninvoiced and Delivered Lines" @@ -346,7 +347,7 @@ msgstr "Lignes librées et non-facturées" #. module: sale #: rml:sale.order:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: sale #: field:sale.order.line,move_ids:0 @@ -356,12 +357,23 @@ msgstr "Mouvements de stock" #. module: sale #: field:sale.order,name:0 msgid "Order Reference" -msgstr "" +msgstr "Référence commande" #. module: sale -#: view:sale.order:0 -msgid "Extra Info" -msgstr "Info supplémentaires" +#: help:sale.order,state:0 +msgid "" +"Gives the state of the quotation or sale order. The exception state is " +"automatically set when a cancel operation occurs in the invoice validation " +"(Invoice Exception) or in the packing list process (Shipping Exception). The " +"'Waiting Schedule' state is set when the invoice is confirmed but waiting " +"for the scheduler to be on the date 'Date Ordered'." +msgstr "" +"Donne l'état du devis ou de la commande. L'état d'exception est " +"automatiquement défini quand une opération d'annulation arrive dans la " +"validation de facture (Exception de facture) ou dans le processus de " +"colisage (Exception d'expédition). L'état 'En attente de planninfication' " +"est défini lorsque la facture est confirmée mais en attente que le " +"plannificateur soit à la date 'Date commandée'." #. module: sale #: field:sale.order,pricelist_id:0 @@ -377,7 +389,7 @@ msgstr "Devis N° :" #. module: sale #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: sale #: model:ir.model,name:sale.model_sale_shop @@ -386,19 +398,30 @@ msgid "Sale Shop" msgstr "Point de vente" #. module: sale -#: selection:sale.order,picking_policy:0 -msgid "Complete Delivery" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Set to Draft" -msgstr "Mettre en brouillon" - -#. module: sale -#: rml:sale.shipping:0 -msgid "Order Date" -msgstr "" +#: help:sale.order,order_policy:0 +msgid "" +"The Shipping Policy is used to synchronise invoice and delivery operations.\n" +" - The 'Pay before delivery' choice will first generate the invoice and " +"then generate the packing order after the payment of this invoice.\n" +" - The 'Shipping & Manual Invoice' will create the packing order directly " +"and wait for the user to manually click on the 'Invoice' button to generate " +"the draft invoice.\n" +" - The 'Invoice after delivery' choice will generate the draft invoice " +"after the packing list have been finished.\n" +" - The 'Invoice from the packings' choice is used to create an invoice " +"during the packing process." +msgstr "" +"La Politique de Livraison est utilisée pour synchroniser les factures et les " +"opérations de livraison.\n" +" - le choix \"Payer avant livraison\" générera d'abord les factures puis " +"générera la commande de colisage après le paiement de cette facture.\n" +" - \"Livraison & Factures manuelles\" créera la commande de colisage " +"directement et attendra que l'utilisateur clique manuellement sur le bouton " +"'Facture' pour générer la facture brouillon.\n" +" - \"Facture après Livraison\" générera la facture brouillon après que la " +"liste des colisage soit terminée. \n" +" - \"Facture d'après Colisage\" est utilisé pour créer la facture pendant " +"le processus de colisage." #. module: sale #: view:sale.order:0 @@ -416,15 +439,6 @@ msgid "Manual in progress" msgstr "Manuel en cours" #. module: sale -#: help:sale.order,order_policy:0 -msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n" -" - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.\n" -" - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n" -" - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.\n" -" - The 'Invoice from the packings' choice is used to create an invoice during the packing process." -msgstr "" - -#. module: sale #: model:ir.actions.report.xml,name:sale.report_sale_order msgid "Print Order" msgstr "Imprimer la commande" @@ -444,7 +458,7 @@ msgstr "Grouper les factures" #: model:ir.actions.act_window,name:sale.action_order_tree5 #: model:ir.ui.menu,name:sale.menu_action_order_tree5 msgid "All Quotations" -msgstr "" +msgstr "Toutes les propositions" #. module: sale #: field:sale.order.line,number_packages:0 @@ -457,21 +471,20 @@ msgid "Discount (%)" msgstr "Escompte (%)" #. module: sale -#: selection:sale.order,state:0 -msgid "In progress" -msgstr "En cours" +#: rml:sale.shipping:0 +msgid "Order ref." +msgstr "Réf. Commande" #. module: sale -#: model:ir.actions.act_window,name:sale.action_order_tree3 -#: model:ir.ui.menu,name:sale.menu_action_order_tree3 -msgid "Sales Order To Be Invoiced" -msgstr "" +#: field:sale.order.line,price_net:0 +msgid "Net Price" +msgstr "Prix net" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_tree10 #: model:ir.ui.menu,name:sale.menu_action_order_tree10 msgid "My Quotations" -msgstr "Mes devis " +msgstr "Mes devis" #. module: sale #: view:sale.order:0 @@ -484,25 +497,19 @@ msgid "Shipping & Manual Invoice" msgstr "Livraison et facture manuelle" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "Could not cancel sale order !" -msgstr "" - -#. module: sale -#: field:sale.order.line,product_packaging:0 -msgid "Packaging" -msgstr "" - -#. module: sale #: selection:sale.order.line,state:0 msgid "Canceled" msgstr "Annulé" #. module: sale -#: field:sale.order.line,product_uom:0 -msgid "Product UoM" -msgstr "" +#: view:sale.order:0 +msgid "Compute" +msgstr "Calculer" + +#. module: sale +#: rml:sale.order:0 +msgid "Tel. :" +msgstr "Tél. :" #. module: sale #: field:sale.order,user_id:0 @@ -510,20 +517,21 @@ msgid "Salesman" msgstr "Vendeur" #. module: sale -#: rml:sale.order:0 -msgid "Our Salesman" -msgstr "" - -#. module: sale -#: rml:sale.order:0 -msgid "Taxes :" +#: help:sale.order,invoice_ids:0 +msgid "" +"This is the list of invoices that have been generated for this sale order. " +"The same sale order may have been invoiced in several times (by line for " +"example)." msgstr "" +"C'est la liste des factures qui ont étées générées pour cette commande. Le " +"même commande peut avoir été facturé en plusieurs fois (par lignes par " +"example)." #. module: sale #: field:sale.order,invoiced_rate:0 #: field:sale.order.line,invoiced:0 msgid "Invoiced" -msgstr "" +msgstr "Facturer" #. module: sale #: field:sale.order,state:0 @@ -537,6 +545,11 @@ msgid "Payment accounts" msgstr "Compte de paiement" #. module: sale +#: selection:sale.order,order_policy:0 +msgid "Automatic Invoice after delivery" +msgstr "Facture automatique après livraison" + +#. module: sale #: wizard_view:sale.order.line.make_invoice,init:0 #: wizard_button:sale.order.line.make_invoice,init,invoice:0 #: wizard_view:sale.order.make_invoice,init:0 @@ -554,7 +567,7 @@ msgstr "Mes commandes en exception de livraison" #: model:ir.actions.act_window,name:sale.action_order_tree2 #: model:ir.ui.menu,name:sale.menu_action_order_tree2 msgid "Sales in Exception" -msgstr "" +msgstr "Commandes en Exception" #. module: sale #: selection:sale.order.line,state:0 @@ -562,9 +575,10 @@ msgid "Draft" msgstr "Brouillon" #. module: sale -#: help:sale.order,invoice_quantity:0 -msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks." -msgstr "La commande créera une proposition de facturation (facture brouillon). Les quantités commandées et facturées peuvent ne pas être les mêmes. Vous devez choisir si vous facturez sur base des quantités commandées ou expédiées. Si le produit est un service, les quantitées expédiées signifies les heures dépensées aux tâches associées." +#: rml:sale.shipping:0 +#: model:ir.actions.report.xml,name:sale.report_shipping +msgid "Delivery order" +msgstr "Commande de livraison" #. module: sale #: view:sale.order:0 @@ -572,14 +586,9 @@ msgid "Procurement Corrected" msgstr "Approvisionnement corrigé" #. module: sale -#: rml:sale.order:0 -msgid "VAT :" -msgstr "" - -#. module: sale #: field:sale.order,picking_ids:0 msgid "Related Packings" -msgstr "" +msgstr "Colisage en relation" #. module: sale #: field:sale.order.line,product_uos_qty:0 @@ -589,13 +598,13 @@ msgstr "Quantité US" #. module: sale #: field:sale.order.line,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: sale #: field:sale.config.picking_policy,picking_policy:0 #: field:sale.order,picking_policy:0 msgid "Packing Policy" -msgstr "" +msgstr "Politique de Colisage" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree2 @@ -609,15 +618,9 @@ msgid "Product sales" msgstr "Ventes de produit" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "invalid mode for test_state" -msgstr "" - -#. module: sale #: rml:sale.order:0 -msgid "0.00" -msgstr "" +msgid "Our Salesman" +msgstr "Notre Vendeur" #. module: sale #: field:sale.order,invoiced:0 @@ -628,17 +631,13 @@ msgstr "Payé" #: model:ir.actions.act_window,name:sale.action_order_form #: model:ir.ui.menu,name:sale.menu_sale_order msgid "Sales Orders" -msgstr "" +msgstr "Commandes de Ventes" #. module: sale #: selection:sale.config.picking_policy,picking_policy:0 +#: selection:sale.order,picking_policy:0 msgid "Direct Delivery" -msgstr "" - -#. module: sale -#: rml:sale.shipping:0 -msgid "Shipping Date" -msgstr "" +msgstr "Livraison directe" #. module: sale #: field:sale.order.line,property_ids:0 @@ -659,9 +658,10 @@ msgid "My sales order in progress" msgstr "Mes commandes en cours" #. module: sale -#: view:sale.config.picking_policy:0 -msgid "Set Default" -msgstr "" +#: model:ir.actions.act_window,name:sale.action_order_tree_new +#: model:ir.ui.menu,name:sale.menu_action_order_tree_new +msgid "New Sale Order / Quotation" +msgstr "Nouvelle Commande / Devis" #. module: sale #: rml:sale.shipping:0 @@ -669,15 +669,25 @@ msgid "Designation" msgstr "Désignation" #. module: sale +#: rml:sale.order:0 +msgid "VAT :" +msgstr "TVA :" + +#. module: sale #: model:ir.actions.act_window,name:sale.action_order_tree4 #: model:ir.ui.menu,name:sale.menu_action_order_tree4 msgid "Sales Order in Progress" -msgstr "" +msgstr "Commandes de Ventes en cours" #. module: sale #: selection:sale.order,order_policy:0 msgid "Payment before delivery" -msgstr "" +msgstr "Paiement avant livraison" + +#. module: sale +#: rml:sale.shipping:0 +msgid "Logistical unit :" +msgstr "Unité Logistiques" #. module: sale #: rml:sale.order:0 @@ -686,15 +696,14 @@ msgid "Quantity" msgstr "Quantité" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "You must first cancel all packings attached to this sale order." -msgstr "" +#: view:sale.order:0 +msgid "Make Invoice" +msgstr "Créer facture" #. module: sale #: rml:sale.order:0 msgid "Your Reference" -msgstr "" +msgstr "Votre Référence" #. module: sale #: field:sale.order.line,th_weight:0 @@ -715,7 +724,7 @@ msgstr "Factures associees" #. module: sale #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order msgid "Sales" -msgstr "Ventes " +msgstr "Ventes" #. module: sale #: view:sale.order:0 @@ -776,8 +785,11 @@ msgstr "Historique" #. module: sale #: 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: sale #: view:sale.order.line:0 @@ -802,9 +814,9 @@ msgid "Do you really want to create the invoices ?" msgstr "Voulez-vous vraiment créer les factures ?" #. module: sale -#: view:sale.order:0 -msgid "Compute" -msgstr "Calculer" +#: view:sale.config.picking_policy:0 +msgid "Set Default" +msgstr "Définir comme valeur par défaut" #. module: sale #: view:sale.order:0 @@ -814,7 +826,7 @@ msgstr "Commandes" #. module: sale #: view:sale.config.picking_policy:0 msgid "Configure Picking Policy for Sale Order" -msgstr "" +msgstr "Configurez la Politique de Colisage pour la Commande" #. module: sale #: field:sale.order,incoterm:0 @@ -848,20 +860,24 @@ msgid "Price" msgstr "Prix" #. module: sale +#: field:sale.order.line,product_uom_qty:0 +msgid "Quantity (UOM)" +msgstr "Quantité (UP)" + +#. module: sale #: field:sale.order.line,product_uos:0 msgid "Product UOS" msgstr "Unité secondaire" #. module: sale -#: rml:sale.order:0 -msgid "Tel. :" -msgstr "" +#: field:sale.order.line,product_packaging:0 +msgid "Packaging used" +msgstr "Colisage utilisé" #. module: sale -#, python-format -#: code:addons/sale/sale.py:0 -msgid "Could not cancel this sale order !" -msgstr "" +#: field:sale.order.line,product_uom:0 +msgid "Product UOM" +msgstr "UP produit" #. module: sale #: field:stock.move,sale_line_id:0 @@ -876,22 +892,23 @@ msgstr "Sur commande" #. module: sale #: model:ir.model,name:sale.model_sale_config_picking_policy msgid "sale.config.picking_policy" -msgstr "" +msgstr "sale.config.picking_policy" #. module: sale #: help:sale.order,partner_order_id:0 -msgid "The name and address of the contact that requested the order or quotation." +msgid "" +"The name and address of the contact that requested the order or quotation." msgstr "Le nom et l'adresse du contacte ayant demandé le devis." #. module: sale #: field:sale.order,partner_id:0 msgid "Customer" -msgstr "" +msgstr "Client" #. module: sale #: field:sale.config.picking_policy,name:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: sale #: field:sale.order,invoice_quantity:0 @@ -899,12 +916,6 @@ msgid "Invoice on" msgstr "Facture sur" #. module: sale -#: model:ir.actions.act_window,name:sale.action_order_tree_new -#: model:ir.ui.menu,name:sale.menu_action_order_tree_new -msgid "New Quotation" -msgstr "" - -#. module: sale #: view:sale.order:0 msgid "Total amount" msgstr "Montant total" @@ -913,12 +924,12 @@ msgstr "Montant total" #: rml:sale.order:0 #: field:sale.order,date_order:0 msgid "Date Ordered" -msgstr "" +msgstr "Date de commande" #. module: sale -#: selection:sale.order,order_policy:0 -msgid "Automatic Invoice after delivery" -msgstr "Facture automatique après livraison" +#: rml:sale.order:0 +msgid "Net Total :" +msgstr "Net a payer :" #. module: sale #: rml:sale.shipping:0 @@ -931,9 +942,14 @@ msgid "S.U." msgstr "U.V." #. module: sale +#: rml:sale.shipping:0 +msgid "Shipping date" +msgstr "Date de livraison" + +#. module: sale #: rml:sale.order:0 msgid "Payment Terms" -msgstr "" +msgstr "Conditions de Paiement" #. module: sale #: view:sale.order:0 @@ -953,12 +969,7 @@ msgstr "Séquence" #. module: sale #: field:sale.order,payment_term:0 msgid "Payment Term" -msgstr "" - -#. module: sale -#: help:sale.order,invoice_ids:0 -msgid "This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)." -msgstr "C'est la liste des factures qui ont étées générées pour cette commande. Le même commande peut avoir été facturé en plusieurs fois (par lignes par example)." +msgstr "Condition de paiement" #. module: sale #: view:sale.order:0 @@ -970,7 +981,7 @@ msgstr "États" #: field:sale.order,picked_rate:0 #: field:sale.order,shipped:0 msgid "Picked" -msgstr "" +msgstr "Réceptionné" #. module: sale #: view:sale.shop:0 @@ -986,10 +997,9 @@ msgstr "Montant hors-taxes" #: model:ir.actions.act_window,name:sale.action_order_tree #: model:ir.ui.menu,name:sale.menu_action_order_tree msgid "My Sales Order" -msgstr "Mes commandes " +msgstr "Mes commandes" #. module: sale #: model:ir.model,name:sale.model_sale_order_line msgid "Sale Order line" msgstr "Ligne de commande" - diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index e6b7c1a3c52..d91109ae331 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -23,6 +23,7 @@ <field eval=""""Order"""" name="name"/> <field eval=""""After confirming order, Create the invoice."""" name="note"/> <field name="process_id" ref="account.process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_salesworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -34,6 +35,7 @@ <field eval=""""Sale Order Procurement"""" name="name"/> <field eval=""""Procurement for each line"""" name="note"/> <field name="process_id" ref="mrp.process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_salesworkflow0"/> <field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -85,10 +87,11 @@ <record id="process_node_invoice0" model="process.node"> <field name="menu_id" ref="account.menu_invoice_draft"/> <field name="model_id" ref="account.model_account_invoice"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Invoice"""" name="name"/> <field eval=""""In case you invoice based on sale order."""" name="note"/> <field name="process_id" ref="process_process_salesworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -96,10 +99,11 @@ <record id="process_node_invoiceafterdelivery0" model="process.node"> <field name="menu_id" ref="account.menu_invoice_draft"/> <field name="model_id" ref="account.model_account_invoice"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Invoice after delivery"""" name="name"/> <field eval=""""In case you invoice based on deliveries (subflow)"""" name="note"/> <field name="process_id" ref="process_process_salesworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -118,6 +122,18 @@ <!-- Process Transition --> + + <record id="res_roles_salesman0" model="res.roles"> + <field eval=""""Salesman"""" name="name"/> + </record> + + <record id="sale.trans_draft_router" model="workflow.transition"> + <field name="role_id" ref="res_roles_salesman0"/> + </record> + + <record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition"> + <field name="role_id" ref="res_roles_salesman0"/> + </record> <record id="process_transition_confirmquotation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -125,8 +141,64 @@ <field eval=""""Whenever confirm button is clicked, the draft state is moved to manual. that is, quotation is moved to sale order."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/> <field model="process.node" name="source_node_id" ref="process_node_quotation0"/> + <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/> + </record> + + <record id="process_transition_packing0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Packing"""" name="name"/> + <field eval=""""Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> + <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> + </record> + + <record id="process_transition_deliver0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Deliver"""" name="name"/> + <field eval=""""Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> + <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> </record> + <record id="process_transition_invoice0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Invoice"""" name="name"/> + <field eval=""""Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_invoice0"/> + <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> + <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/> + </record> + + <record id="process_transition_invoiceafterdelivery0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Invoice after delivery"""" name="name"/> + <field eval=""""When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> + <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/> + </record> + + <record id="process_transition_saleprocurement0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Sale Procurement"""" name="name"/> + <field eval=""""In sale order , procuerement for each line and it comes into the procurement order"""" name="note"/> + <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/> + <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/> + </record> + + <record id="process_transition_saleinvoice0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Sale Invoice"""" name="name"/> + <field eval=""""Confirm sale order and Create invoice."""" name="note"/> + <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> + <field model="process.node" name="source_node_id" ref="process_node_order0"/> + </record> + + <!-- + Process Action + --> + <record id="process_transition_action_confirm0" model="process.transition.action"> <field eval=""""action_wait"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -140,15 +212,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_confirmquotation0"/> </record> - - <record id="process_transition_packing0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Packing"""" name="name"/> - <field eval=""""Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> - </record> - + <record id="process_transition_action_assign0" model="process.transition.action"> <field eval=""""action_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -169,15 +233,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_packing0"/> </record> - - <record id="process_transition_deliver0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Deliver"""" name="name"/> - <field eval=""""Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> - </record> - + <record id="process_transition_action_cancelassignation0" model="process.transition.action"> <field eval=""""cancel_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -198,77 +254,20 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_deliver0"/> </record> - - <record id="process_transition_invoice0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Invoice"""" name="name"/> - <field model="process.node" name="target_node_id" ref="process_node_invoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> - </record> - + <record id="process_transition_action_createinvoice0" model="process.transition.action"> <field eval=""""action_invoice_create"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Create Invoice"""" name="name"/> <field name="transition_id" ref="process_transition_invoice0"/> </record> - - <record id="process_transition_action_cancelorder0" model="process.transition.action"> + + <record id="process_transition_action_cancelorder0" model="process.transition.action"> <field eval=""""action_cancel"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Cancel Order"""" name="name"/> <field name="transition_id" ref="process_transition_invoice0"/> </record> - <record id="process_transition_invoice0" model="process.transition"> - <field eval=""""Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices."""" name="note"/> - </record> - - <record id="process_transition_invoiceafterdelivery0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Invoice after delivery"""" name="name"/> - <field eval=""""When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> - <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/> - </record> - - <record id="process_transition_saleprocurement0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Sale Procurement"""" name="name"/> - <field eval=""""In sale order , procuerement for each line and it comes into the procurement order"""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/> - </record> - - <record id="process_transition_saleinvoice0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Sale Invoice"""" name="name"/> - <field eval=""""Confirm sale order and Create invoice."""" name="note"/> - <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> - <field model="process.node" name="source_node_id" ref="process_node_order0"/> - </record> - - <record id="res_roles_salesman0" model="res.roles"> - <field eval=""""Salesman"""" name="name"/> - </record> - - <record id="sale.trans_draft_router" model="workflow.transition"> - <field name="role_id" ref="res_roles_salesman0"/> - </record> - - <record id="process_transition_confirmquotation0" model="process.transition"> - <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/> - </record> - - <record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition"> - <field name="role_id" ref="res_roles_salesman0"/> - </record> - - <record id="process_transition_invoice0" model="process.transition"> - <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/> - </record> - </data> </openerp> diff --git a/addons/sale/report/shipping.py b/addons/sale/report/shipping.py index 55949fdeec1..7ecbe6bff9d 100644 --- a/addons/sale/report/shipping.py +++ b/addons/sale/report/shipping.py @@ -16,6 +16,17 @@ class shipping(report_sxw.rml_parse): super(shipping, self).__init__(cr, uid, name, context) self.localcontext.update({ 'time': time, +# 'sum_total': self._sum_total, }) + +# def _sum_total(self,data): +# print "======data=======",data['id'] +# self.cr.execute("SELECT sum(pt.list_price*sm.product_qty) FROM stock_picking as sp "\ +# "LEFT JOIN stock_move sm ON (sp.id = sm.picking_id) "\ +# "LEFT JOIN product_product pp ON (sm.product_id = pp.id) "\ +# "LEFT JOIN product_template pt ON (pp.product_tmpl_id = pt.id) "\ +# "WHERE sm.picking_id = %d "%(data['id'])) +# sum_total = self.cr.fetchone()[0] or 0.00 +# return sum_total report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale/report/shipping.rml',parser=shipping) diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 35bc22beba9..3e8f1105cde 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -60,9 +60,6 @@ <lineStyle kind="LINEBELOW" colorName="#666666" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#666666" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/> - <lineStyle kind="LINEBELOW" colorName="#666666" start="5,-1" stop="5,-1"/> </blockTableStyle> <blockTableStyle id="Table4"> <blockAlignment value="LEFT"/> @@ -71,21 +68,6 @@ <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> - <blockTableStyle id="Table5"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/> - <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/> - <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> @@ -196,25 +178,16 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="67.0,212.0,71.0,65.0,59.0,63.0" repeatRows="1" style="Table3"> + <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3"> <tr> <td> - <para style="terp_tblheader_Details">Reference</para> - </td> - <td> <para style="terp_tblheader_Details">Designation</para> </td> <td> <para style="terp_tblheader_Details_Centre">Lot</para> </td> <td> - <para style="terp_tblheader_Details_Centre">Quantity</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Unit Price</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Price</para> + <para style="terp_tblheader_Details_Right">Quantity</para> </td> </tr> </blockTable> @@ -223,16 +196,13 @@ </para> <section> <para style="P2">[[ repeatIn(o.move_lines,'line') ]]</para> - <blockTable colWidths="66.0,213.0,70.0,46.0,21.0,58.0,63.0" style="Table4"> + <blockTable colWidths="370.0,85.0,59.0,24.0" style="Table4"> <tr> <td> - <para style="terp_default_9">[[line.product_id.code ]]</para> - </td> - <td> - <para style="terp_default_9">[[ line.product_id and line.product_id.name or '']]</para> + <para style="terp_default_9">[[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]</para> </td> <td> - <para style="terp_default_9">[[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]</para> + <para style="terp_default_Centre_9">[[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]</para> </td> <td> <para style="terp_default_Right_9">[[ line.product_qty ]]</para> @@ -240,48 +210,14 @@ <td> <para style="terp_default_Right_9">[[ line.product_uom and line.product_uom.name ]]</para> </td> - <td> - <para style="terp_default_Right_9">[[ line.sale_line_id and line.sale_line_id.price_unit ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ line.sale_line_id and line.sale_line_id.price_subtotal ]]</para> - </td> </tr> </blockTable> <para style="terp_default_1"> <font color="white"> </font> </para> </section> - <blockTable colWidths="416.0,55.0,66.0" style="Table5"> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9">Net Total :</para> - </td> - <td> - <para style="terp_default_Right_9">[[ o.sale_id and o.sale_id.amount_untaxed ]]</para> - </td> - </tr> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="P3">Total :</para> - </td> - <td> - <para style="terp_default_Right_9_Bold">[[ o.sale_id and o.sale_id.amount_total ]] </para> - </td> - </tr> - </blockTable> <para style="Standard"> <font color="white"> </font> </para> </story> -</document> +</document>
\ No newline at end of file diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 31dc3ce1f83..8a48a5c582b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -299,10 +299,9 @@ class sale_order(osv.osv): if not part: return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False, 'payment_term' : False}} addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery','invoice','contact']) - pricelist = self.pool.get('res.partner').property_get(cr, uid, - part,property_pref=['property_product_pricelist']).get('property_product_pricelist',False) - payment_term = self.pool.get('res.partner').property_get(cr, uid, - part,property_pref=['property_payment_term']).get('property_payment_term',False) + part = self.pool.get('res.partner').browse(cr, uid, part) + pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False + payment_term = part.property_payment_term and part.property_payment_term.id or False return {'value':{'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'pricelist_id': pricelist, 'payment_term' : payment_term}} def button_dummy(self, cr, uid, ids, context={}): @@ -462,7 +461,8 @@ class sale_order(osv.osv): def test_state(self, cr, uid, ids, mode, *args): assert mode in ('finished', 'canceled'), _("invalid mode for test_state") finished = True - canceled = False + canceled = False + notcanceled = False write_done_ids = [] write_cancel_ids = [] for order in self.browse(cr, uid, ids, context={}): @@ -471,6 +471,8 @@ class sale_order(osv.osv): finished = False if line.procurement_id and line.procurement_id.state == 'cancel': canceled = True + if line.procurement_id and line.procurement_id.state <> 'cancel': + notcanceled = True # if a line is finished (ie its procuremnt is done or it has not procuremernt and it # is not already marked as done, mark it as being so... if ((not line.procurement_id) or line.procurement_id.state == 'done') and line.state != 'done': @@ -486,6 +488,8 @@ class sale_order(osv.osv): if mode=='finished': return finished elif mode=='canceled': + if notcanceled: + return False return canceled def action_ship_create(self, cr, uid, ids, *args): @@ -732,6 +736,7 @@ class sale_order_line(osv.osv): if uosqty: pu = round(line.price_unit * line.product_uom_qty / uosqty, int(config['price_accuracy'])) + a = self.pool.get('account.fiscal.position').map_account(cr, uid, line.order_id.partner_id, a) inv_id = self.pool.get('account.invoice.line').create(cr, uid, { 'name': line.name, 'account_id': a, @@ -843,25 +848,10 @@ class sale_order_line(osv.osv): if update_tax: #The quantity only have changed result['delay'] = (product_obj.sale_delay or 0.0) - taxes = self.pool.get('account.tax').browse(cr, uid, - [x.id for x in product_obj.taxes_id]) - taxep = None - if partner_id: - taxep_id = self.pool.get('res.partner').property_get(cr, uid, - partner_id,property_pref=['property_account_tax']).get('property_account_tax',False) - if taxep_id: - taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id) - if not taxep or not taxep.id: - result['tax_id'] = [x.id for x in product_obj.taxes_id] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - result['tax_id'] = res5 + partner = partner_obj.browse(cr, uid, partner_id) + result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, product_obj.taxes_id) result['name'] = product_obj.partner_ref - domain = {} if not uom and not uos: result['product_uom'] = product_obj.uom_id.id diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml index 8ced0a1c0dc..afb43b869c5 100644 --- a/addons/sale/sale_report.xml +++ b/addons/sale/sale_report.xml @@ -23,7 +23,7 @@ rml="sale/report/prepare_allot.rml" auto="False"/> --> - <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Print Order"/> - + <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Quotation / Order"/> + </data> </openerp> diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 31c68c7c885..0ce98ed3971 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,5 +1,17 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_sale_shop,sale.shop,model_sale_shop,group_sale_user,1,0,0,0 -access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,0 -access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,0 -access_sale_shop_admin,sale.shop,model_sale_shop,base.group_system,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_sale_shop","sale.shop","model_sale_shop","group_sale_user",1,0,0,0 +"access_sale_order","sale.order","model_sale_order","group_sale_user",1,1,1,0 +"access_sale_order_line","sale.order.line","model_sale_order_line","group_sale_user",1,1,1,0 +"access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1 +"access_sale_config_picking_policy","sale.config.picking_policy","model_sale_config_picking_policy","group_sale_user",1,0,0,0 +"access_sale_config_picking_policy_manager","sale.config.picking_policy_manager","model_sale_config_picking_policy","group_sale_manager",1,1,1,1 +"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","group_sale_user",1,1,1,1 +"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","group_sale_user",1,1,1,1 +"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","group_sale_user",1,0,0,0 +"access_account_analytic_account_salesman","account_analytic_account salesman","account.model_account_analytic_account","group_sale_user",1,1,1,1 +"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1 +"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,1 +"access_mrp_property_salesman","mrp.property salesman","mrp.model_mrp_property","group_sale_user",1,0,0,0 +"access_mrp_procurement_salesman","mrp.procurement salesman","mrp.model_mrp_procurement","group_sale_user",1,1,1,1 +"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,0,0,0 +"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,0,0,0 diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 765c151a47e..9778e607ecf 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_sale_manager" model="res.groups"> <field name="name">Sale / Manager</field> @@ -9,5 +9,11 @@ <field name="name">Sale / Salesman</field> </record> + + <record model='ir.ui.menu' id='menu_shop_configuration'> + <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/> + </record> + + </data> </openerp> diff --git a/addons/sale_analytic_plans/i18n/fr_FR.po b/addons/sale_analytic_plans/i18n/fr_FR.po index 61b5ccebe75..0355aa81f23 100644 --- a/addons/sale_analytic_plans/i18n/fr_FR.po +++ b/addons/sale_analytic_plans/i18n/fr_FR.po @@ -4,19 +4,19 @@ # 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:25+0000\n" +"PO-Revision-Date: 2008-10-13 16: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 16:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: sale_analytic_plans #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" - +msgstr "XML non valide pour l'architecture de la vue" diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py index abb4374837d..c66bd1f2e6e 100644 --- a/addons/sale_crm/__terp__.py +++ b/addons/sale_crm/__terp__.py @@ -4,7 +4,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_sale.html", - "depends" : ["sale", "crm", "product", "account"], + "depends" : ["sale", "crm_configuration", "product", "account"], "category" : "Generic Modules/Sales & Purchases", "description": """ This module adds a shortcut on one or several cases in the CRM. @@ -18,7 +18,9 @@ """, "init_xml" : [], "demo_xml" : [], - "update_xml" : ["sale_crm_wizard.xml"], + "update_xml" : ["sale_crm_wizard.xml", + "process/sale_crm_process.xml" + ], "active": False, "installable": True } diff --git a/addons/sale_crm/i18n/fr_FR.po b/addons/sale_crm/i18n/fr_FR.po index 8b276796b6c..690933e631a 100644 --- a/addons/sale_crm/i18n/fr_FR.po +++ b/addons/sale_crm/i18n/fr_FR.po @@ -4,92 +4,88 @@ # 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-11 08:42+0000\n" +"Last-Translator: Christophe Chauvet <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:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: sale_crm #: wizard_field:crm.case.make_order,init,shop_id:0 msgid "Shop" -msgstr "" +msgstr "Magasin" #. module: sale_crm #: wizard_field:crm.case.make_order,init,name:0 msgid "Order name" -msgstr "" +msgstr "Nom de la commande" #. module: sale_crm #: wizard_field:crm.case.make_order,init,partner_id:0 msgid "Default partner" -msgstr "" +msgstr "Partenaire par défaut" #. module: sale_crm #: wizard_field:sale_crm.make_case,init,name:0 msgid "Case Description" -msgstr "" +msgstr "Description du cas" #. module: sale_crm #: wizard_view:crm.case.make_order,init:0 #: wizard_button:crm.case.make_order,init,order:0 +#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard msgid "Make Sale Order" -msgstr "" +msgstr "Créer une commande de vente" #. module: sale_crm #: wizard_field:sale_crm.make_case,init,user:0 msgid "User Responsible" -msgstr "" +msgstr "Responsable" #. module: sale_crm #: wizard_field:crm.case.make_order,init,analytic_account:0 msgid "Analytic account" -msgstr "" +msgstr "Compte analytique" #. module: sale_crm #: wizard_field:crm.case.make_order,init,picking_policy:0 msgid "Packing policy" -msgstr "" +msgstr "Règle de conditionnement" #. module: sale_crm #: wizard_field:crm.case.make_order,init,products:0 msgid "Products" -msgstr "" - -#. module: sale_crm -#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard -msgid "Make Quotation" -msgstr "" +msgstr "Produits" #. module: sale_crm #: wizard_button:sale_crm.make_case,init,end:0 #: wizard_button:crm.case.make_order,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: sale_crm #: wizard_field:crm.case.make_order,init,close:0 msgid "Close" -msgstr "" +msgstr "Fermer" #. module: sale_crm #: wizard_field:sale_crm.make_case,init,description:0 msgid "Your action" -msgstr "" +msgstr "Votre action" #. module: sale_crm #: wizard_button:sale_crm.make_case,init,create:0 msgid "Create" -msgstr "" +msgstr "Créer" #. module: sale_crm #: wizard_view:sale_crm.make_case,init:0 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard msgid "Make Case" -msgstr "" - +msgstr "Créer un Cas" diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml new file mode 100644 index 00000000000..6aaa146b250 --- /dev/null +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="process_node_contractsale0" model="process.node"> + <field name="menu_id" ref="sale.menu_sale_order"/> + <field name="model_id" ref="sale.model_sale_order"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Contract Sale"""" name="name"/> + <field eval=""""Contract Command (sale)"""" name="note"/> + <field name="process_id" ref="crm_configuration.process_process_contractworkflow0"/> + <field eval=""""object.state in ('draft', 'manual', 'waiting_date', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_transition_accordsale0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Accord Sale"""" name="name"/> + <field eval=""""Goes into the Sale"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_contractsale0"/> + <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_accord0"/> + </record> + + </data> +</openerp>
\ No newline at end of file diff --git a/addons/sale_journal/i18n/fr_FR.po b/addons/sale_journal/i18n/fr_FR.po index 1dcfd4bfb51..3e2eba754d8 100644 --- a/addons/sale_journal/i18n/fr_FR.po +++ b/addons/sale_journal/i18n/fr_FR.po @@ -4,34 +4,35 @@ # 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:04+0000\n" +"PO-Revision-Date: 2008-10-13 16:29+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 16:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats msgid "Monthly sales" -msgstr "" +msgstr "Ventes mensuelles" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "assigned" -msgstr "" +msgstr "Attribué" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month #: view:sale_journal.invoice.type.stats:0 msgid "Packings by invoice method" -msgstr "" +msgstr "Conditionnement par méthode de facturation" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_packing_lists @@ -41,47 +42,47 @@ msgstr "Listes de colisage" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Waiting Schedule" -msgstr "" +msgstr "Attente d'exécution" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,invoice_state:0 msgid "to be invoiced" -msgstr "" +msgstr "à facturer" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal #: field:stock.picking,sale_journal_id:0 #: view:sale_journal.sale.journal:0 msgid "Sale Journal" -msgstr "" +msgstr "Journal de vente" #. module: sale_journal #: field:sale_journal.sale.journal,sale_stats_ids:0 msgid "Sale Stats" -msgstr "" +msgstr "Stats de vente" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Set to Draft" -msgstr "" +msgstr "Mettre au brouillon" #. module: sale_journal #: field:sale_journal.picking.journal,date:0 #: field:sale_journal.sale.journal,date:0 msgid "Journal date" -msgstr "" +msgstr "Date du journal" #. module: sale_journal #: help:res.partner,property_invoice_type:0 msgid "The type of journal used for sales and packings." -msgstr "" +msgstr "Le type de journal utilisé pour les ventes et les colisages" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree @@ -89,65 +90,65 @@ msgstr "" #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month msgid "Packings by journal" -msgstr "" +msgstr "Colisages par Journal" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my msgid "My open journals" -msgstr "" +msgstr "Mes journaux ouverts" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking msgid "Packings Journals" -msgstr "" +msgstr "Journaux de colisages" #. module: sale_journal #: field:sale_journal.invoice.type.stats,count:0 #: field:sale_journal.picking.stats,count:0 #: field:sale_journal.sale.stats,count:0 msgid "# of Lines" -msgstr "" +msgstr "# de lignes" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open msgid "All Open Journals" -msgstr "" +msgstr "Tous les journaux ouverts" #. module: sale_journal #: selection:sale_journal.picking.journal,state:0 #: selection:sale_journal.sale.journal,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open msgid "Statistics on packings to invoice" -msgstr "" +msgstr "Statistiques sur les colisages à facturer" #. module: sale_journal #: field:sale_journal.invoice.type.stats,price_average:0 #: field:sale_journal.picking.stats,price_average:0 #: field:sale_journal.sale.stats,price_average:0 msgid "Average Price" -msgstr "" +msgstr "Prix moyen" #. module: sale_journal #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue!" #. module: sale_journal #: selection:sale_journal.invoice.type,invoicing_method:0 msgid "Grouped" -msgstr "" +msgstr "Groupé" #. module: sale_journal #: field:sale_journal.invoice.type.stats,state:0 #: field:sale_journal.picking.stats,state:0 #: field:sale_journal.sale.journal,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all @@ -160,7 +161,7 @@ msgstr "Tous les mois" #: field:sale_journal.picking.stats,price_total:0 #: field:sale_journal.sale.stats,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Prix Total" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting @@ -171,23 +172,23 @@ msgstr "Reporting" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my msgid "My open packing journals" -msgstr "" +msgstr "Mes journaux de colisage ouvert" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats msgid "Sales Orders by Journal" -msgstr "" +msgstr "Commandes de ventes par Journal" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "waiting" -msgstr "" +msgstr "En attente" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_picking_journal msgid "Packings Journal" -msgstr "" +msgstr "Journal de colisage" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_configuration @@ -197,49 +198,49 @@ msgstr "Configuration" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,invoice_state:0 msgid "None" -msgstr "" +msgstr "Aucun" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats msgid "Stats on packings by invoice method" -msgstr "" +msgstr "Statistiques sur les colisages par methode de facturation" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month msgid "Sales by journal (this month)" -msgstr "" +msgstr "Ventes par journal (ce mois)" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Manual in progress" -msgstr "" +msgstr "Manuel en cours" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Shipping Exception" -msgstr "" +msgstr "Exception de livraison" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "In progress" -msgstr "" +msgstr "En cours" #. module: sale_journal #: field:sale_journal.invoice.type.stats,name:0 #: field:sale_journal.picking.stats,name:0 #: field:sale_journal.sale.stats,name:0 msgid "Month" -msgstr "" +msgstr "Mois" #. module: sale_journal #: field:sale_journal.invoice.type.stats,invoice_state:0 msgid "Invoice state" -msgstr "" +msgstr "État de la facture" #. module: sale_journal #: view:sale_journal.picking.stats:0 msgid "Packings by journals" -msgstr "" +msgstr "Colisages par journaux" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_sending_goods @@ -249,96 +250,96 @@ msgstr "Livraison de marchandise" #. module: sale_journal #: field:sale_journal.sale.stats,state:0 msgid "Order State" -msgstr "" +msgstr "État commande" #. module: sale_journal #: view:sale_journal.picking.journal:0 msgid "Cancel Packings" -msgstr "" +msgstr "Annuler conditionnement" #. module: sale_journal #: field:sale_journal.invoice.type,note:0 #: field:sale_journal.picking.journal,note:0 #: field:sale_journal.sale.journal,note:0 msgid "Note" -msgstr "" +msgstr "Note" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "done" -msgstr "" +msgstr "terminer" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned msgid "Assigned packings" -msgstr "" +msgstr "Colisages assignés" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "cancel" -msgstr "" +msgstr "annuler" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open msgid "Packings to invoice" -msgstr "" +msgstr "Colisages à facturer" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Invoice Exception" -msgstr "" +msgstr "Exception de facture" #. module: sale_journal #: view:sale_journal.picking.journal:0 msgid "Packings" -msgstr "" +msgstr "Colisages" #. module: sale_journal #: field:sale_journal.picking.journal,date_validation:0 #: field:sale_journal.sale.journal,date_validation:0 msgid "Validation date" -msgstr "" +msgstr "Date da validation" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu msgid "Packings by Journal" -msgstr "" +msgstr "Colisages par journaux" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "draft" -msgstr "" +msgstr "brouillon" #. module: sale_journal #: field:sale_journal.invoice.type,active:0 msgid "Active" -msgstr "" +msgstr "Actif" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice msgid "Packings to Invoice" -msgstr "" +msgstr "Colisages à facturer" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft msgid "Draft sales" -msgstr "" +msgstr "Ventes en brouillon" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Quotation" -msgstr "" +msgstr "Proposition" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal msgid "Sales Journals" -msgstr "" +msgstr "Journaux de ventes" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree @@ -348,93 +349,96 @@ msgstr "" #. module: sale_journal #: view:sale_journal.sale.journal:0 msgid "Confirm Sales" -msgstr "" +msgstr "Confirmer les Ventes" #. module: sale_journal #: field:sale_journal.picking.journal,date_created:0 #: field:sale_journal.picking.journal,state:0 #: field:sale_journal.sale.journal,date_created:0 msgid "Creation date" -msgstr "" +msgstr "Date de création" #. module: sale_journal #: field:res.partner,property_invoice_type:0 msgid "Invoicing Method" -msgstr "" +msgstr "Méthode de facturation" #. module: sale_journal #: field:sale_journal.picking.journal,code:0 #: field:sale_journal.sale.journal,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Open Journal" -msgstr "" +msgstr "Ouvrir journal" #. module: sale_journal #: view:sale_journal.sale.journal:0 msgid "Sales" -msgstr "" +msgstr "Ventes" #. module: sale_journal #: view:sale_journal.picking.journal:0 msgid "Packing Journal" -msgstr "" +msgstr "Journal de colisage" #. module: sale_journal #: selection:sale_journal.picking.journal,state:0 #: selection:sale_journal.sale.journal,state:0 #: selection:sale_journal.sale.stats,state:0 msgid "Done" -msgstr "" +msgstr "Terminer" #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 msgid "Cancel" -msgstr "" +msgstr "Annuler" #. module: sale_journal #: field:sale_journal.picking.journal,picking_stats_ids:0 msgid "Journal Stats" -msgstr "" +msgstr "Statistiques des Journaux" #. module: sale_journal #: selection:sale_journal.picking.journal,state:0 #: selection:sale_journal.sale.journal,state:0 msgid "Open" -msgstr "" +msgstr "Ouvert" #. module: sale_journal #: 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: sale_journal #: field:sale_journal.picking.journal,user_id:0 #: field:sale_journal.sale.journal,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Responsable" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open msgid "My Open Journals" -msgstr "" +msgstr "Mes Journaux Ouverts" #. module: sale_journal #: view:sale_journal.sale.journal:0 msgid "Cancel Sales" -msgstr "" +msgstr "Ventes Annulées" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu msgid "Packings by Invoice Method" -msgstr "" +msgstr "Colisages par méthode de facturation" #. module: sale_journal #: field:sale_journal.invoice.type,name:0 @@ -442,30 +446,30 @@ msgstr "" #: field:stock.picking,invoice_type_id:0 #: view:sale_journal.invoice.type:0 msgid "Invoice Type" -msgstr "" +msgstr "Type de facture" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,invoice_state:0 msgid "invoiced" -msgstr "" +msgstr "Facturé" #. module: sale_journal #: selection:sale_journal.invoice.type.stats,state:0 #: selection:sale_journal.picking.stats,state:0 msgid "confirmed" -msgstr "" +msgstr "Confirmé" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats msgid "Packing lists by Journal" -msgstr "" +msgstr "Listes des colisages par journaux" #. module: sale_journal #: field:sale_journal.invoice.type.stats,quantity:0 #: field:sale_journal.picking.stats,quantity:0 #: field:sale_journal.sale.stats,quantity:0 msgid "Quantities" -msgstr "" +msgstr "Quantités" #. module: sale_journal #: field:sale_journal.picking.journal,name:0 @@ -477,24 +481,24 @@ msgstr "" #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Journal" -msgstr "" +msgstr "Journal" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed msgid "Confirmed packings" -msgstr "" +msgstr "Colisages Confirmés" #. module: sale_journal #: field:sale_journal.invoice.type,invoicing_method:0 #: field:sale_journal.invoice.type.stats,invoice_type_id:0 msgid "Invoicing method" -msgstr "" +msgstr "Méthode de facturation" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal msgid "Packings journals" -msgstr "" +msgstr "Journaux de colisages" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this @@ -508,43 +512,42 @@ msgstr "Ce mois" #: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu #: view:sale_journal.sale.stats:0 msgid "Sales by Journal" -msgstr "" +msgstr "Ventes par Journa" #. module: sale_journal #: selection:sale_journal.invoice.type,invoicing_method:0 msgid "Non grouped" -msgstr "" +msgstr "Non groupées" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Journal Information" -msgstr "" +msgstr "Information Journal" #. module: sale_journal #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type msgid "Invoice Types" -msgstr "" +msgstr "Types de facture" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "States" -msgstr "" +msgstr "États" #. module: sale_journal #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Close Journal" -msgstr "" +msgstr "Fermer Journal" #. module: sale_journal #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type msgid "Invoicing Methods" -msgstr "" +msgstr "Méthodes de facturation" #. module: sale_journal #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved msgid "Approved sales" -msgstr "" - +msgstr "Ventes Approuvées" diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index 17975fe9755..a0b397282e8 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -285,9 +285,9 @@ <field name="type">form</field> <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> - <field name="property_product_pricelist" position="after"> + <page string="Sales & Purchases" position="inside"> <field name="property_invoice_type"/> - </field> + </page> </field> </record> diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv index 513e65e741e..e199ad1e30b 100644 --- a/addons/sale_journal/security/ir.model.access.csv +++ b/addons/sale_journal/security/ir.model.access.csv @@ -1,10 +1,14 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_sale_journal_invoice_type_stats,sale_journal.invoice.type.stats,model_sale_journal_invoice_type_stats,sale.group_sale_user,1,0,0,0 -access_sale_journal_picking_stats,sale_journal.picking.stats,model_sale_journal_picking_stats,sale.group_sale_user,1,0,0,0 -access_sale_journal_invoice_type,sale_journal.invoice.type,model_sale_journal_invoice_type,sale.group_sale_user,1,0,0,0 -access_sale_journal_sale_journal,sale_journal.sale.journal,model_sale_journal_sale_journal,sale.group_sale_user,1,0,0,0 -access_sale_journal_picking_journal,sale_journal.picking.journal,model_sale_journal_picking_journal,sale.group_sale_user,1,0,0,0 -access_sale_journal_sale_stats,sale_journal.sale.stats,model_sale_journal_sale_stats,sale.group_sale_user,1,0,0,0 -access_sale_journal_invoice_type_manager,sale_journal.invoice.type.manager,model_sale_journal_invoice_type,sale.group_sale_manager,1,1,1,1 -access_sale_journal_sale_journal_manager,sale_journal.sale.journal.manager,model_sale_journal_sale_journal,sale.group_sale_manager,1,1,1,1 -access_sale_journal_picking_journal_manager,sale_journal.picking.journal.manager,model_sale_journal_picking_journal,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_sale_journal_invoice_type_stats","sale_journal.invoice.type.stats","model_sale_journal_invoice_type_stats","sale.group_sale_user",1,0,0,0 +"access_sale_journal_picking_stats","sale_journal.picking.stats","model_sale_journal_picking_stats","sale.group_sale_user",1,0,0,0 +"access_sale_journal_invoice_type","sale_journal.invoice.type","model_sale_journal_invoice_type","sale.group_sale_user",1,0,0,0 +"access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0 +"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","sale.group_sale_user",1,0,0,0 +"access_sale_journal_picking_journal","sale_journal.picking.journal","model_sale_journal_picking_journal","sale.group_sale_user",1,0,0,0 +"access_sale_journal_sale_stats","sale_journal.sale.stats","model_sale_journal_sale_stats","sale.group_sale_user",1,0,0,0 +"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","sale.group_sale_manager",1,1,1,1 +"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","sale.group_sale_manager",1,1,1,1 +"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","sale.group_sale_manager",1,1,1,1 +"access_sale_journal_sale_journal_stock_worker","sale_journal.sale.journal stock worker","model_sale_journal_sale_journal","stock.group_stock_user",1,0,0,0 +"access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0 +"access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0 diff --git a/addons/sandwich/__init__.py b/addons/sandwich/__init__.py new file mode 100644 index 00000000000..25aa31ed040 --- /dev/null +++ b/addons/sandwich/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +import sandwich +import report +import wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/__terp__.py b/addons/sandwich/__terp__.py new file mode 100644 index 00000000000..12fe33dbb1d --- /dev/null +++ b/addons/sandwich/__terp__.py @@ -0,0 +1,14 @@ +# -*- encoding: utf-8 -*- +{ + "name" : "Sandwich Module", + "author" : "Tiny", + "version" : "1.0", + "category" : "Generic Modules/Others", + "depends" : ["base", "product"], + "demo_xml" : ["sandwich_demo.xml"], + "update_xml" : ["sandwich_view.xml", "sandwich_report.xml", "sandwich_wizard.xml"], + "active": False, + "installable": True +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/report/__init__.py b/addons/sandwich/report/__init__.py new file mode 100644 index 00000000000..b161da86f17 --- /dev/null +++ b/addons/sandwich/report/__init__.py @@ -0,0 +1,4 @@ +# -*- encoding: utf-8 -*- +import sandwich_report +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/report/sandwich_report.py b/addons/sandwich/report/sandwich_report.py new file mode 100644 index 00000000000..c98d0ef65e3 --- /dev/null +++ b/addons/sandwich/report/sandwich_report.py @@ -0,0 +1,45 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 time +from report import report_sxw + +# +# sandwich command report +# +class sandwich_order_print(report_sxw.rml_parse): + def __init__(self, cr, uid, name, context): + super(sandwich_order_print, self).__init__(cr, uid, name, context) + self.localcontext.update( { + 'time': time, + }) + +report_sxw.report_sxw('report.sandwich.order.print','sandwich.order','addons/sandwich/report/sandwich_report.rml',parser=sandwich_order_print) +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/report/sandwich_report.rml b/addons/sandwich/report/sandwich_report.rml new file mode 100644 index 00000000000..e6f63c37d9a --- /dev/null +++ b/addons/sandwich/report/sandwich_report.rml @@ -0,0 +1,142 @@ +<?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="57.0" y1="57.0" width="481" height="728"/> + </pageTemplate> + </template> + <stylesheet> + <blockTableStyle id="Standard_Outline"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Tableau2"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Tableau1"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <blockBackground colorName="#c0c0c0" start="0,0" stop="0,0"/> + <blockBackground colorName="#c0c0c0" start="1,0" stop="1,0"/> + <blockBackground colorName="#c0c0c0" start="2,0" stop="2,0"/> + <blockBackground colorName="#c0c0c0" start="3,0" stop="3,0"/> + <blockBackground colorName="#c0c0c0" start="4,0" stop="4,0"/> + </blockTableStyle> + <initialize> + <paraStyle name="all" alignment="justify"/> + </initialize> + <paraStyle name="P1" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="RIGHT"/> + <paraStyle name="P2" fontName="Times-Roman" fontSize="12.0" leading="15"/> + <paraStyle name="P3" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/> + <paraStyle name="P4" fontName="Times-Roman" fontSize="12.0" leading="15"/> + <paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="P6" fontName="Times-Roman" fontSize="12.0" leading="15"/> + <paraStyle name="P7" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="RIGHT"/> + <paraStyle name="P8" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER"/> + <paraStyle name="P9" fontName="Times-Roman" alignment="RIGHT"/> + <paraStyle name="P10" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER"/> + <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"/> + <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Times-Roman"/> + </stylesheet> + <story> + <para style="P1">[[ repeatIn(objects, 'o') ]]</para> + <blockTable colWidths="280.0,202.0" repeatRows="1" style="Tableau2"> + <tr> + <td> + <para style="Table Contents"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="P2">[[ o.partner['name'] ]]</para> + <para style="P2">[[ o.partner.address[0]['street'] ]]</para> + <para style="P2">[[ o.partner.address[0]['street2'] ]]</para> + <para style="P2">[[ o.partner.address[0]['zip'] ]], [[ o.partner.address[0]['city'] ]]</para> + <para style="P2">[[ o.partner.address[0].state_id['name'] ]]</para> + <para style="P2">[[ o.partner.address[0].country_id['name'] ]]</para> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P2">Phone : [[ o.partner.address[0]['phone'] ]]</para> + <para style="P2">FAX : [[ o.partner.address[0]['fax'] ]]</para> + </td> + </tr> + </blockTable> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P2">Document : [[ o['name'] ]]</para> + <para style="P2">Date : [[ o['date'] ]]</para> + <para style="P3">Printing date : [[ time.strftime('%d/%m/%Y') ]]</para> + <para style="P2"> + <font color="white"> </font> + </para> + <para style="P4"> + <font color="white"> </font> + </para> + <blockTable colWidths="192.0,71.0,87.0,69.0,64.0" style="Tableau1"> + <tr> + <td> + <para style="P5">Item</para> + </td> + <td> + <para style="Table Heading">Quantity</para> + </td> + <td> + <para style="Table Heading">User</para> + </td> + <td> + <para style="Table Heading">Unit price</para> + </td> + <td> + <para style="Table Heading">Total Price</para> + </td> + </tr> + <tr> + <td> + <para style="P6"><b>[[ repeatIn(o.order_lines, 'a') ]]</b> + [[ a.product_id['name'] ]]</para> + </td> + <td> + <para style="P8">[[ a['quantity'] ]]</para> + </td> + <td> + <para style="P8">[[ a.user_id['login'] ]]</para> + </td> + <td> + <para style="P9">[[ a.product_id['price'] ]]</para> + </td> + <td> + <para style="P9">[[ a.product_id['price'] * a['quantity'] ]]</para> + </td> + </tr> + </blockTable> + <para style="P4"> + <font color="white"> </font> + </para> + <para style="P4"> + <font color="white"> </font> + </para> + <para style="P4">[[ o['note'] ]]</para> + <para style="P4"> + <font color="white"> </font> + </para> + <para style="P10"> + <font color="white"> </font> + </para> + </story> +</document> + diff --git a/addons/sandwich/sandwich.py b/addons/sandwich/sandwich.py new file mode 100644 index 00000000000..457c91b398b --- /dev/null +++ b/addons/sandwich/sandwich.py @@ -0,0 +1,101 @@ +# -*- encoding: utf-8 -*- +import time + +from osv import osv, fields +import pooler + +# +# Type of type of products (food, drink, lsd, other...) +# +class sandwich_product_type(osv.osv): + _name = 'sandwich.product.type' + _columns = { + 'name': fields.char('Name of the type', size=20, required=True), + 'description': fields.char('Type\'s description', size=255), + } +sandwich_product_type() + + +# +# Type Of Sandwich +# +class sandwich_product(osv.osv): + _name = 'sandwich.product' + _columns = { + 'name': fields.char('Product name', size=50, required=True), + 'price': fields.float('Product price'), + 'product_type_id': fields.many2one('sandwich.product.type','Type of product'), + } +sandwich_product() + + +# +# Sandwich command +# +class sandwich_order(osv.osv): + _name = 'sandwich.order' + _columns = { + 'name': fields.char('Name', size=50, required=True), + 'date': fields.date('Order date'), + 'order_lines': fields.one2many('sandwich.order.line','order_id','Order lines'), + 'note': fields.text('Notes'), + 'partner': fields.many2one('res.partner','Partner', required=True), + } + _defaults = { + 'date': lambda *a: time.strftime('%Y-%m-%d'), + } +sandwich_order() + + +# +# Sandwich lines of command +# +class sandwich_order_line(osv.osv): + _name = 'sandwich.order.line' + _columns = { + 'name': fields.char('Description', size=50, required=True), + 'product_id': fields.many2one('sandwich.product', 'Product'), + 'user_id': fields.many2one('res.users', 'User id', required=True), + 'quantity': fields.integer('Quantity', required=True), + 'order_id': fields.many2one('sandwich.order', 'Order'), + 'date': fields.date('Date'), + 'product_type_id':fields.many2one('sandwich.product.type','Product type',change_default=True), + } + _defaults = { + 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'user_id': lambda self, cr, uid, c: uid, + 'quantity': lambda *a: 1 + } + + def onchange_user_id(self, cr, uid, id, user_id, product_type_id, context={}, *args): + # print id, user_id, product_type_id, context + if (not user_id) or (not product_type_id): + return {} + cr.execute('SELECT product_id,name,quantity FROM sandwich_order_line WHERE user_id=%d AND product_type_id=%d ORDER BY date DESC LIMIT 1', (user_id, product_type_id)) + res = cr.dictfetchone() + if res: + return {'value': res} + # else + return {'value': {'product_id': False, 'name': '', 'quantity': 1}} + + def onchange_product_type_id(self, cr, uid, id, user_id, product_type_id, context={}): + if (not product_type_id) or (not user_id): + return {} + cr.execute('SELECT product_id,name,quantity FROM sandwich_order_line WHERE user_id=%d AND product_type_id=%d ORDER BY date DESC LIMIT 1', (user_id, product_type_id)) + res = cr.dictfetchone() + if res: + return {'value': res} + # else + return {'value': {'product_id': False, 'name': '', 'quantity': 1}} + + def onchange_product_id(self, cr, uid, id, product_id, context={}): + if not product_id: + return {} + res = pooler.get_pool(cr.dbname).get('sandwich.product').read(cr, uid, [ product_id ], ['name','product_type_id']) + return {'value': res} + #return {'value': {'name': name or product_id.name, 'product_type_id': product_id.product_type_id}} + +sandwich_order_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/sandwich_demo.xml b/addons/sandwich/sandwich_demo.xml new file mode 100644 index 00000000000..adc6a4e6c6f --- /dev/null +++ b/addons/sandwich/sandwich_demo.xml @@ -0,0 +1,81 @@ +<?xml version="1.0"?> +<terp> + <data noupdate="1"> + <record model="sandwich.product.type" id="sandwich"> + <field name="name">sandwich</field> + <field name="description">something to eat</field> + </record> + <record model="sandwich.product.type" id="drink"> + <field name="name">drink</field> + <field name="description">Something to drink</field> + </record> + <record model="sandwich.product.type" id="candy"> + <field name="name">candy</field> + <field name="description">so sweeeeeet, but so bad for your teeth...</field> + </record> + + <record model="sandwich.product" id="club"> + <field name="name">club</field> + <field name="price">2.00</field> + <field name="product_type_id" ref="sandwich"/> + </record> + <record model="sandwich.product" id="chicken_curry"> + <field name="name">chicken-curry</field> + <field name="price">2.00</field> + <field name="product_type_id" ref="sandwich"/> + </record> + <record model="sandwich.product" id="tuna"> + <field name="name">Tuna</field> + <field name="price">2.50</field> + <field name="product_type_id" ref="sandwich"/> + </record> + <record model="sandwich.product" id="cheese"> + <field name="name">cheese</field> + <field name="price">1.50</field> + <field name="product_type_id" ref="sandwich"/> + </record> + + <record model="sandwich.product" id="little_coke"> + <field name="name">Little Coke 0.5l</field> + <field name="price">1.05</field> + <field name="product_type_id" ref="drink"/> + </record> + <record model="sandwich.product" id="coke"> + <field name="name">Coke 1.0l</field> + <field name="price">2.00</field> + <field name="product_type_id" ref="drink"/> + </record> + <record model="sandwich.product" id="big_coke"> + <field name="name">Big Coke 2.0l</field> + <field name="price">3.50</field> + <field name="product_type_id" ref="drink"/> + </record> + <record model="sandwich.product" id="cecemel"> + <field name="name">Cecemel</field> + <field name="price">1.35</field> + <field name="product_type_id" ref="drink"/> + </record> + <record model="sandwich.product" id="water"> + <field name="name">water</field> + <field name="price">0.75</field> + <field name="product_type_id" ref="drink"/> + </record> + + <record model="sandwich.product" id="mars"> + <field name="name">Mars</field> + <field name="price">0.80</field> + <field name="product_type_id" ref="candy"/> + </record> + <record model="sandwich.product" id="snicker"> + <field name="name">Snickers</field> + <field name="price">0.80</field> + <field name="product_type_id" ref="candy"/> + </record> + <record model="sandwich.product" id="twix"> + <field name="name">Twix</field> + <field name="price">1.00</field> + <field name="product_type_id" ref="candy"/> + </record> + + </data> +</terp> diff --git a/addons/sandwich/sandwich_report.xml b/addons/sandwich/sandwich_report.xml new file mode 100644 index 00000000000..2c3d8cbee3a --- /dev/null +++ b/addons/sandwich/sandwich_report.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<terp> + <data> + <report id="sandwich_order_print" + string="Sandwichs order" + model="sandwich.order" + name="sandwich.order.print" + rml="sandwich/report/sandwich_report.rml" + auto="False"/> + </data> +</terp> diff --git a/addons/sandwich/sandwich_view.xml b/addons/sandwich/sandwich_view.xml new file mode 100644 index 00000000000..4aa8390879e --- /dev/null +++ b/addons/sandwich/sandwich_view.xml @@ -0,0 +1,191 @@ +<terp> + <data> + + <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/> + + <record model="ir.ui.view" id="sandwich_product_type_view_form"> + <field name="name">sandwich.product.type</field> + <field name="model">sandwich.product.type</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Product type definition"> + <field name="name" select="1"/> + <field name="description" select="1" /> + </form> + </field> + </record> + <record model="ir.ui.view" id="sandwich_product_type_view_tree"> + <field name="name">sandwich.product.type</field> + <field name="model">sandwich.product.type</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Product type definition"> + <field name="name"/> + <field name="description"/> + </tree> + </field> + </record> + + <record model="ir.actions.act_window" id="action_sandwich_product_type"> + <field name="res_model">sandwich.product.type</field> + <field name="view_type">form</field> + <field name="view_mode">form,tree</field> + <field name="domain">[]</field> + </record> + + <menuitem name="Sandwich" id="menu_tools_sandwich" parent="menu_tools"/> + <menuitem name="Configuration" id="menu_tools_sandwich_configuration" parent="menu_tools_sandwich"/> + <menuitem name="Type of Product" id="menu_tools_sandwich_type_product" parent="menu_tools_sandwich_configuration" action="action_sandwich_product_type"/> + + <record model="ir.ui.view" id="sandwich_product_view_tree"> + <field name="name">sandwich.product</field> + <field name="model">sandwich.product</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Product definition"> + <field name="name"/> + <field name="price"/> + <field name="product_type_id"/> + </tree> + </field> + </record> + <record model="ir.ui.view" id="sandwich_product_view_form"> + <field name="name">sandwich.product</field> + <field name="model">sandwich.product</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Product definition"> + <field name="name" select="1"/> + <field name="price" select="1" /> + <field name="product_type_id" select="1"/> + </form> + </field> + </record> + + <record model="ir.actions.act_window" id="action_sandwich_product"> + <field name="res_model">sandwich.product</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[]</field> + </record> + + <menuitem name="Product" id="menu_tools_sandwich_product" parent="menu_tools_sandwich_configuration" action="action_sandwich_product"/> + + <record model="ir.ui.view" id="sandwich_order_line_view_tree"> + <field name="name">sandwich.order.line.tree</field> + <field name="model">sandwich.order.line</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Product order lines"> + <field name="date"/> + <field name="product_id"/> + <field name="quantity"/> + <field name="user_id" /> + <field name="name"/> + </tree> + </field> + </record> + <record model="ir.ui.view" id="sandwich_order_line_view_form"> + <field name="name">sandwich.order.line.form</field> + <field name="model">sandwich.order.line</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Product order lines"> + <field name="product_type_id" select="1" on_change="onchange_user_id(user_id,product_type_id)"/> + <field name="user_id" select="1" on_change="onchange_user_id(user_id,product_type_id)"/> + <field name="product_id" select="1" onchange="onchange_product_id(product_id)" domain="[('product_type_id','=',product_type_id)]"/> + <field name="quantity" select="1"/> + <field name="name" select="1"/> + <field name="date" select="1"/> + </form> + </field> + </record> + + <record model="ir.actions.act_window" id="action_sandwich_order_line"> + <field name="res_model">sandwich.order.line</field> + <field name="view_type">form</field> + <field name="domain">[]</field> + <field name="view_id" ref="sandwich_order_line_view_form"/> + </record> + + <menuitem name="Order Lines" id="menu_tools_sandwich_orderlines" parent="menu_tools_sandwich" action="action_sandwich_order_line"/> + + <record model="ir.actions.act_window" id="action_sandwich_my_order_line"> + <field name="name">My order lines</field> + <field name="res_model">sandwich.order.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('user_id','=',uid)]</field> + </record> + + <menuitem name="My Order Lines" id="menu_tools_sandwich_my_orderlines" parent="menu_tools_sandwich_orderlines" action="action_sandwich_my_order_line"/> + + <record model="ir.actions.act_window" id="action_sandwich_my_order_line_of_the_day"> + <field name="name">My order lines of the day</field> + <field name="res_model">sandwich.order.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('user_id','=',uid),('date','=',time.strftime('%Y-%m-%d'))]</field> + </record> + + <menuitem name="My Order Lines of the Day" id="menu_tools_sandwich_my_orderlines_day" parent="menu_tools_sandwich_my_orderlines" action="action_sandwich_my_order_line_of_the_day"/> + + <record model="ir.actions.act_window" id="action_sandwich_order_line_of_the_day"> + <field name="name">Order lines of the day</field> + <field name="res_model">sandwich.order.line</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field> + </record> + + <menuitem name="Order Lines of the Day" id="menu_tools_sandwich_orderlines_day" parent="menu_tools_sandwich_orderlines" action="action_sandwich_order_line_of_the_day"/> + + <record model="ir.ui.view" id="sandwich_order_view_tree"> + <field name="name">sandwich.order.tree</field> + <field name="model">sandwich.order</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Ordering of this day sandwich"> + <field name="order_lines"/> + <field name="name"/> + <field name="note"/> + <field name="partner"/> + </tree> + </field> + </record> + <record model="ir.ui.view" id="sandwich_order_view_form"> + <field name="name">sandwich.order.form</field> + <field name="model">sandwich.order</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Ordering of this day sandwich"> + <notebook> + <page string="Sandwich Order"> + <separator string="Informations" colspan="4"/> + <field name="name" colspan="4" select="1"/> + <field name="partner" select="1"/> + <field name="date" select="1"/> + <separator string="Order lines" colspan="4"/> + <field name="order_lines" colspan="4"/> + </page> + <page string="notes"> + <field name="note" colspan="4" nolabel="1" select="1"/> + </page> + </notebook> + </form> + </field> + </record> + <record model="ir.actions.act_window" id="action_sandwich_order"> + <field name="name">Today's orders</field> + <field name="res_model">sandwich.order</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="view_id" eval="False"/> + <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field> + </record> + + <menuitem name="Today's Orders" id="menu_tools_sandwich_today_order" parent="menu_tools_sandwich" action="action_sandwich_order"/> + + </data> +</terp> + diff --git a/addons/sandwich/sandwich_wizard.xml b/addons/sandwich/sandwich_wizard.xml new file mode 100644 index 00000000000..e325c784921 --- /dev/null +++ b/addons/sandwich/sandwich_wizard.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<terp> + <data> + <wizard string="Reload / Complete order" id="sandwich_order_wizard" model="sandwich.order" name="sandwich.order.wizard"/> + <wizard string="Send remind request" id="sandwich_order_recall_wizard" model="sandwich.order" name="sandwich.order.recall.wizard"/> + + <record model="ir.actions.wizard" id="wiz_sandwich_create"> + <field name="name">Create Order of the day</field> + <field name="wiz_name">sandwich.order_create</field> + </record> + + <menuitem name="Create Order" id="menu_tools_sandwich_createorder" parent="menu_tools_sandwich" action="wiz_sandwich_create" type="wizard"/> + + </data> +</terp> + diff --git a/addons/sandwich/wizard/__init__.py b/addons/sandwich/wizard/__init__.py new file mode 100644 index 00000000000..c26cfc23f4e --- /dev/null +++ b/addons/sandwich/wizard/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 sandwich_wizard +import order_create +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/wizard/order_create.py b/addons/sandwich/wizard/order_create.py new file mode 100644 index 00000000000..744553938fa --- /dev/null +++ b/addons/sandwich/wizard/order_create.py @@ -0,0 +1,83 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id: makesale.py 1183 2005-08-23 07:43:32Z pinky $ +# +# 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. +# +############################################################################## + +from mx.DateTime import now + +import wizard +import netsvc +import ir +import pooler + +sale_form = """<?xml version="1.0"?> +<form string="Make an order"> + <field name="name" required="True" /> + <field name="partner_id" required="True" /> +</form>""" + +sale_fields = { + 'name' : {'string' : 'Order name', 'type': 'char'}, + 'partner_id' : {'string':'Suplier', 'relation':'res.partner', 'type':'many2one'}, +} + +class make_sale(wizard.interface): + def _makeOrder(self, cr, uid, data, context): + order = pooler.get_pool(cr.dbname).get('sandwich.order') + line = pooler.get_pool(cr.dbname).get('sandwich.order.line') + oid = order.create(cr, uid, { + 'name': data['form']['name'], + 'partner': data['form']['partner_id'], + }) + name=data['form']['name'] + cr.execute('update sandwich_order_line set order_id=%d where order_id is null', (oid,)) + value = { + 'domain': "[('id','in',["+str(oid)+"])]", + 'name': "Create Sandwich Orders:"+name, + 'view_type': 'form', + 'view_mode': 'form,tree', + 'res_model': 'sandwich.order', + 'view_id': False, + 'type': 'ir.actions.act_window', + 'res_id': oid + } + return value + + states = { + 'init' : { + 'actions' : [], + 'result' : {'type' : 'form', 'arch' : sale_form, 'fields' : sale_fields, 'state' : [('end', 'Cancel'),('order', 'Make an order')]} + }, + 'order' : { + 'actions': [], + 'result': {'type': 'action', 'action': _makeOrder, 'state':'end'}, + } + } +make_sale('sandwich.order_create') +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/sandwich/wizard/sandwich_wizard.py b/addons/sandwich/wizard/sandwich_wizard.py new file mode 100644 index 00000000000..21be195546f --- /dev/null +++ b/addons/sandwich/wizard/sandwich_wizard.py @@ -0,0 +1,131 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 wizard +import pooler + +# +# This class fill in the order with kind of automatically generated order lines, based on the last order for a user concerning a type of product +# +class sandwich_order_wizard(wizard.interface): + + def _sandwich_order_wizard_order(self, cr, uid, data, context): + if not len(data['ids']): + return {} + cr.execute('update sandwich_order_line set order_id=%d where order_id is null', (data['ids'][0],)) + for order in pooler.get_pool(cr.dbname).get('sandwich.order').browse(cr, uid, data['ids']): + for user_id in data['form']['user_id'][0][2]: + for producttype in data['form']['product_type_id'][0][2]: + if not pooler.get_pool(cr.dbname).get('sandwich.order.line').search(cr, uid, [('user_id','=',user_id),('product_type_id','=',producttype),('order_id','=',order.id)]): + vals = { + 'user_id': user_id, + 'order_id': order.id, + 'date': order.date, + 'product_type_id': producttype + } + vals.update( pooler.get_pool(cr.dbname).get('sandwich.order.line').onchange_user_id(cr, uid, uid, user_id, producttype)['value'] ) + pooler.get_pool(cr.dbname).get('sandwich.order.line').create(cr, uid, vals) + return {} + + _sandwich_order_wizard_form = '''<?xml version="1.0"?> + <form string="Complete order"> + <separator string="Set orders for the day" colspan="4"/> + <field name="user_id"/> + <field name="product_type_id"/> + </form> ''' + + _sandwich_order_wizard_fields = { + 'user_id': {'string': 'User', 'type': 'many2many','relation':'res.users'}, + 'product_type_id': {'string': 'Product', 'type': 'many2many', 'relation':'sandwich.product.type'}, + } + + states = { + 'init': { + 'actions': [], + 'result': {'type': 'form', 'arch':_sandwich_order_wizard_form, 'fields':_sandwich_order_wizard_fields, 'state':[('end','Cancel'),('complete','Complete order')]} + }, + 'complete': { + 'actions': [_sandwich_order_wizard_order], + 'result': {'type': 'state', 'state': 'end'} + } + } + +sandwich_order_wizard('sandwich.order.wizard') + +# +# This class send a request message to users who don't have their order filled in for this day +# +class sandwich_order_recall_wizard(wizard.interface): + def _sandwich_order_recall_wizard_send(self, cr, uid, data, context): + for user_id in data['form']['user_id'][0][2]: + if not pooler.get_pool(cr.dbname).get('sandwich.order.line').search(cr, uid, [('user_id','=',user_id),('order_id','=',data['id'])]): + request = pooler.get_pool(cr.dbname).get('res.request') + request.create(cr, uid, { + 'name' : "Please order your lunch of the day", + 'priority' : '0', + 'state' : 'active', + 'body' : """Hello, + +It seems like you have forgotten to order your sandwich (or meal). +As it will be ordered soon, it seems to be a rather nice idea to complete your +order for today ASAP. If you do not, you'll probably get the same meal as yesterday... + +Thanks, + +-- +Tiny ERP +""", + 'act_from' : uid, + 'act_to' : user_id, + }) + return {} + + _sandwich_order_recall_wizard_form = '''<?xml version="1.0"?> + <form string="Recall orders to users"> + <separator string="List of user to remind the order" colspan="4"/> + <field name="user_id" colspan="4"/> + </form>''' + + _sandwich_order_recall_wizard_fields = { + 'user_id': {'string': 'Baaaad users !', 'type': 'many2many', 'relation': 'res.users'}, + } + + states = { + 'init' : { + 'actions' : [], + 'result' : {'type': 'form', 'arch': _sandwich_order_recall_wizard_form, 'fields': _sandwich_order_recall_wizard_fields, 'state': [('end','Cancel'),('send','Send')]}, + }, + 'send' : { + 'actions' : [_sandwich_order_recall_wizard_send], + 'result' : {'type': 'state', 'state': 'end'}, + } + } + +sandwich_order_recall_wizard('sandwich.order.recall.wizard') +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/scrum/i18n/fr_FR.po b/addons/scrum/i18n/fr_FR.po index 2a8a4f6b862..fbb5bec2116 100644 --- a/addons/scrum/i18n/fr_FR.po +++ b/addons/scrum/i18n/fr_FR.po @@ -4,305 +4,330 @@ # 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-14 07: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-14 10:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: scrum +#: field:scrum.project,members:0 +msgid "Project members" +msgstr "Membres du projet" + +#. module: scrum +#: field:scrum.task,effective_hours:0 +msgid "Eff. Hours" +msgstr "Heures Eff." #. module: scrum #: view:scrum.product.backlog:0 msgid "Scrum Product backlog" -msgstr "" +msgstr "Retard du Produit Scrum" #. module: scrum #: field:scrum.meeting,name:0 msgid "Meeting Name" -msgstr "" +msgstr "Nom du Rendez-vous" + +#. module: scrum +#: field:scrum.project,warn_customer:0 +msgid "Warn customer" +msgstr "Avertir le client" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_view_task4 #: model:ir.ui.menu,name:scrum.menu_action_view_task4 msgid "My tasks" -msgstr "" +msgstr "Mes Tâches" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6 msgid "My opened sprints (Product Owner)" -msgstr "" +msgstr "Mes Sprints Ouverts (Directeur de Produit)" #. module: scrum #: field:scrum.project,progress_rate:0 +#: field:scrum.task,progress_rate:0 msgid "Progress" -msgstr "" +msgstr "Progression" #. module: scrum #: field:scrum.project,child_id:0 msgid "Subproject" -msgstr "" +msgstr "Sous-projet" #. module: scrum #: view:scrum.meeting:0 msgid "What have you accomplished since yesterday ?" -msgstr "" +msgstr "Qu'avez vous accompli depuis hier ?" #. module: scrum #: view:scrum.meeting:0 msgid "Are your Sprint Backlog estimate accurate ?" -msgstr "" +msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?" #. module: scrum -#: field:scrum.project,members:0 -msgid "Project Members" -msgstr "" +#: field:scrum.task,history:0 +msgid "Task Details" +msgstr "Détails de la tâche" #. module: scrum #: view:scrum.project:0 msgid "Scrum Projects" -msgstr "" +msgstr "Projets Scrum" #. module: scrum -#: field:scrum.project,warn_customer:0 -msgid "Warn Partner" -msgstr "" +#: field:scrum.project,tax_ids:0 +msgid "Applicable taxes" +msgstr "Taxes applicables" #. module: scrum -#: field:scrum.task,progress:0 -msgid "Progress (%)" -msgstr "" +#: field:scrum.task,child_ids:0 +msgid "Delegated Tasks" +msgstr "Tâches déléguées" #. module: scrum #: field:scrum.task,priority:0 msgid "Importance" -msgstr "" +msgstr "Importance" #. module: scrum #: model:ir.model,name:scrum.model_scrum_task msgid "Scrum Task" -msgstr "" +msgstr "Tâche Scrum" + +#. module: scrum +#: field:scrum.project,tariff:0 +msgid "Sales price" +msgstr "Prix des ventes" #. module: scrum #: model:ir.actions.act_window,name:scrum.dblc_proj msgid "View project's backlog" -msgstr "" +msgstr "Voir le Retard du Projet" #. module: scrum #: selection:scrum.task,priority:0 #: selection:scrum.product.backlog,priority:0 msgid "Very urgent" -msgstr "" +msgstr "Très urgent" + +#. module: scrum +#: field:scrum.task,start_sequence:0 +msgid "Wait for previous sequences" +msgstr "Attendre une étape précédente" #. module: scrum #: field:scrum.sprint,retrospective:0 msgid "Sprint Retrospective" -msgstr "" +msgstr "Retrospective du Sprint" #. module: scrum #: field:scrum.sprint,name:0 msgid "Sprint Name" -msgstr "" +msgstr "Nom du Sprint" #. module: scrum #: field:scrum.project,notes:0 #: field:scrum.task,notes:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: scrum #: model:ir.model,name:scrum.model_scrum_product_backlog #: field:scrum.task,product_backlog_id:0 msgid "Product Backlog" -msgstr "" +msgstr "Retard du Produit" #. module: scrum #: field:scrum.task,project_id:0 #: field:scrum.sprint,project_id:0 msgid "Project" -msgstr "" - -#. module: scrum -#: help:scrum.project,warn_manager:0 -msgid "If you check this field, the project manager will receive a request each time a task is completed by his team." -msgstr "" +msgstr "Projet" #. module: scrum #: selection:scrum.project,state:0 #: selection:scrum.task,state:0 msgid "Cancelled" -msgstr "" +msgstr "Annulé" #. module: scrum #: field:scrum.team,name:0 msgid "Team Name" -msgstr "" +msgstr "Nom de l'équipe" #. module: scrum #: field:scrum.project,warn_footer:0 msgid "Mail footer" -msgstr "" +msgstr "Pied de page du message" #. module: scrum #: field:scrum.project,sprint_size:0 msgid "Sprint Days" -msgstr "" +msgstr "Jours du Sprint" #. module: scrum #: field:scrum.sprint,date_stop:0 msgid "Ending Date" -msgstr "" +msgstr "Date de fin" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_task_open msgid "View sprint Tasks" -msgstr "" +msgstr "Voir les Tâches du Sprint" + +#. module: scrum +#: field:scrum.task,invoice_id:0 +msgid "Generated Invoice" +msgstr "Générer une facture" #. module: scrum #: field:scrum.project,category_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Compte analytique" #. module: scrum -#: model:ir.actions.act_window,name:scrum.action_view_task -#: model:ir.ui.menu,name:scrum.menu_action_view_task -msgid "All Tasks" -msgstr "Toutes les tâches" +#: field:scrum.project,mode:0 +msgid "Price setting mode" +msgstr "Mode de calcul du prix" #. module: scrum #: field:scrum.task,date_deadline:0 msgid "Deadline" -msgstr "" +msgstr "Date limite" #. module: scrum -#: field:scrum.project,partner_id:0 -#: field:scrum.task,partner_id:0 -msgid "Partner" -msgstr "" +#: field:scrum.project,warn_manager:0 +msgid "Warn manager" +msgstr "Prévenir le responsable" #. module: scrum -#: field:scrum.task,planned_hours:0 #: field:scrum.product.backlog,planned_hours:0 #: field:scrum.sprint,planned_hours:0 msgid "Planned Hours" -msgstr "" +msgstr "Heures planifiés" + +#. module: scrum +#: field:scrum.project,name:0 +msgid "Project name" +msgstr "Nom du projet" #. module: scrum #: field:scrum.product.backlog,priority:0 msgid "Priority" -msgstr "" +msgstr "Priorité" #. module: scrum #: view:scrum.sprint:0 msgid "State" -msgstr "" - -#. module: scrum -#: help:scrum.project,progress_rate:0 -msgid "Percent of tasks closed according to the total of tasks todo." -msgstr "" +msgstr "État" #. module: scrum #: field:scrum.sprint,meetings_id:0 msgid "Daily Scrum" -msgstr "" +msgstr "Scrum Journalier" #. module: scrum #: field:scrum.task,type:0 msgid "Type" -msgstr "" +msgstr "Type" #. module: scrum #: field:scrum.sprint,scrum_master_id:0 msgid "Scrum Master" -msgstr "" +msgstr "Scrum Master" #. module: scrum #: selection:scrum.task,priority:0 #: selection:scrum.product.backlog,priority:0 msgid "Medium" -msgstr "" +msgstr "Moyenne" #. module: scrum #: model:ir.ui.menu,name:scrum.next_id_67 msgid "Scrum" -msgstr "" +msgstr "Scrum" + +#. module: scrum +#: model:ir.actions.act_window,name:scrum.action_view_task +#: model:ir.ui.menu,name:scrum.menu_action_view_task +msgid "All Tasks" +msgstr "Toutes les tâches" #. module: scrum #: field:scrum.meeting,question_today:0 msgid "Tasks for today" -msgstr "" +msgstr "Tâches pour aujourd'hui" #. module: scrum #: field:scrum.meeting,question_yesterday:0 msgid "Tasks since yesterday" -msgstr "" +msgstr "Tâches depuis hier" + +#. module: scrum +#: field:scrum.project,pricelist_id:0 +msgid "Pricelist" +msgstr "Liste de prix" #. module: scrum #: field:scrum.project,warn_header:0 msgid "Mail header" -msgstr "" +msgstr "Entête du message" #. module: scrum -#: field:scrum.project,date_start:0 #: field:scrum.sprint,date_start:0 msgid "Starting Date" -msgstr "" +msgstr "Date de début" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_scrum_project_tree #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree msgid "Projects" -msgstr "" +msgstr "Projets" #. module: scrum #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: scrum -#: field:scrum.task,history:0 -msgid "Task Details" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: scrum #: model:ir.actions.act_window,name:scrum.dblc_proj2 msgid "View project's tasks" -msgstr "" - -#. module: scrum -#: field:scrum.task,delay_hours:0 -msgid "Delay Hours" -msgstr "" +msgstr "Voir les tâches du projet" #. module: scrum #: field:scrum.project,contact_id:0 msgid "Contact" -msgstr "" +msgstr "Contact" #. module: scrum #: field:scrum.project,tasks:0 +#: view:scrum.task:0 msgid "Scrum Tasks" -msgstr "" +msgstr "Tâches Scrum" #. module: scrum #: field:scrum.meeting,date:0 msgid "Meeting Date" -msgstr "" +msgstr "Date du rendez-vous" #. module: scrum #: view:scrum.product.backlog:0 msgid "Tasks" -msgstr "" +msgstr "Tâches" #. module: scrum -#: field:scrum.task,child_ids:0 -msgid "Delegated Tasks" -msgstr "" +#: view:scrum.sprint:0 +msgid "Retrospective" +msgstr "Rétrospective" #. module: scrum #: wizard_view:scrum.product.backlog.task.create,init:0 @@ -317,15 +342,15 @@ msgid "Is Scrum" msgstr "" #. module: scrum -#: selection:scrum.task,priority:0 -#: selection:scrum.product.backlog,priority:0 -msgid "Urgent" -msgstr "" +#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft +#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft +msgid "Draft Backlogs" +msgstr "Retards Brouillon" #. module: scrum #: field:scrum.sprint,backlog_ids:0 msgid "Sprint Backlog" -msgstr "" +msgstr "Retard du Sprint" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_view_task6 @@ -336,70 +361,75 @@ msgstr "Tâches ouvertes" #. module: scrum #: field:scrum.meeting,question_blocks:0 msgid "Blocks encountered" -msgstr "" +msgstr "Blocages rencontrés" #. module: scrum #: view:scrum.meeting:0 msgid "Optionnal Info" -msgstr "" +msgstr "Info optionelle" + +#. module: scrum +#: field:scrum.task,billable:0 +msgid "To be invoiced" +msgstr "A facturer" #. module: scrum #: model:ir.model,name:scrum.model_scrum_sprint #: view:scrum.meeting:0 #: view:scrum.sprint:0 msgid "Scrum Sprint" -msgstr "" +msgstr "Sprint Scrum" #. module: scrum #: view:scrum.sprint:0 msgid "Review" -msgstr "" +msgstr "Critique" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7 msgid "My opened sprints (Scrum Master)" -msgstr "" +msgstr "Mes Sprints Ouverts (Maître Scrum)" + +#. module: scrum +#: selection:scrum.project,mode:0 +msgid "By Task" +msgstr "Par tâche" #. module: scrum #: field:scrum.product.backlog,note:0 msgid "Note" -msgstr "" +msgstr "Note" #. module: scrum #: selection:scrum.task,state:0 #: selection:scrum.product.backlog,state:0 #: selection:scrum.sprint,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: scrum #: selection:scrum.task,priority:0 #: selection:scrum.product.backlog,priority:0 msgid "Low" -msgstr "" +msgstr "Faible" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_view_task5 #: model:ir.ui.menu,name:scrum.menu_tasks_yours msgid "My opened tasks" -msgstr "" - -#. module: scrum -#: field:scrum.project,manager:0 -msgid "Project Manager" -msgstr "" +msgstr "Mes Tâches Ouvertes" #. module: scrum #: selection:scrum.project,state:0 #: selection:scrum.task,state:0 msgid "Pending" -msgstr "" +msgstr "En attente" #. module: scrum #: view:scrum.meeting:0 msgid "Is there anything blocking you ?" -msgstr "" +msgstr "Est-ce que quelque chose vous bloque ?" #. module: scrum #: field:scrum.project,state:0 @@ -407,51 +437,53 @@ msgstr "" #: field:scrum.product.backlog,state:0 #: field:scrum.sprint,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree msgid "Opened Sprints" -msgstr "" +msgstr "Sprints Ouverts" #. module: scrum -#: field:scrum.project,name:0 -msgid "Project Name" +#: model:ir.ui.menu,name:scrum.menu_action_meeting_form +msgid "scrum.meeting.form" msgstr "" #. module: scrum #: field:scrum.project,product_owner_id:0 #: field:scrum.sprint,product_owner_id:0 msgid "Product Owner" -msgstr "" +msgstr "Directeur de Produit" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5 msgid "My Sprints (Scrum Master)" -msgstr "" +msgstr "Mes Sprints (Maître Scrum)" #. module: scrum #: view:scrum.product.backlog:0 msgid "Product backlog" -msgstr "" +msgstr "Retard du Produit" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_product_backlog_form #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form msgid "Backlogs" -msgstr "" +msgstr "Retards" #. module: scrum #: field:scrum.product.backlog,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: scrum -#: field:scrum.task,date_start:0 -msgid "Date" -msgstr "" +#: field:scrum.project,active:0 +#: field:scrum.task,active:0 +#: field:scrum.product.backlog,active:0 +msgid "Active" +msgstr "Actif" #. module: scrum #: field:scrum.task,timebox_id:0 @@ -462,50 +494,54 @@ msgstr "" #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2 msgid "Draft Sprints" -msgstr "" +msgstr "Sprints Brouillon" #. module: scrum -#: field:scrum.task,parent_id:0 -msgid "Parent Task" -msgstr "" +#: field:scrum.product.backlog,name:0 +msgid "Feature" +msgstr "Fonctionnalité" #. module: scrum -#: field:scrum.project,active:0 -#: field:scrum.task,active:0 -#: field:scrum.product.backlog,active:0 -msgid "Active" -msgstr "" +#: selection:scrum.task,priority:0 +#: selection:scrum.product.backlog,priority:0 +msgid "Urgent" +msgstr "Urgent" + +#. module: scrum +#: field:scrum.task,date_start:0 +msgid "Date" +msgstr "Date" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open msgid "View sprint backlog" -msgstr "" +msgstr "Voir les retards du sprint" #. module: scrum #: field:scrum.task,date_close:0 msgid "Date Closed" -msgstr "" +msgstr "Date de fin" #. module: scrum #: field:scrum.task,user_id:0 msgid "Assigned to" -msgstr "" +msgstr "Assigné à" #. module: scrum #: field:scrum.meeting,question_backlog:0 msgid "Backlog Accurate" -msgstr "" +msgstr "Retard Correct" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4 msgid "My Sprints (Product Owner)" -msgstr "" +msgstr "Mes Sprints (Directeur de Produit)" #. module: scrum #: field:scrum.task,name:0 msgid "Task summary" -msgstr "" +msgstr "Résumé de la tâche" #. module: scrum #: selection:scrum.project,state:0 @@ -513,7 +549,7 @@ msgstr "" #: selection:scrum.product.backlog,state:0 #: selection:scrum.sprint,state:0 msgid "Done" -msgstr "" +msgstr "Terminé" #. module: scrum #: wizard_button:scrum.product.backlog.task.create,init,end:0 @@ -521,17 +557,12 @@ msgid "Cancel" msgstr "Annuler" #. module: scrum -#: help:scrum.project,category_id:0 -msgid "Link this project to an analytic account if you need financial management on projects. It ables to connect projects with budgets, plannings, costs and revenues analysis, timesheet on projects, etc." -msgstr "" - -#. module: scrum #: selection:scrum.project,state:0 #: selection:scrum.task,state:0 #: selection:scrum.product.backlog,state:0 #: selection:scrum.sprint,state:0 msgid "Open" -msgstr "" +msgstr "Ouvert" #. module: scrum #: field:scrum.product.backlog,effective_hours:0 @@ -539,182 +570,182 @@ msgstr "" #: view:scrum.product.backlog:0 #: view:scrum.project:0 #: view:scrum.sprint:0 +#: view:scrum.task:0 msgid "Effective hours" -msgstr "" - -#. module: scrum -#: field:scrum.project,warn_manager:0 -msgid "Warn Manager" -msgstr "" +msgstr "Heures effectives" #. module: scrum #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: scrum -#: field:scrum.task,remaining_hours:0 -msgid "Remaining Hours" +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: scrum -#: field:scrum.project,timesheet_id:0 -msgid "Working Time" -msgstr "" +#: field:scrum.task,parent_id:0 +msgid "Parent Task" +msgstr "Tâche parente" #. module: scrum -#: field:scrum.product.backlog,name:0 -msgid "Feature" -msgstr "" +#: field:scrum.project,date_start:0 +msgid "Project started on" +msgstr "Projet démarré le" #. module: scrum #: selection:scrum.task,priority:0 #: selection:scrum.product.backlog,priority:0 msgid "Very Low" -msgstr "" +msgstr "Très basse" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3 msgid "Sprints Done" -msgstr "" +msgstr "Sprints Terminés" + +#. module: scrum +#: field:scrum.project,timesheet_id:0 +msgid "Working hours" +msgstr "Heures travaillées" #. module: scrum #: field:scrum.project,planned_hours:0 #: view:scrum.product.backlog:0 #: view:scrum.project:0 #: view:scrum.sprint:0 +#: view:scrum.task:0 msgid "Planned hours" -msgstr "" +msgstr "Heures planifiées" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_scrum_project_form #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form msgid "Edit Projects" -msgstr "" +msgstr "Éditer les Projets" #. module: scrum #: model:ir.model,name:scrum.model_scrum_meeting -#: model:ir.ui.menu,name:scrum.menu_action_meeting_form #: view:scrum.meeting:0 msgid "Scrum Meeting" -msgstr "" +msgstr "Rendez-vous Scrum" #. module: scrum #: field:scrum.task,description:0 msgid "Description" -msgstr "" +msgstr "Description" #. module: scrum -#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft -#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft -msgid "Draft Backlogs" -msgstr "" +#: field:scrum.project,date_end:0 +msgid "Project should end on" +msgstr "Date de fin de projet" #. module: scrum #: view:scrum.sprint:0 msgid "Daily Meetings" -msgstr "" +msgstr "Rendez-vous Journaliers" #. module: scrum #: field:scrum.task,work_ids:0 msgid "Work done" -msgstr "" +msgstr "Travail effectué" #. module: scrum #: view:scrum.meeting:0 msgid "What are you working on today ?" -msgstr "" +msgstr "Sur quoi travaillez vous aujourd'hui ?" #. module: scrum #: field:scrum.project,effective_hours:0 msgid "Hours spent" -msgstr "" +msgstr "Heures travaillées" #. module: scrum +#: field:scrum.task,progress:0 #: field:scrum.product.backlog,progress:0 #: field:scrum.sprint,progress:0 msgid "Progress (0-100)" -msgstr "" +msgstr "Avancement (0-100)" #. module: scrum #: model:ir.model,name:scrum.model_scrum_team msgid "Scrum Team" -msgstr "" +msgstr "Équipe Scrum" #. module: scrum #: model:ir.model,name:scrum.model_scrum_project #: field:scrum.product.backlog,project_id:0 msgid "Scrum Project" -msgstr "" +msgstr "Projet Scrum" #. module: scrum #: field:scrum.project,parent_id:0 msgid "Parent project" -msgstr "" +msgstr "Project Parent" #. module: scrum #: view:scrum.sprint:0 msgid "Sprint Info" -msgstr "" +msgstr "Info sur le Sprint" #. module: scrum -#: view:scrum.project:0 -msgid "Scrum Data" -msgstr "" +#: field:scrum.project,partner_id:0 +#: field:scrum.task,partner_id:0 +msgid "Customer" +msgstr "Client" #. module: scrum -#: field:scrum.product.backlog,tasks_id:0 -msgid "Tasks Details" -msgstr "" +#: field:scrum.task,planned_hours:0 +msgid "Plan. hours" +msgstr "Heures Plan." #. module: scrum -#: view:scrum.sprint:0 -msgid "Retrospective" -msgstr "" +#: field:scrum.product.backlog,tasks_id:0 +msgid "Tasks Details" +msgstr "Détails des Tâches" #. module: scrum -#: field:scrum.task,effective_hours:0 -msgid "Hours Spent" -msgstr "" +#: selection:scrum.project,mode:0 +msgid "By Effective Hour" +msgstr "Par Heure Effective" #. module: scrum #: field:scrum.task,context_id:0 msgid "Context" -msgstr "" +msgstr "Contexte" #. module: scrum -#: field:scrum.task,total_hours:0 -msgid "Total Hours" -msgstr "" +#: selection:scrum.project,mode:0 +msgid "By Hour" +msgstr "Par Heure" #. module: scrum #: field:scrum.team,users_id:0 msgid "Users" -msgstr "" +msgstr "Utilisateurs" #. module: scrum #: field:scrum.project,priority:0 #: field:scrum.task,sequence:0 #: field:scrum.product.backlog,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Séquence" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open msgid "Opened Backlogs" -msgstr "" +msgstr "Retards Ouverts" #. module: scrum #: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task msgid "Created tasks" -msgstr "" +msgstr "Tâches Créées" #. module: scrum -#: constraint:scrum.project:0 -msgid "Error ! You can not create recursive projects." -msgstr "" +#: field:scrum.sprint,review:0 +msgid "Sprint Review" +msgstr "Critique du Sprint" #. module: scrum #: wizard_field:scrum.product.backlog.task.create,init,user_id:0 @@ -727,15 +758,9 @@ msgstr "Attribué à" #: field:scrum.product.backlog,sprint_id:0 #: model:ir.ui.menu,name:scrum.menu_action_sprint_form msgid "Sprint" -msgstr "" - -#. module: scrum -#: field:scrum.project,date_end:0 -msgid "Expected End" -msgstr "" +msgstr "Sprint" #. module: scrum -#: field:scrum.sprint,review:0 -msgid "Sprint Review" -msgstr "" - +#: field:scrum.project,manager:0 +msgid "Project manager" +msgstr "Gestionnaire de projet" diff --git a/addons/scrum/security/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv index b51dccdc51a..2c139b10b26 100644 --- a/addons/scrum/security/ir.model.access.csv +++ b/addons/scrum/security/ir.model.access.csv @@ -1,9 +1,11 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_scrum_team,scrum.team,model_scrum_team,project.group_project_user,1,1,1,1 -access_scrum_project,scrum.project,model_scrum_project,project.group_project_user,1,1,1,1 -access_scrum_sprint,scrum.sprint,model_scrum_sprint,project.group_project_user,1,,, -access_scrum_product_backlog,scrum.product.backlog,model_scrum_product_backlog,project.group_project_user,1,1,1,1 -access_scrum_task,scrum.task,model_scrum_task,project.group_project_user,1,1,1,1 -access_scrum_meeting,scrum.meeting,model_scrum_meeting,project.group_project_user,1,,, -access_scrum_meeting_manager,scrum.meeting.manager,model_scrum_meeting,project.group_project_manager,1,1,1,1 -access_scrum_sprint_manager,scrum.sprint.manager,model_scrum_sprint,project.group_project_manager,1,1,1,1 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_scrum_team","scrum.team","model_scrum_team","project.group_project_user",1,1,1,1 +"access_scrum_project","scrum.project","model_scrum_project","project.group_project_user",1,1,1,1 +"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,,, +"access_scrum_product_backlog","scrum.product.backlog","model_scrum_product_backlog","project.group_project_user",1,1,1,1 +"access_scrum_task","scrum.task","model_scrum_task","project.group_project_user",1,1,1,1 +"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,,, +"access_scrum_meeting_manager","scrum.meeting.manager","model_scrum_meeting","project.group_project_manager",1,1,1,1 +"access_scrum_sprint_manager","scrum.sprint.manager","model_scrum_sprint","project.group_project_manager",1,1,1,1 +"access_scrum_product_backlog_manager","scrum.product.backlog manager","model_scrum_product_backlog","project.group_project_manager",1,1,1,1 +"access_scrum_project_manager","scrum.project manager","model_scrum_project","project.group_project_manager",1,1,1,1 diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py index e80312a2097..fbcb5e32b6b 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -36,8 +36,6 @@ "init_xml" : [], "demo_xml" : ["stock_demo.xml"], "update_xml" : [ - "security/stock_security.xml", - "security/ir.model.access.csv", "stock_workflow.xml", "stock_data.xml", "stock_incoterms.xml", @@ -49,6 +47,8 @@ "product_view.xml", "partner_view.xml", "report_stock_view.xml", + "security/stock_security.xml", + "security/ir.model.access.csv", ], "active": False, "installable": True diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po index ac591482480..48bb559286d 100644 --- a/addons/stock/i18n/fr_FR.po +++ b/addons/stock/i18n/fr_FR.po @@ -1,24 +1,26 @@ -# Translation of OpenERP Server. -# This file containt the translation of the following modules: -# * stock +# French translation for openobject-addons +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. # 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: " - -#. module: stock -#: rml:stock.picking.list:0 +"Project-Id-Version: OpenERP Server 4.3.0\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2008-09-05 13:21+0000\n" +"PO-Revision-Date: 2008-10-14 09:37+0000\n" +"Last-Translator: Olivier Laurent <Unknown>\n" +"Language-Team: French <fr@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 09:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: stock +#: xsl:stock.picking.list:0 msgid "Shipping Address:" -msgstr "" +msgstr "Adresse de livraison" #. module: stock #: field:stock.production.lot.revision,author_id:0 @@ -33,69 +35,54 @@ msgstr "LIFO" #. module: stock #: selection:stock.picking,move_type:0 msgid "All at once" -msgstr "Tout d'un coup" +msgstr "Tout en une fois" #. module: stock #: field:stock.location,chained_location_id:0 msgid "Chained Location If Fixed" -msgstr "" +msgstr "Emplacement Lié si Fixe" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree9 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9 msgid "Draft Internal Packings" -msgstr "" +msgstr "Colisages Internes Brouillons" #. module: stock #: selection:stock.picking,invoice_state:0 msgid "Not from Packing" -msgstr "Pas d'un colisage" - -#. module: stock -#: model:stock.location,name:stock.stock_location_15 -msgid "Sub Products" -msgstr "" - -#. module: stock -#: rml:stock.picking.list:0 -msgid "Concerns" -msgstr "" +msgstr "pas d'un colisage" #. module: stock -#: selection:stock.location,chained_auto_packing:0 -msgid "Manual Operation" -msgstr "" +#: view:stock.location:0 +msgid "Chained Locations" +msgstr "Emplacements Liés" #. module: stock #: selection:stock.picking,invoice_state:0 msgid "Invoiced" -msgstr "Facturé" +msgstr "Facturer" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_root msgid "Stock Management" -msgstr "" - -#. module: stock -#: view:stock.location:0 -msgid "Chained Locations" -msgstr "" +msgstr "Gestion des stocks" #. module: stock #: model:ir.actions.report.xml,name:stock.report_product_history msgid "Future stock forecast" -msgstr "Stocks prévisionnels" +msgstr "Stock Prévisionnel" #. module: stock #: selection:stock.picking,type:0 msgid "Delivery" -msgstr "" +msgstr "Livraison" #. module: stock #: model:ir.actions.act_window,name:stock.action_inventory_line_form #: model:ir.ui.menu,name:stock.menu_action_inventory_line_form msgid "Inventory Lines" -msgstr "" +msgstr "Lignes d'inventaires" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree3 @@ -103,29 +90,24 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_picking_tree3 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8 msgid "Confirmed Packings Waiting Assignation" -msgstr "" +msgstr "Colis Confirmés en attente d'Assignation" #. module: stock #: view:stock.tracking:0 msgid "Tracking/Serial" -msgstr "Num. suivi/série" - -#. module: stock -#: model:stock.location,name:stock.stock_location_workshop -msgid "Workshop" -msgstr "" +msgstr "Tracer N° Série" #. module: stock #: model:ir.actions.act_window,name:stock.action_tracking_form #: model:ir.ui.menu,name:stock.menu_action_tracking_form msgid "Tracking Lots" -msgstr "" +msgstr "Tracer les lots" #. module: stock #: model:ir.actions.act_window,name:stock.action_inventory_form #: model:ir.ui.menu,name:stock.menu_action_inventory_form msgid "Physical Inventory" -msgstr "" +msgstr "Inventaire physique" #. module: stock #: wizard_view:stock.move.track,init:0 @@ -135,23 +117,18 @@ msgstr "Tracer un mouvement" #. module: stock #: view:stock.inventory:0 msgid "Lot Inventory" -msgstr "Inventaire de lot" +msgstr "Inventaire du Lot" #. module: stock #: field:stock.inventory.line,product_uom:0 #: field:stock.move,product_uom:0 msgid "Product UOM" -msgstr "UDM produit" - -#. module: stock -#: rml:stock.picking.list:0 -msgid "Customer Ref." -msgstr "" +msgstr "Unité principale produit" #. module: stock #: model:stock.location,name:stock.stock_location_locations_partner msgid "Partner Locations" -msgstr "" +msgstr "Emplacements partenaire" #. module: stock #: view:stock.picking:0 @@ -161,39 +138,34 @@ msgstr "Valider" #. module: stock #: view:stock.picking:0 msgid "Input Packing List" -msgstr "" +msgstr "Liste des Colisages Entrants" #. module: stock #: view:stock.production.lot.revision:0 msgid "Production Lot Revisions" -msgstr "Révisions du lot de fabrication" +msgstr "Révisions des Lots de Production" #. module: stock #: xsl:stock.location.overview:0 #: xsl:stock.location.overview.all:0 msgid "UoM" -msgstr "UM" - -#. module: stock -#: model:stock.location,name:stock.stock_location_4 -msgid "Maxtor Suppliers" -msgstr "" +msgstr "Unité principale" #. module: stock #: model:ir.actions.wizard,name:stock.return_picking msgid "Return packing" -msgstr "Retour colis" +msgstr "Retourner le Colisage" #. module: stock #: field:product.category,property_stock_journal:0 msgid "Stock journal" -msgstr "Journal de stock" +msgstr "Journal des stocks" #. module: stock -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 #: field:stock.tracking,name:0 msgid "Tracking" -msgstr "Numéro de suivi" +msgstr "Suivi" #. module: stock #: wizard_button:stock.picking.make,init,make:0 @@ -202,15 +174,17 @@ msgid "Ok" msgstr "Ok" #. module: stock -#: help:product.template,property_stock_account_input:0 -msgid "This account will be used, instead of the default one, to value input stock" -msgstr "Ce compte sera utilisé , au lieu de celui par défaut, pour valoriser le stock d'entrée" +#: view:stock.picking:0 +msgid "Cancel Assignation" +msgstr "Annuler assignation" #. module: stock -#, python-format -#: code:addons/stock/stock.py:0 -msgid "UserError" +#: help:product.template,property_stock_account_input:0 +msgid "" +"This account will be used, instead of the default one, to value input stock" msgstr "" +"Ce compte sera utilisé, à la place de celui par défaut, pour valoriser le " +"stock entrant" #. module: stock #: view:stock.tracking:0 @@ -225,26 +199,16 @@ msgid "Notes" msgstr "Notes" #. module: stock -#: field:stock.picking,max_date:0 -msgid "Max. Date" -msgstr "" - -#. module: stock #: field:stock.picking,move_lines:0 #: field:stock.picking.move.wizard,move_ids:0 msgid "Move lines" -msgstr "Mouvements créés" - -#. module: stock -#: model:stock.location,name:stock.stock_location_8 -msgid "Non European Customers" -msgstr "" +msgstr "Lignes de mouvements" #. module: stock #: xsl:stock.location.overview:0 #: xsl:stock.location.overview.all:0 msgid "Value" -msgstr "Montant" +msgstr "Valeur" #. module: stock #: model:ir.actions.report.xml,name:stock.report_picking_list @@ -253,34 +217,29 @@ msgstr "Montant" #: field:stock.picking.move.wizard,picking_id:0 #: view:stock.picking:0 msgid "Packing list" -msgstr "Liste de colisage" - -#. module: stock -#, python-format -#: code:addons/stock/stock.py:0 -#: code:addons/stock/wizard/wizard_track_line.py:0 -msgid "Error!" -msgstr "" +msgstr "Liste des Colisages" #. module: stock #: xsl:stock.location.overview:0 #: xsl:stock.location.overview.all:0 msgid "Amount" -msgstr "Quantité" +msgstr "Montant" #. module: stock #: help:stock.move,prodlot_id:0 msgid "Production lot is used to put a serial number on the production" -msgstr "Le lot de production est utilisée pour mettre un numéro de série sur cette production" +msgstr "" +"Le lot de production est utilisé pour mettre un numéro de série lors de la " +"production" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_location_open msgid "Products" -msgstr "Produit" +msgstr "Produits" #. module: stock -#: model:stock.location,name:stock.stock_location_components -msgid "Components" +#: model:ir.actions.wizard,name:stock.partial_picking +msgid "Partial picking" msgstr "" #. module: stock @@ -296,7 +255,7 @@ msgstr "Méthode de livraison" #. module: stock #: field:stock.location,chained_location_type:0 msgid "Chained Location Type" -msgstr "" +msgstr "Type d'Emplacement Lié" #. module: stock #: field:stock.picking,origin:0 @@ -304,27 +263,17 @@ msgid "Origin" msgstr "Origine" #. module: stock -#: model:ir.actions.wizard,name:stock.partial_picking -msgid "Partial packing" -msgstr "" - -#. module: stock -#: field:stock.picking,min_date:0 -msgid "Min. Date" -msgstr "" +#: model:ir.ui.menu,name:stock.menu_stock_configuration +msgid "Configuration" +msgstr "Configuration" #. module: stock #: help:stock.move,tracking_id:0 msgid "Tracking lot is the code that will be put on the logistic unit/pallet" -msgstr "Le lot de suivi est le code qui sera inscrit sur l'unité logistique/palette" - -#. module: stock -#: model:ir.ui.menu,name:stock.menu_stock_configuration -msgid "Configuration" -msgstr "Configuration" +msgstr "" +"Le lot de suivi est le code qui sera inscrit sur l'unité/pallette logistique" #. module: stock -#: field:stock.picking,name:0 #: field:stock.production.lot,ref:0 #: field:stock.tracking,serial:0 msgid "Reference" @@ -336,20 +285,15 @@ msgid "Stock Move" msgstr "Mouvement de stock" #. module: stock -#: model:stock.location,name:stock.stock_location_3 -msgid "IT Suppliers" -msgstr "" - -#. module: stock #: selection:stock.picking,type:0 msgid "Getting Goods" -msgstr "Réception de marchandises" +msgstr "Réception de marchandise" #. module: stock #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard #: view:stock.picking:0 msgid "Fill From Unreceived Products" -msgstr "" +msgstr "Remplir à partir des Produits Non Reçus" #. module: stock #: selection:stock.picking,type:0 @@ -359,46 +303,51 @@ msgstr "Interne" #. module: stock #: wizard_field:stock.invoice_onshipping,init,group:0 msgid "Group by partner" -msgstr "Groupes par partenaire" +msgstr "Grouper par partenaire" #. module: stock #: field:stock.move,move_dest_id:0 msgid "Dest. Move" -msgstr "Mouvement dest." +msgstr "Emplacement de Dest." #. module: stock #: field:stock.picking,address_id:0 msgid "Partner" -msgstr "Déplacer vers l'adresse" +msgstr "Partenaire" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery #: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery msgid "Delivery Orders" -msgstr "" +msgstr "Ordre de livraisons" #. module: stock #: field:stock.move,move_history_ids:0 #: field:stock.move,move_history_ids2:0 msgid "Move History" -msgstr "Historique mouvement" +msgstr "Historique du mouvement" #. module: stock #: help:res.partner,property_stock_customer:0 -msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner" -msgstr "Cette location de stock va etre utilisée au lieu de celle par défaut" +msgid "" +"This stock location will be used, instead of the default one, as the " +"destination location for goods you send to this partner" +msgstr "" +"Cette emplacement de stock sera utilisée au lieu de celui par défaut en tant " +"que l'emplacement de destination pour les biens que vous envoyez à ce " +"partenaire." #. module: stock #: model:ir.model,name:stock.model_stock_production_lot #: field:stock.move,prodlot_id:0 #: field:stock.production.lot.revision,lot_id:0 msgid "Production lot" -msgstr "Lot de fabrication" +msgstr "Lot de production" #. module: stock -#: model:stock.location,name:stock.stock_location_suppliers -msgid "Suppliers" -msgstr "" +#: field:stock.picking,name:0 +msgid "Packing name" +msgstr "Nom du Colis" #. module: stock #: view:stock.move:0 @@ -407,24 +356,19 @@ msgid "Confirm" msgstr "Confirmer" #. module: stock -#: view:stock.picking:0 -msgid "Invoice Control" -msgstr "" - -#. module: stock #: model:ir.model,name:stock.model_stock_production_lot_revision msgid "Production lot revisions" -msgstr "Révisions du lot de fabrication" +msgstr "Révisions des lots de productions" #. module: stock #: model:stock.location,name:stock.location_inventory msgid "Inventory loss" -msgstr "" +msgstr "Casse" #. module: stock #: selection:stock.location,usage:0 msgid "Internal Location" -msgstr "Emplacement interne\\"" +msgstr "Emplacement interne" #. module: stock #: selection:stock.location,allocation_method:0 @@ -435,7 +379,7 @@ msgstr "FIFO" #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery msgid "Delivery Orders to Process" -msgstr "" +msgstr "Bordereaux de livraison à Traiter" #. module: stock #: field:stock.move,priority:0 @@ -443,29 +387,26 @@ msgid "Priority" msgstr "Priorité" #. module: stock -#: selection:stock.move,state:0 -msgid "cancel" -msgstr "Annulé" - -#. module: stock -#: selection:stock.move,state:0 -#: selection:stock.picking,state:0 -msgid "Waiting" -msgstr "En attente" +#: xsl:stock.picking.list:0 +msgid "State" +msgstr "État" #. module: stock #: rml:lot.location:0 -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 #: model:ir.model,name:stock.model_stock_location #: field:stock.inventory.line,location_id:0 #: field:stock.picking,location_id:0 msgid "Location" -msgstr "Localisation" +msgstr "Emplacement" #. module: stock #: help:product.template,property_stock_account_output:0 -msgid "This account will be used, instead of the default one, to value output stock" -msgstr "Ce compte sera utilisé , au lieu de celui par défaut, pour valoriser le stock de sortie" +msgid "" +"This account will be used, instead of the default one, to value output stock" +msgstr "" +"Ce compte sera utilisé, au lieu de celui par défaut, pour la valeur du stock " +"de sortie" #. module: stock #: model:ir.model,name:stock.model_stock_warehouse @@ -479,9 +420,9 @@ msgid "Lots by location" msgstr "Lots par emplacement" #. module: stock -#: wizard_button:stock.partial_picking,init,split:0 -msgid "Make Picking" -msgstr "" +#: xsl:stock.picking.list:0 +msgid "Qty" +msgstr "Qté" #. module: stock #: wizard_field:stock.invoice_onshipping,init,type:0 @@ -491,61 +432,55 @@ msgstr "Type" #. module: stock #: view:stock.move:0 msgid "UOM" -msgstr "UDM" +msgstr "Unité principale" #. module: stock -#: model:stock.location,name:stock.stock_location_5 -msgid "Generic IT Suppliers" +#: field:stock.location,chained_auto_packing:0 +msgid "Chained Auto-Packing" msgstr "" #. module: stock #: view:stock.move:0 msgid "Make Parcel" -msgstr "Faire le colis" +msgstr "Créer un coli" #. module: stock #: model:stock.location,name:stock.location_procurement msgid "Procurements" -msgstr "" +msgstr "Réapprovisionnement" #. module: stock #: selection:stock.location,chained_location_type:0 msgid "Fixed Location" -msgstr "" +msgstr "Emplacement fixe" #. module: stock -#: wizard_view:stock.partial_picking,end2:0 -msgid "Packing result" -msgstr "" +#: view:stock.picking:0 +msgid "Cancel assignation" +msgstr "Annuler l'assignation" + +#. module: stock +#: model:ir.actions.act_window,name:stock.action_location_tree +#: model:ir.ui.menu,name:stock.menu_action_location_tree +msgid "Locations Structure" +msgstr "Structure des emplacements" #. module: stock #: wizard_button:stock.invoice_onshipping,init,create_invoice:0 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping msgid "Create invoice" -msgstr "Créer la facture" +msgstr "Créer une facture" #. module: stock #: field:res.partner,property_stock_customer:0 #: selection:stock.location,usage:0 msgid "Customer Location" -msgstr "Stockage client" +msgstr "Emplacement Client" #. module: stock #: view:stock.location:0 msgid "Stock location tree" -msgstr "Arbre de localisation de stock" - -#. module: stock -#, python-format -#: code:addons/stock/stock.py:0 -msgid "You can only delete draft moves." -msgstr "" - -#. module: stock -#, python-format -#: code:addons/stock/wizard/wizard_track_line.py:0 -msgid "No production sequence defined" -msgstr "" +msgstr "Arbre des Emplacements de Stock" #. module: stock #: field:stock.production.lot.revision,date:0 @@ -565,54 +500,39 @@ msgstr "Informations générales" #. module: stock #: selection:stock.location,chained_location_type:0 msgid "None" -msgstr "" +msgstr "Aucun" #. module: stock #: view:product.category:0 msgid "Accounting Stock Properties" -msgstr "" +msgstr "Propriété du compte de stock" #. module: stock #: model:ir.actions.wizard,name:stock.action4 #: model:ir.actions.wizard,name:stock.action_lot2 msgid "Downstream traceability" -msgstr "Traçabilité aval" - -#. module: stock -#: view:res.partner:0 -msgid "Sales & Purchases" -msgstr "" +msgstr "Traçabilté aval" #. module: stock #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: stock -#: model:stock.location,name:stock.stock_location_14 -msgid "Finished products" -msgstr "" - -#. module: stock -#: field:stock.production.lot,revisions:0 -msgid "Revisions" -msgstr "Révisions" - -#. module: stock -#: model:stock.location,name:stock.stock_location_customers -msgid "Customers" -msgstr "" +#: field:stock.location,usage:0 +msgid "Location type" +msgstr "Type d'emplacement" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree #: model:ir.ui.menu,name:stock.menu_action_picking_tree msgid "Sending Products" -msgstr "" +msgstr "Livraison de Marchandises" #. module: stock #: selection:stock.location,allocation_method:0 msgid "Nearest" -msgstr "Plus proche" +msgstr "Le plus proche" #. module: stock #: selection:stock.location,usage:0 @@ -622,7 +542,7 @@ msgstr "Approvisionnement" #. module: stock #: field:stock.location,location_id:0 msgid "Parent Location" -msgstr "Emplacement Parent\\"" +msgstr "Emplacement parent" #. module: stock #: field:stock.inventory,date:0 @@ -630,71 +550,60 @@ msgstr "Emplacement Parent\\"" #: field:stock.production.lot,date:0 #: field:stock.tracking,date:0 msgid "Date create" -msgstr "Date création" +msgstr "Date de création" #. module: stock -#: view:stock.picking:0 -msgid "Cancel assignation" -msgstr "Annuler assignation" +#: xsl:stock.picking.list:0 +msgid "PACKINGLIST" +msgstr "" #. module: stock #: model:ir.model,name:stock.model_stock_tracking msgid "Stock Tracking Lots" -msgstr "Numéro de suivi" +msgstr "" #. module: stock #: model:stock.location,name:stock.location_production msgid "Default Production" -msgstr "" +msgstr "Prodcution par défaut" #. module: stock #: field:res.partner,property_stock_supplier:0 #: selection:stock.location,usage:0 msgid "Supplier Location" -msgstr "Stockage fournisseur" +msgstr "Emplacement fournisseur" #. module: stock #: view:stock.picking:0 msgid "Force Assignation" -msgstr "Forcer l'assignation" - -#. module: stock -#: view:stock.move:0 -msgid "Moves" -msgstr "Mouvements" +msgstr "Forcer assignation" #. module: stock #: field:stock.move,auto_validate:0 msgid "Auto Validate" -msgstr "" +msgstr "Validation Automatique" #. module: stock #: model:stock.location,name:stock.stock_location_company msgid "Tiny sprl" -msgstr "" - -#. module: stock -#: field:stock.location,chained_auto_packing:0 -#: selection:stock.location,chained_auto_packing:0 -msgid "Automatic Move" -msgstr "" +msgstr "Tiny sprl" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree4 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4 msgid "Getting Products" -msgstr "" +msgstr "Réception de Marchandises" #. module: stock #: field:stock.move,location_dest_id:0 #: field:stock.picking,location_dest_id:0 msgid "Dest. Location" -msgstr "Emplacement dest.\\"" +msgstr "Emplacement de Dest." #. module: stock #: field:stock.move,product_packaging:0 msgid "Packaging" -msgstr "Code UL" +msgstr "Empaquetage" #. module: stock #: selection:stock.move,priority:0 @@ -704,12 +613,13 @@ msgstr "Urgent" #. module: stock #: help:product.category,property_stock_account_input_categ:0 msgid "This account will be used to value the input stock" -msgstr "Ce compte sera utilisé pour valoriser les entrées de marchandises" +msgstr "Ce compte sera utilisé pour mettre la valeur de l'entrée de stock" #. module: stock +#: xsl:stock.picking.list:0 #: field:stock.production.lot,name:0 msgid "Serial" -msgstr "Numéro de série" +msgstr "Numéro de Série" #. module: stock #: field:stock.inventory,inventory_line_id:0 @@ -723,27 +633,38 @@ msgstr "Inventaires" #: view:stock.move:0 #: view:stock.picking:0 msgid "Stock Moves" -msgstr "" +msgstr "Mouvements de stocks" #. module: stock #: field:stock.move,date:0 msgid "Date Created" -msgstr "Date création" +msgstr "Date de création" #. module: stock #: selection:stock.picking,type:0 msgid "Sending Goods" -msgstr "Envoi de marchandises" +msgstr "Livraison de marchandise" + +#. module: stock +#: model:stock.location,name:stock.stock_location_customers +msgid "Customers" +msgstr "Clients" #. module: stock #: field:stock.warehouse,lot_output_id:0 msgid "Location Output" -msgstr "Emplacement de sortie" +msgstr "Emplacement Sortant" #. module: stock #: help:product.template,property_stock_production:0 -msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders" -msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré par les ordres de fabrication " +msgid "" +"For the current product (template), this stock location will be used, " +"instead of the default one, as the source location for stock moves generated " +"by production orders" +msgstr "" +"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à " +"la place de celui par défaut, comme emplacement source pour les mouvements " +"de stock gérérés par les commandes de production" #. module: stock #: wizard_view:stock.invoice_onshipping,init:0 @@ -759,27 +680,27 @@ msgstr "Confirmé" #. module: stock #: view:stock.picking:0 msgid "Supplier Invoice Control" -msgstr "" +msgstr "Contrôle des Factures Fournisseur" #. module: stock #: field:stock.location,name:0 msgid "Location Name" -msgstr "Groupe de lot" +msgstr "Nom de l'emplacement" #. module: stock #: view:stock.inventory:0 msgid "Posted Inventory" -msgstr "Inventaire posté" +msgstr "Inventaire Posté" #. module: stock #: view:stock.picking.move.wizard:0 msgid "Add" -msgstr "" +msgstr "Ajouter" #. module: stock #: field:stock.inventory,move_ids:0 msgid "Created Moves" -msgstr "Mouvements créés" +msgstr "Crée mouvement" #. module: stock #: selection:stock.inventory,state:0 @@ -789,15 +710,14 @@ msgid "Draft" msgstr "Brouillon" #. module: stock -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 msgid "Packing Date" -msgstr "" +msgstr "Date du Colisage" #. module: stock -#: model:ir.actions.act_window,name:stock.action_location_tree -#: model:ir.ui.menu,name:stock.menu_action_location_tree -msgid "Stock Locations Structure" -msgstr "" +#: selection:stock.move,state:0 +msgid "cancel" +msgstr "annuler" #. module: stock #: selection:stock.move,priority:0 @@ -807,12 +727,12 @@ msgstr "Non urgent" #. module: stock #: field:stock.move,product_uos_qty:0 msgid "Quantity (UOS)" -msgstr "Quantité US" +msgstr "Quantité (UP)" #. module: stock #: field:stock.move,tracking_id:0 msgid "Tracking lot" -msgstr "Numéro de suivi" +msgstr "Suivi lot" #. module: stock #: selection:stock.picking,invoice_state:0 @@ -824,55 +744,55 @@ msgstr "A facturer" #: field:stock.move,state:0 #: field:stock.picking,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: stock #: field:stock.location,posy:0 msgid "Shelves (Y)" -msgstr "Position Y" +msgstr "Rayon (Y)" #. module: stock -#: field:stock.location,usage:0 -msgid "Location type" -msgstr "Utilisation" +#: xsl:stock.picking.list:0 +msgid "Concerns:" +msgstr "Concerne :" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_all #: wizard_field:stock.picking.make,init,pickings:0 #: model:ir.ui.menu,name:stock.menu_action_picking_all msgid "Packings" -msgstr "Les colis" +msgstr "Colisages" #. module: stock #: wizard_view:stock.picking.make,init:0 #: model:ir.actions.wizard,name:stock.make_picking msgid "Make packing" -msgstr "Faire le colisage" +msgstr "Créer le colisage" #. module: stock -#: field:stock.picking,backorder_id:0 -msgid "Back Order" -msgstr "" +#: view:res.partner:0 +msgid "Sales & Purchases" +msgstr "Ventes & Achats" #. module: stock #: view:stock.picking.move.wizard:0 msgid "Move Lines" -msgstr "" +msgstr "Lignes de mouvements" #. module: stock #: view:stock.location:0 msgid "Localisation" -msgstr "Localisation" +msgstr "Emplacement" #. module: stock #: model:stock.location,name:stock.stock_location_output msgid "Output" -msgstr "" +msgstr "Sortie" #. module: stock #: view:stock.picking:0 msgid "Split in Two" -msgstr "" +msgstr "Diviser les lignes" #. module: stock #: selection:stock.picking,move_type:0 @@ -882,23 +802,23 @@ msgstr "Livraison directe" #. module: stock #: model:ir.actions.wizard,name:stock.track_line msgid "Track line" -msgstr "Tracer les lignes" +msgstr "Suivre la ligne" #. module: stock #: model:ir.actions.act_window,name:stock.action_production_lot_form #: model:ir.ui.menu,name:stock.menu_action_production_lot_form msgid "Production Lots" -msgstr "" +msgstr "Lots de production" #. module: stock -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 msgid "Shipping Date" -msgstr "" +msgstr "Date de Livraison" #. module: stock -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 msgid "Recipient" -msgstr "" +msgstr "Destinataire" #. module: stock #: view:product.template:0 @@ -911,7 +831,7 @@ msgstr "Propriétés" #: model:ir.ui.menu,name:stock.menu_action_incoterms_tree #: view:stock.incoterms:0 msgid "Incoterms" -msgstr "" +msgstr "Incoterms" #. module: stock #: field:stock.location,child_ids:0 @@ -927,12 +847,12 @@ msgstr "" #. module: stock #: field:stock.warehouse,lot_stock_id:0 msgid "Location Stock" -msgstr "Emplacement du stock" +msgstr "Emplacement de Stock" #. module: stock #: field:product.template,property_stock_procurement:0 msgid "Procurement Location" -msgstr "Emplacement des approvisionnements" +msgstr "Emplacement d'approvisionnement" #. module: stock #: field:stock.incoterms,active:0 @@ -940,34 +860,40 @@ msgstr "Emplacement des approvisionnements" #: field:stock.picking,active:0 #: field:stock.tracking,active:0 msgid "Active" -msgstr "Active" +msgstr "Actif" #. module: stock #: wizard_field:stock.move.track,init,tracking_prefix:0 msgid "Tracking prefix" -msgstr "Préfixe pour traçabilité" +msgstr "Préfix du Suivi" #. module: stock -#: wizard_view:stock.partial_picking,end2:0 -msgid "The packing has been successfully made !" -msgstr "" +#: xsl:stock.picking.list:0 +msgid "Shipping ref." +msgstr "Réf. Livraison" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree5 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5 msgid "Packings to Process" -msgstr "" +msgstr "Colisages à traiter" #. module: stock #: field:stock.move,address_id:0 #: field:stock.picking.move.wizard,address_id:0 msgid "Dest. Address" -msgstr "Adresse de destination" +msgstr "Adresse de Dest." #. module: stock #: help:product.template,property_stock_procurement:0 -msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements" -msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré par les achats. " +msgid "" +"For the current product (template), this stock location will be used, " +"instead of the default one, as the source location for stock moves generated " +"by procurements" +msgstr "" +"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à " +"la place de celui par défaut, comme emplacement source pour les mouvements " +"de stock gérérés par les approvisionnements" #. module: stock #: view:stock.move:0 @@ -985,18 +911,18 @@ msgstr "Quantité" #. module: stock #: model:ir.model,name:stock.model_stock_picking_move_wizard msgid "stock.picking.move.wizard" -msgstr "" +msgstr "stock.picking.move.wizard" #. module: stock #: field:stock.location,address_id:0 msgid "Location Address" -msgstr "" +msgstr "Adresse du dépôt" #. module: stock #: view:stock.production.lot:0 #: model:res.request.link,name:stock.req_link_tracking msgid "Production Lot" -msgstr "Lot de fabrication" +msgstr "Lot de Production" #. module: stock #: xsl:stock.location.overview.all:0 @@ -1005,34 +931,29 @@ msgid "Code" msgstr "Code" #. module: stock -#: model:stock.location,name:stock.stock_location_13 -msgid "Stock Level 1" -msgstr "" - -#. module: stock #: model:ir.actions.report.xml,name:stock.report_product_location msgid "Products Localisations" -msgstr "Localisation des produits" +msgstr "Emplacements de Productions" #. module: stock #: field:stock.warehouse,lot_input_id:0 msgid "Location Input" -msgstr "Emplacement d'entrée\\"" +msgstr "Emplacement d'Entrée" #. module: stock #: field:stock.location,allocation_method:0 msgid "Allocation Method" -msgstr "Méthode d'allocation" +msgstr "Méthod d'attribution" #. module: stock #: model:ir.actions.act_window,name:stock.action_location_form #: model:ir.ui.menu,name:stock.menu_action_location_form msgid "Locations" -msgstr "" +msgstr "Emplacements" #. module: stock -#: rml:stock.picking.list:0 -msgid "Qty" +#: wizard_button:stock.back_order.partial_picking,init,split:0 +msgid "Make Picking" msgstr "" #. module: stock @@ -1044,7 +965,7 @@ msgstr "Assigné" #. module: stock #: view:stock.picking:0 msgid "General Information" -msgstr "Information générale" +msgstr "Informations générales" #. module: stock #: selection:stock.location,usage:0 @@ -1056,7 +977,7 @@ msgstr "Production" #: selection:stock.move,state:0 #: selection:stock.picking,state:0 msgid "Done" -msgstr "Terminé" +msgstr "Terminer" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree2 @@ -1064,12 +985,12 @@ msgstr "Terminé" #: model:ir.ui.menu,name:stock.menu_action_picking_tree7 #: model:ir.ui.menu,name:stock.menu_picking_waiting msgid "Assigned Packings" -msgstr "" +msgstr "Colisages Assignés" #. module: stock #: wizard_button:stock.picking.make,init,end:0 #: wizard_button:stock.move.split,init,end:0 -#: wizard_button:stock.partial_picking,init,end:0 +#: wizard_button:stock.back_order.partial_picking,init,end:0 #: wizard_button:stock.return.picking,init,end:0 #: wizard_button:stock.move.track,init,end:0 #: wizard_button:stock.invoice_onshipping,init,end:0 @@ -1081,58 +1002,55 @@ msgid "Cancel" msgstr "Annuler" #. module: stock -#: wizard_button:stock.partial_picking,end2,end:0 -msgid "Close" -msgstr "" - -#. module: stock #: model:ir.actions.report.xml,name:stock.report_move_labels msgid "Print Item Labels" -msgstr "Imprimer les étiquettes" +msgstr "Impression des étiquettes" #. module: stock -#: help:stock.location,chained_auto_packing:0 -msgid "This is used only if you selected a chained location type.\n" -"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move." -msgstr "" +#: view:stock.move:0 +msgid "Moves" +msgstr "Mouvements" #. module: stock -#: selection:stock.location,chained_auto_packing:0 -msgid "Automatic No Step Added" -msgstr "" +#: view:stock.move:0 +#: view:stock.picking:0 +msgid "Move Information" +msgstr "Information sur le Mouvement" #. module: stock #: field:stock.inventory,date_done:0 msgid "Date done" -msgstr "Fait le" +msgstr "Date de fin" #. module: stock #: view:stock.move:0 #: view:stock.picking:0 msgid "Split in production lots" -msgstr "Diviser en lots de fabrication" +msgstr "Diviser en lots de production" #. module: stock #: wizard_button:stock.move.split,init,split:0 msgid "Split" -msgstr "Répartir" +msgstr "Diviser" #. module: stock #: model:ir.actions.act_window,name:stock.action_move_form3 #: model:ir.ui.menu,name:stock.menu_action_move_form3 msgid "Draft Moves" -msgstr "Mouvements brouillon" +msgstr "Mouvements en brouillon" #. module: stock -#, python-format -#: code:addons/stock/stock.py:0 -msgid "You can not remove a lot line !" +#: 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 !" #. module: stock -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" +#: view:stock.picking:0 +msgid "Split move lines in two" +msgstr "Diviser les lignes en deux" #. module: stock #: field:stock.move,date_planned:0 @@ -1143,12 +1061,12 @@ msgstr "Date prévue" #: model:ir.actions.act_window,name:stock.action_warehouse_form #: model:ir.ui.menu,name:stock.menu_action_warehouse_form msgid "Warehouses" -msgstr "" +msgstr "Entrepôts" #. module: stock #: field:product.template,property_stock_inventory:0 msgid "Inventory Location" -msgstr "Emplacement de l'inventaire" +msgstr "Emplacement de l'Inventaire" #. module: stock #: field:stock.location,account_id:0 @@ -1158,7 +1076,7 @@ msgstr "Compte d'inventaire" #. module: stock #: view:stock.inventory:0 msgid "Confirm Inventory" -msgstr "Confirmer inventaire" +msgstr "Confirmer l'Inventaire" #. module: stock #: xsl:stock.location.overview:0 @@ -1169,8 +1087,13 @@ msgstr "Prix unitaire" #. module: stock #: help:product.template,property_stock_inventory:0 -msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory" -msgstr "Pour le produit courant (modèle), cette localisation de stock sera utilisée, au lieu de celle par défaut, comme localisation source pour les mouvements de stock généré lorsque vous faire un inventaire. " +msgid "" +"For the current product (template), this stock location will be used, " +"instead of the default one, as the source location for stock moves generated " +"when you do an inventory" +msgstr "" +"Cette localisation de stock sera utilisée au lieu de celle par défaut, en " +"tant que localisation source générées quand vous effectué un inventaire" #. module: stock #: model:ir.ui.menu,name:stock.menu_traceability_low @@ -1178,14 +1101,18 @@ msgid "Low Level" msgstr "Bas niveau" #. module: stock -#: view:stock.picking:0 -msgid "Split move lines in two" -msgstr "Diviser les lignes de mouvement en deux" +#: xsl:stock.picking.list:0 +msgid "Customer ref." +msgstr "Réf. Client" #. module: stock #: help:res.partner,property_stock_supplier:0 -msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner" -msgstr "Cette localisation de stock sera utilisée, au lieu de celle par défaut, en tant que source de localisation pour les marchandises vous recevez de partenaire par défaut" +msgid "" +"This stock location will be used, instead of the default one, as the source " +"location for goods you receive from the current partner" +msgstr "" +"Cette localisation de stock sera utilisée au lieu de celle par défaut, en " +"tant que localisation source pour les biens recus du partenaire courant" #. module: stock #: model:ir.actions.act_window,name:stock.action_move_form4 @@ -1196,34 +1123,34 @@ msgstr "Mouvements assignés" #. module: stock #: view:product.product:0 msgid "Stocks" -msgstr "" +msgstr "Stocks" #. module: stock #: field:stock.warehouse,partner_address_id:0 msgid "Owner Address" -msgstr "Adresse du propriétaire" +msgstr "Adresses du propriétaire" #. module: stock #: wizard_field:stock.invoice_onshipping,init,journal_id:0 msgid "Destination Journal" -msgstr "Journal de destination" +msgstr "Journal de Destination" #. module: stock #: model:stock.location,name:stock.stock_location_stock msgid "Stock" -msgstr "" +msgstr "Stock" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree6 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6 msgid "Internal Packings" -msgstr "" +msgstr "Colisages Internes" #. module: stock #: xsl:stock.location.overview:0 #: xsl:stock.location.overview.all:0 #: rml:lot.location:0 -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 #: field:stock.inventory.line,product_id:0 #: field:stock.move,product_id:0 msgid "Product" @@ -1235,7 +1162,7 @@ msgid "Return" msgstr "Retour" #. module: stock -#: rml:stock.picking.list:0 +#: xsl:stock.picking.list:0 #: field:stock.production.lot.revision,description:0 msgid "Description" msgstr "Description" @@ -1249,12 +1176,12 @@ msgstr "Auto-colisage" #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery msgid "Waiting Delivery Orders" -msgstr "" +msgstr "Ordre de livraison en attente" #. module: stock #: field:stock.location,posz:0 msgid "Height (Z)" -msgstr "Position Z" +msgstr "Hauteur (Z)" #. module: stock #: model:ir.actions.act_window,name:stock.action5 @@ -1269,36 +1196,40 @@ msgid "Cancel Inventory" msgstr "Annuler inventaire" #. module: stock -#: view:stock.picking:0 -msgid "Cancel Assignation" -msgstr "Annuler l'assignation" +#: selection:stock.move,state:0 +#: selection:stock.picking,state:0 +msgid "Waiting" +msgstr "En attente" #. module: stock #: help:product.category,property_stock_journal:0 -msgid "This journal will be used for the accounting move generated by stock move" -msgstr "Ce journal sera utilisé pour les mouvements comptables généré par les mouvements de stock" +msgid "" +"This journal will be used for the accounting move generated by stock move" +msgstr "" +"Ce journal sera utilisé pour les mouvements de compte générés par les " +"mouvements de stock" #. module: stock #: field:product.category,property_stock_account_output_categ:0 #: field:product.template,property_stock_account_output:0 msgid "Stock Output Account" -msgstr "Compte de sortie de stock" +msgstr "Compte de Stock Sortant" #. module: stock #: xsl:stock.location.overview:0 #: xsl:stock.location.overview.all:0 msgid "Variants" -msgstr "Variante" +msgstr "Variantes" #. module: stock #: field:stock.location,posx:0 msgid "Corridor (X)" -msgstr "Position X" +msgstr "Couloir (X)" #. module: stock -#: model:stock.location,name:stock.stock_location_7 -msgid "European Customers" -msgstr "" +#: model:stock.location,name:stock.stock_location_suppliers +msgid "Suppliers" +msgstr "Fournisseurs" #. module: stock #: view:stock.picking:0 @@ -1308,12 +1239,12 @@ msgstr "Forcer l'assignation" #. module: stock #: selection:stock.location,chained_location_type:0 msgid "Customer" -msgstr "" +msgstr "Client" #. module: stock #: field:stock.tracking,move_ids:0 msgid "Moves tracked" -msgstr "Suivi de stock" +msgstr "Mouvements Suivis" #. module: stock #: field:stock.incoterms,name:0 @@ -1326,12 +1257,12 @@ msgstr "Nom" #. module: stock #: model:ir.actions.report.xml,name:stock.report_location_overview_all msgid "Location Content (With childs)" -msgstr "Contenu de l'emplacement (avec enfants)" +msgstr "Contenu de l'Emplacement (avec enfants)" #. module: stock #: model:stock.location,name:stock.stock_location_locations_virtual msgid "Virtual Locations" -msgstr "" +msgstr "Emplacements Virtuels" #. module: stock #: field:stock.production.lot.revision,name:0 @@ -1339,45 +1270,34 @@ msgid "Revision name" msgstr "Nom de la révision" #. module: stock -#: field:stock.move,product_uos:0 -msgid "Product UOS" -msgstr "Unité secondaire" +#: field:stock.production.lot,revisions:0 +msgid "Revisions" +msgstr "Révisions" #. module: stock #: view:stock.inventory.line:0 msgid "Stock Inventory Lines" -msgstr "Lignes d'inventaire de stock" +msgstr "Lignes d'Inventaire de Stock" #. module: stock #: model:ir.actions.report.xml,name:stock.report_location_overview msgid "Location Overview" -msgstr "Contenu de la zone de stockage" - -#. module: stock -#: view:stock.move:0 -#: view:stock.picking:0 -msgid "Move Information" -msgstr "Information mouvement" +msgstr "Aperçu de l'Emplacement" #. module: stock #: view:stock.location:0 msgid "Stock location" -msgstr "Localisation de stock" +msgstr "Emplacement de sotck" #. module: stock #: view:product.template:0 msgid "Accounting Entries" -msgstr "" - -#. module: stock -#: view:stock.picking:0 -msgid "Calendar View" -msgstr "" +msgstr "Écritures comptables" #. module: stock #: model:stock.location,name:stock.stock_location_locations msgid "Physical Locations" -msgstr "" +msgstr "Emplacements physiques" #. module: stock #: model:ir.actions.wizard,name:stock.move_split @@ -1387,22 +1307,22 @@ msgstr "Diviser la ligne de mouvement" #. module: stock #: help:product.category,property_stock_account_output_categ:0 msgid "This account will be used to value the output stock" -msgstr "Ce compte sera utilisé pour valoriser le stock de sortie" +msgstr "Ce compte sera utilisé pour valoriser le stock sortant" #. module: stock #: field:stock.picking,type:0 msgid "Shipping Type" -msgstr "Type d'envoi" +msgstr "Type de Livraison" #. module: stock #: field:stock.picking,invoice_state:0 msgid "Invoice Status" -msgstr "" +msgstr "État de la facture" #. module: stock #: selection:stock.location,usage:0 msgid "View" -msgstr "" +msgstr "Vue" #. module: stock #: model:ir.model,name:stock.model_stock_inventory @@ -1420,65 +1340,58 @@ msgstr "Ligne d'inventaire" #. module: stock #: field:stock.location,chained_delay:0 msgid "Chained Delay (days)" -msgstr "" +msgstr "Délai lié (jours)" #. module: stock #: view:res.partner:0 msgid "Stock Properties" -msgstr "" +msgstr "Propriétés du Stock" #. module: stock #: field:stock.move,location_id:0 msgid "Source Location" -msgstr "Emplacement Origine" - -#. module: stock -#: rml:stock.picking.list:0 -msgid "Packing List" -msgstr "" +msgstr "Emplacement source" #. module: stock #: view:stock.picking:0 msgid "Others info" -msgstr "Autres informations" +msgstr "Autres infos" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_form #: model:ir.ui.menu,name:stock.menu_action_picking_form msgid "New Reception Packing" -msgstr "" +msgstr "Nouveau Colisage Entrant" #. module: stock #: view:stock.move:0 #: view:stock.picking:0 msgid "Move State" -msgstr "État mouvement" +msgstr "État du Mouvement" #. module: stock #: wizard_field:stock.move.track,init,quantity:0 msgid "Quantity per lot" -msgstr "Quantité par lot" +msgstr "Quantité par Lot" #. module: stock #: field:product.category,property_stock_account_input_categ:0 #: field:product.template,property_stock_account_input:0 msgid "Stock Input Account" -msgstr "Compte de stock d'entrée" +msgstr "Compte du Stock d'Entrée" #. module: stock -#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery -#: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery -msgid "Calendar of Deliveries" -msgstr "" +#: field:stock.move,product_uos:0 +msgid "Product UOS" +msgstr "UP Produit" #. module: stock #: field:stock.location,comment:0 #: view:stock.location:0 msgid "Additional Information" -msgstr "Info. supplémentaire" +msgstr "Information complémentaire" #. module: stock #: field:product.template,property_stock_production:0 msgid "Production Location" -msgstr "Emplacement de la production" - +msgstr "Emplacement Production" diff --git a/addons/stock/product.py b/addons/stock/product.py index f9eeef4f907..de035b213de 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -131,35 +131,32 @@ class product_product(osv.osv): res[prod_id] -= amount return res - def _get_product_available_func(states, what): - def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}): - if not field_names: - field_names=[] - context.update({ - 'states':states, - 'what':what - }) - stock=self.get_product_available(cr,uid,ids,context=context) - res = {} + def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}): + if not field_names: + field_names=[] + res = {} + for id in ids: + res[id] = {}.fromkeys(field_names, 0.0) + for f in field_names: + c = context.copy() + if f=='qty_available': + c.update({ 'states':('done',), 'what':('in', 'out') }) + if f=='virtual_available': + c.update({ 'states':('confirmed','waiting','assigned','done'), 'what':('in', 'out') }) + if f=='incoming_qty': + c.update({ 'states':('confirmed','waiting','assigned'), 'what':('in',) }) + if f=='outgoing_qty': + c.update({ 'states':('confirmed','waiting','assigned'), 'what':('out',) }) + stock=self.get_product_available(cr,uid,ids,context=c) for id in ids: - res[id] = {}.fromkeys(field_names, 0.0) - for a in field_names: - res[id][a] = stock.get(id, 0.0) - return res - - return _product_available - - _product_qty_available = _get_product_available_func(('done',), ('in', 'out')) - _product_virtual_available = _get_product_available_func(('confirmed','waiting','assigned','done'), ('in', 'out')) - _product_outgoing_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('out',)) - _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',)) - + res[id][f] = stock.get(id, 0.0) + return res _columns = { - 'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock',multi='qty_available', help="Current quantities of products in selected locations or all internal if none have been selected."), - 'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock',multi='qty_available', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."), - 'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming',multi='qty_available', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."), - 'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing',multi='qty_available', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."), + 'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'), + 'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'), + 'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'), + 'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'), 'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"), 'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"), 'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"), diff --git a/addons/stock/product_data.xml b/addons/stock/product_data.xml index 1a60ca0781b..b6f7b5aaa8b 100644 --- a/addons/stock/product_data.xml +++ b/addons/stock/product_data.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> - + <record id="property_stock_journal" model="ir.property"> <field name="name">property_stock_journal</field> <field name="fields_id" search="[('model', '=', 'product.category'), ('name', '=', 'property_stock_journal')]"/> - <field eval="'account.journal,'+str(ref('account.stock_journal'))" model="account.journal" name="value"/> + <field eval="'account.journal,'+str(ref('stock.stock_journal'))" model="account.journal" name="value"/> </record> - + <record forcecreate="True" id="property_stock_account_output_prd" model="ir.property"> <field name="name">property_stock_account_output</field> <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/> diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 23c9be50dea..7716dcf9aa7 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -61,7 +61,17 @@ <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="Move_Line_Contect"> + <blockTableStyle id="Move_Line_Contect_Assign_State"> + <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"/> + </blockTableStyle> + <blockTableStyle id="Move_Line_Content_Other_State"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> @@ -103,7 +113,7 @@ <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_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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/> </stylesheet> <images/> @@ -187,52 +197,103 @@ <para style="terp_default_5cm_Above_Space"> <font color="white"> </font> </para> - <blockTable colWidths="58.0,261.0,49.0,89.0,56.0" repeatRows="1" style="Move_Line_Header"> + <blockTable colWidths="276.0,51.0,56.0,80.0,55.0" repeatRows="1" style="Move_Line_Header"> <tr> <td> - <para style="terp_tblheader_Details">Product</para> - </td> - <td> <para style="terp_tblheader_Details">Description</para> </td> <td> <para style="terp_tblheader_Details_Centre">Lot</para> </td> <td> + <para style="terp_tblheader_Details_Right">State</para> + </td> + <td> <para style="terp_tblheader_Details_Centre">Qty</para> </td> <td> - <para style="terp_tblheader_Details_Right">Location</para> + <para style="terp_tblheader_Details_Centre">Location</para> </td> </tr> </blockTable> + <para style="terp_default_2"/> <section> <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para> - <blockTable colWidths="59.0,261.0,49.0,64.0,25.0,54.0" style="Move_Line_Contect"> + <blockTable colWidths="277.0,51.0,56.0,58.0,22.0,56.0" style="Move_Line_Contect_Assign_State"> <tr> <td> - <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para> + <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para> </td> <td> - <para style="terp_default_9">[[ move_lines.product_id.name ]]</para> + <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ move_lines.state ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para> + </td> + <td> + <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para> + </td> + <td> + <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_2"> + <font color="white"> </font> + </para> + </section> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_Bold_9">Non Assigned Products:</para> + <para style="terp_default_Bold_9"> + <font color="white"> </font> + </para> + <section> + <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para> + <blockTable colWidths="277.0,51.0,56.0,58.0,22.0,55.0" style="Move_Line_Content_Other_State"> + <tr> + <td> + <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para> </td> <td> <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para> </td> <td> + <para style="terp_default_Right_9">[[ move_lines.state ]]</para> + </td> + <td> <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para> </td> <td> <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> + <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> </td> </tr> </blockTable> - <para style="terp_default_1"> + <para style="terp_default_2"> <font color="white"> </font> </para> </section> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="Standard"> + <font color="white"> </font> + </para> + <para style="Standard"> + <font color="white"> </font> + </para> + <para style="Standard"> + <font color="white"> </font> + </para> + <para style="Standard"> + <font color="white"> </font> + </para> </story> </document> diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index da20aa0d1fe..80c3013adfc 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -1,16 +1,17 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_stock_incoterms_system,stock.incoterms.system,model_stock_incoterms,base.group_system,1,1,1,1 -access_stock_warehouse_system,stock.warehouse.system,model_stock_warehouse,base.group_system,1,1,1,1 -access_stock_location_system,stock.location.system,model_stock_location,base.group_system,1,1,1,1 -access_stock_incoterms,stock.incoterms,model_stock_picking_move_wizard,base.group_system,1,0,0,0 -access_stock_warehouse,stock.warehouse,model_stock_picking_move_wizard,base.group_system,1,0,0,0 -access_stock_location,stock.location,model_stock_picking_move_wizard,base.group_system,1,0,0,0 -access_stock_picking_move_wizard,stock.picking.move.wizard,model_stock_picking_move_wizard,stock.group_stock_user,1,0,0,0 -access_stock_tracking,stock.tracking,model_stock_tracking,stock.group_stock_user,1,1,1,0 -access_stock_picking,stock.picking,model_stock_picking,stock.group_stock_user,1,1,1,1 -access_stock_production_lot,stock.production.lot,model_stock_production_lot,stock.group_stock_user,1,1,1,0 -access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1 -access_stock_move,stock.move,model_stock_move,stock.group_stock_user,1,1,1,0 -access_stock_inventory,stock.inventory,model_stock_inventory,stock.group_stock_user,1,1,1,1 -access_stock_inventory_line,stock.inventory.line,model_stock_inventory_line,stock.group_stock_user,1,1,1,1 -access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_user,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0 +"access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1 +"access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0 +"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1 +"access_stock_location_user","stock.location.user","model_stock_location","stock.group_stock_user",1,0,0,0 +"access_stock_location_partner_manager","stock.location partner manager","model_stock_location","base.group_partner_manager",1,0,0,0 +"access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1 +"access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0 +"access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1 +"access_stock_production_lot","stock.production.lot","model_stock_production_lot","stock.group_stock_user",1,1,1,0 +"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1 +"access_stock_move","stock.move","model_stock_move","stock.group_stock_user",1,1,1,0 +"access_stock_inventory","stock.inventory","model_stock_inventory","stock.group_stock_user",1,1,1,1 +"access_stock_inventory_line","stock.inventory.line","model_stock_inventory_line","stock.group_stock_user",1,1,1,1 +"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0 +"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0 diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 6bd063ed388..f3f28df553f 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_stock_manager" model="res.groups"> <field name="name">Stock / Manager</field> @@ -9,5 +9,13 @@ <field name="name">Stock / Worker</field> </record> + <record model='ir.ui.menu' id='menu_stock_root'> + <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/> + </record> + + <record model='ir.ui.menu' id='menu_stock_configuration'> + <field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/> + </record> + </data> </openerp> diff --git a/addons/stock/stock.py b/addons/stock/stock.py index f0c71c1199f..5718c344e4d 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -77,13 +77,20 @@ class stock_location(osv.osv): res[m.id] = _get_one_full_name(m) return res - def _product_qty_available(self, cr, uid, ids, name, arg, context={}): - res = {}.fromkeys(ids, 0.0) - if 'product_id' not in context: - return res + def _product_qty_available(self, cr, uid, ids, field_names, arg, context={}): + res = {} for id in ids: - location_ids = self.search(cr, uid, [('location_id', 'child_of', [id])]) - res[id] = self._product_get_multi_location(cr, uid, location_ids, [context['product_id']], context, ('done',), ('in','out'))[context['product_id']] + res[id] = {}.fromkeys(field_names, 0.0) + if ('product_id' not in context) or not ids: + return res + #location_ids = self.search(cr, uid, [('location_id', 'child_of', ids)]) + for loc in ids: + context['location'] = [loc] + prod = self.pool.get('product.product').browse(cr, uid, context['product_id'], context) + if 'stock_real' in field_names: + res[loc]['stock_real'] = prod.qty_available + if 'stock_virtual' in field_names: + res[loc]['stock_virtual'] = prod.virtual_available return res _columns = { @@ -94,8 +101,8 @@ class stock_location(osv.osv): 'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"), - 'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'), - 'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock'), + 'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"), + 'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock"), 'account_id': fields.many2one('account.account', string='Inventory Account', domain=[('type','!=','view')]), 'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'), @@ -323,11 +330,14 @@ class stock_picking(osv.osv): if isinstance(ids, (int, long)): ids=[ids] for pick in self.browse(cr, uid, ids, context): - cr.execute("""update stock_move set - date_planned=%s + sql_str="""update stock_move set + date_planned='%s' where - picking_id=%d and - (date_planned=%s or date_planned>%s)""", (value,pick.id,pick.max_date,value)) + picking_id=%d """ % (value,pick.id) + + if pick.max_date: + sql_str += " and (date_planned='"+pick.max_date+"' or date_planned>'"+value+"')" + cr.execute(sql_str) return True def _set_minimum_date(self, cr, uid, ids, name, value, arg, context): @@ -335,11 +345,13 @@ class stock_picking(osv.osv): if isinstance(ids, (int, long)): ids=[ids] for pick in self.browse(cr, uid, ids, context): - cr.execute("""update stock_move set - date_planned=%s + sql_str="""update stock_move set + date_planned='%s' where - picking_id=%d and - (date_planned=%s or date_planned<%s)""", (value,pick.id,pick.min_date,value)) + picking_id=%d """ % (value,pick.id) + if pick.min_date: + sql_str += " and (date_planned='"+pick.min_date+"' or date_planned<'"+value+"')" + cr.execute(sql_str) return True def get_min_max_date(self, cr, uid, ids, field_name, arg, context={}): @@ -396,7 +408,7 @@ class stock_picking(osv.osv): ("invoiced","Invoiced"), ("2binvoiced","To be invoiced"), ("none","Not from Packing")], "Invoice Status", - select=True, required=True), + select=True, required=True, readonly=True, states={'draft':[('readonly',False)]}), } _defaults = { 'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'stock.picking'), @@ -561,9 +573,19 @@ class stock_picking(osv.osv): def _get_taxes_invoice(self, cursor, user, move_line, type): '''Return taxes ids for the move line''' if type in ('in_invoice', 'in_refund'): - return [x.id for x in move_line.product_id.supplier_taxes_id] + taxes = move_line.product_id.supplier_taxes_id + else: + taxes = move_line.product_id.taxes_id + + if move_line.picking_id and move_line.picking_id.address_id and move_line.picking_id.address_id.partner_id: + return self.pool.get('account.fiscal.position').map_tax( + cursor, + user, + move_line.picking_id.address_id.partner_id, + taxes + ) else: - return [x.id for x in move_line.product_id.taxes_id] + return map(lambda x: x.id, taxes) def _get_account_analytic_invoice(self, cursor, user, picking, move_line): return False @@ -592,10 +614,10 @@ class stock_picking(osv.osv): partner = picking.address_id and picking.address_id.partner_id if type in ('out_invoice', 'out_refund'): account_id = partner.property_account_receivable.id - payment_term_id= picking.sale_id.payment_term.id + if picking.sale_id and picking.sale_id.payment_term: + payment_term_id= picking.sale_id.payment_term.id else: account_id = partner.property_account_payable.id -# payment_term_id = picking.purchase_id.payment_term.id address_contact_id, address_invoice_id = \ self._get_address_invoice(cursor, user, picking).values() @@ -607,7 +629,7 @@ class stock_picking(osv.osv): else: invoice_vals = { 'name': picking.name, - 'origin': picking.name + ':' + picking.origin, + 'origin': picking.name + (picking.origin and (':' + picking.origin) or ''), 'type': type, 'account_id': account_id, 'partner_id': partner.id, @@ -622,10 +644,8 @@ class stock_picking(osv.osv): context=context) invoices_group[partner.id] = invoice_id res[picking.id] = invoice_id - sale_line_ids = sale_line_obj.search(cursor, user, [('order_id','=',picking.sale_id.id)]) sale_lines = sale_line_obj.browse(cursor, user, sale_line_ids, context=context) - for sale_line in sale_lines: if sale_line.product_id.type == 'service' and sale_line.invoiced == False: if group: @@ -648,9 +668,11 @@ class stock_picking(osv.osv): sale_line, type) discount = self._get_discount_invoice(cursor, user, sale_line) tax_ids = self._get_taxes_invoice(cursor, user, sale_line, type) + account_analytic_id = self._get_account_analytic_invoice(cursor, user, picking, sale_line) - + + account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id) invoice_line_id = invoice_line_obj.create(cursor, user, { 'name': name, 'invoice_id': invoice_id, @@ -666,7 +688,7 @@ class stock_picking(osv.osv): sale_line_obj.write(cursor, user, [sale_line.id], {'invoiced':True, 'invoice_lines': [(6, 0, [invoice_line_id])], }) - + for move_line in picking.move_lines: if group: name = picking.name + '-' + move_line.name @@ -693,6 +715,7 @@ class stock_picking(osv.osv): account_analytic_id = self._get_account_analytic_invoice(cursor, user, picking, move_line) + account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id) invoice_line_id = invoice_line_obj.create(cursor, user, { 'name': name, 'invoice_id': invoice_id, @@ -701,7 +724,7 @@ class stock_picking(osv.osv): 'account_id': account_id, 'price_unit': price_unit, 'discount': discount, - 'quantity': move_line.product_uos_qty, + 'quantity': move_line.product_uos_qty or move_line.product_qty, 'invoice_line_tax_id': [(6, 0, tax_ids)], 'account_analytic_id': account_analytic_id, }, context=context) @@ -716,7 +739,6 @@ class stock_picking(osv.osv): self.write(cursor, user, res.keys(), { 'invoice_state': 'invoiced', }, context=context) - print res return res stock_picking() diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml index 5a85898bfe4..6af7d0b24f7 100644 --- a/addons/stock/stock_data.xml +++ b/addons/stock/stock_data.xml @@ -1,6 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> + + <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.account_journal_view"/> + <field name="sequence_id" ref="account.sequence_journal"/> + <field name="user_id" ref="base.user_root"/> + </record> + <!-- Request link --> diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py index 1274decd40a..270bc70101a 100644 --- a/addons/stock/wizard/wizard_invoice_onshipping.py +++ b/addons/stock/wizard/wizard_invoice_onshipping.py @@ -72,11 +72,9 @@ invoice_fields = { def _get_type(obj, cr, uid, data, context): picking_obj=pooler.get_pool(cr.dbname).get('stock.picking') - - pick=picking_obj.browse(cr, uid, data['id']) - if pick.loc_move_id: - usage=pick.loc_move_id.usage - else: + usage = 'customer' + pick = picking_obj.browse(cr, uid, data['id'], context) + if pick.move_lines: usage=pick.move_lines[0].location_id.usage if pick.type == 'out' and usage == 'supplier': diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py index f7cb92639b4..49a41d9c201 100644 --- a/addons/stock/wizard/wizard_return.py +++ b/addons/stock/wizard/wizard_return.py @@ -84,12 +84,9 @@ def _create_returns(self, cr, uid, data, context): else: new_type='internal' new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name, - 'move_lines':[], 'state':'draft', 'type':new_type, 'loc_move_id':False, + 'move_lines':[], 'state':'draft', 'type':new_type, 'date':date_cur, 'invoice_state':data['form']['invoice_state'],}) - if pick.loc_move_id: - new_location=pick.loc_move_id.id - else: - new_location=move.location_dest_id.id + new_location=move.location_dest_id.id new_move=move_obj.copy(cr, uid, move.id, { 'product_qty': data['form']['return%s' % move.id], diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__terp__.py index 197eecedd76..cc9aaf3b24b 100644 --- a/addons/stock_location/__terp__.py +++ b/addons/stock_location/__terp__.py @@ -18,7 +18,9 @@ This module may be usefull for different purposes: """, "init_xml" : [], "demo_xml" : [], - "update_xml" : ["stock_view.xml"], + "update_xml" : ["stock_view.xml", + "security/ir.model.access.csv", + ], "active": False, "installable": True } diff --git a/addons/stock_location/i18n/fr_FR.po b/addons/stock_location/i18n/fr_FR.po index feeacad7461..ab640bcbbed 100644 --- a/addons/stock_location/i18n/fr_FR.po +++ b/addons/stock_location/i18n/fr_FR.po @@ -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-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-11 15:41:43+0000\n" +"PO-Revision-Date: 2008-09-11 15:41:43+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: stock_location #: help:stock.location.path,delay:0 diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv new file mode 100644 index 00000000000..e87f65004bb --- /dev/null +++ b/addons/stock_location/security/ir.model.access.csv @@ -0,0 +1,4 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0 +"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1 +"access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1 diff --git a/addons/subscription/i18n/fr_FR.po b/addons/subscription/i18n/fr_FR.po index a874a674022..a83e30993da 100644 --- a/addons/subscription/i18n/fr_FR.po +++ b/addons/subscription/i18n/fr_FR.po @@ -4,94 +4,92 @@ # 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 17:01+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 17:44+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: subscription #: field:subscription.subscription,doc_source:0 #: field:subscription.subscription.history,document_id:0 msgid "Source Document" -msgstr "" +msgstr "Document Source" #. module: subscription #: field:subscription.subscription,interval_number:0 msgid "Interval Qty" -msgstr "" +msgstr "Intervalle (Qté)" #. module: subscription #: 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 démarrer avec x_ et ne pas contenir de charactère " +"spéciaux !" #. module: subscription #: field:subscription.subscription,date_init:0 msgid "First Date" -msgstr "" +msgstr "Date de début" #. module: subscription #: field:subscription.document.fields,field:0 msgid "Field" -msgstr "" +msgstr "Champ" #. module: subscription #: model:ir.model,name:subscription.model_subscription_subscription_history msgid "Subscription history" -msgstr "" +msgstr "Historique de l'abonnement" #. module: subscription #: selection:subscription.subscription,state:0 msgid "Draft" -msgstr "" +msgstr "Brouillon" #. module: subscription #: selection:subscription.document.fields,value:0 msgid "Current Date" -msgstr "" - -#. module: subscription -#, python-format -#: code:addons/subscription/subscription.py:0 -msgid "Please provide another source document.\nThis one does not exist !" -msgstr "" +msgstr "Date du jour" #. module: subscription #: selection:subscription.subscription,interval_type:0 msgid "Weeks" -msgstr "" +msgstr "Semaines" #. module: subscription #: field:subscription.subscription,state:0 msgid "Status" -msgstr "" +msgstr "État" #. module: subscription #: model:ir.ui.menu,name:subscription.next_id_45 #: view:subscription.subscription:0 msgid "Subscriptions" -msgstr "" +msgstr "Abonnements" #. module: subscription #: field:subscription.document,model:0 msgid "Object" -msgstr "" +msgstr "Objet" #. module: subscription #: view:subscription.subscription:0 msgid "Stop" -msgstr "" +msgstr "Arrêter" #. module: subscription #: view:subscription.subscription:0 msgid "Set to Draft" -msgstr "" +msgstr "Mettre en brouillon" #. module: subscription #: model:ir.model,name:subscription.model_subscription_document_fields @@ -101,27 +99,27 @@ msgstr "" #. module: subscription #: selection:subscription.subscription,state:0 msgid "Running" -msgstr "" +msgstr "En cours" #. module: subscription #: view:subscription.subscription.history:0 msgid "Subscription History" -msgstr "" +msgstr "Historique de l'abonnement" #. module: subscription #: field:subscription.subscription,user_id:0 msgid "User" -msgstr "" +msgstr "Utilisateur" #. module: subscription #: field:subscription.subscription,interval_type:0 msgid "Interval Unit" -msgstr "" +msgstr "Unité de l'intervale" #. module: subscription #: field:subscription.subscription.history,date:0 msgid "Date" -msgstr "" +msgstr "Date" #. module: subscription #: model:ir.ui.menu,name:subscription.menu_subscription_config @@ -131,70 +129,70 @@ msgstr "Configuration" #. module: subscription #: field:subscription.subscription,exec_init:0 msgid "Number of documents" -msgstr "" +msgstr "Nombres de documents" #. module: subscription #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML non valide pour l'architecture de la vue" #. module: subscription #: selection:subscription.subscription,interval_type:0 msgid "Months" -msgstr "" +msgstr "Mois" #. module: subscription #: field:subscription.document,name:0 #: field:subscription.subscription,name:0 msgid "Name" -msgstr "" +msgstr "Nom" #. module: subscription #: field:subscription.document,field_ids:0 msgid "Fields" -msgstr "" +msgstr "Champs" #. module: subscription #: field:subscription.subscription,notes:0 msgid "Notes" -msgstr "" +msgstr "Notes" #. module: subscription #: selection:subscription.subscription.history,document_id:0 msgid "Sale Order" -msgstr "" +msgstr "Commande de vente" #. module: subscription #: model:ir.model,name:subscription.model_subscription_subscription #: field:subscription.subscription.history,subscription_id:0 msgid "Subscription" -msgstr "" +msgstr "Abonnement" #. module: subscription #: selection:subscription.subscription,interval_type:0 msgid "Days" -msgstr "" +msgstr "Jours" #. module: subscription #: field:subscription.document,active:0 #: field:subscription.subscription,active:0 msgid "Active" -msgstr "" +msgstr "Actif" #. module: subscription #: field:subscription.subscription,cron_id:0 msgid "Cron Job" -msgstr "" +msgstr "Planificateur de tâche" #. module: subscription #: field:subscription.subscription,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partenaire" #. module: subscription #: view:subscription.subscription:0 msgid "Subsription Data" -msgstr "" +msgstr "Données de l'Abonnement" #. module: subscription #: field:subscription.document.fields,document_id:0 @@ -205,12 +203,12 @@ msgstr "" #. module: subscription #: view:subscription.subscription:0 msgid "Process" -msgstr "" +msgstr "Processus" #. module: subscription #: selection:subscription.document.fields,value:0 msgid "False" -msgstr "" +msgstr "Faux" #. module: subscription #: model:ir.model,name:subscription.model_subscription_document @@ -221,18 +219,12 @@ msgstr "" #: model:ir.actions.act_window,name:subscription.action_subscription_form #: model:ir.ui.menu,name:subscription.menu_action_subscription_form msgid "All Subscriptions" -msgstr "" +msgstr "Tous les Abonnements" #. module: subscription #: model:ir.ui.menu,name:subscription.menu_action_document_form msgid "Document Types" -msgstr "" - -#. module: subscription -#, python-format -#: code:addons/subscription/subscription.py:0 -msgid "Wrong Source Document !" -msgstr "" +msgstr "Types de Documents" #. module: subscription #: view:subscription.document.fields:0 @@ -242,26 +234,25 @@ msgstr "" #. module: subscription #: selection:subscription.subscription,state:0 msgid "Done" -msgstr "" +msgstr "Terminer" #. module: subscription #: selection:subscription.subscription.history,document_id:0 msgid "Invoice" -msgstr "" +msgstr "Facture" #. module: subscription #: field:subscription.document.fields,value:0 msgid "Default Value" -msgstr "" +msgstr "Valeur par défaut" #. module: subscription #: field:subscription.subscription,doc_lines:0 #: view:subscription.subscription:0 msgid "Documents created" -msgstr "" +msgstr "Document crée" #. module: subscription #: model:ir.ui.menu,name:subscription.menu_tools msgid "Tools" -msgstr "" - +msgstr "Outils" |