[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120606053652-i211xuzmdo1qkgqr

addons/account/__openerp__.py

@@ -23,7 +23,6 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     "description": """
 Accounting and Financial Management.
 ====================================

addons/account/account.py

@@ -893,7 +893,7 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True),
     }
     _defaults = {
         'state': 'draft',
@@ -990,7 +990,7 @@ class account_period(osv.osv):
         'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
         'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
-        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
@@ -1117,7 +1117,7 @@ class account_journal_period(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
         'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
-        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
@@ -1264,7 +1264,7 @@ class account_move(osv.osv):
         'ref': fields.char('Reference', size=64),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
-        'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True,
             help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
@@ -2350,7 +2350,7 @@ class account_subscription(osv.osv):
         'period_total': fields.integer('Number of Periods', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
     _defaults = {
@@ -2905,7 +2905,7 @@ class account_fiscal_position_template(osv.osv):
         obj_fiscal_position = self.pool.get('account.fiscal.position')
         fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
         for position in self.browse(cr, uid, fp_ids, context=context):
-            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name})
+            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note})
             for tax in position.tax_ids:
                 obj_tax_fp.create(cr, uid, {
                     'tax_src_id': tax_template_ref[tax.tax_src_id.id],

addons/account/account_bank_statement.py

@@ -127,6 +127,7 @@ class account_bank_statement(osv.osv):
     _order = "date desc, id desc"
     _name = "account.bank.statement"
     _description = "Bank Statement"
+    _inherit = ['mail.thread']
     _columns = {
         'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
         'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}, select=True),
@@ -153,7 +154,7 @@ class account_bank_statement(osv.osv):
         'state': fields.selection([('draft', 'New'),
                                    ('open','Open'), # used by cash statements
                                    ('confirm', 'Closed')],
-                                   'State', required=True, readonly="1",
+                                   'Status', required=True, readonly="1",
                                    help='When new statement is created the state will be \'Draft\'.\n'
                                         'And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
         'currency': fields.function(_currency, string='Currency',
@@ -364,7 +365,7 @@ class account_bank_statement(osv.osv):
                     'name': st_number,
                     'balance_end_real': st.balance_end
             }, context=context)
-            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
+            self.message_append_note(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):

addons/account/account_invoice.py

@@ -205,13 +205,14 @@ class account_invoice(osv.osv):
             ('proforma2','Pro-forma'),
             ('open','Open'),
             ('paid','Paid'),
-            ('cancel','Cancelled')
+            ('cancel','Cancelled'),
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
             \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
+        'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."),
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
@@ -273,7 +274,7 @@ class account_invoice(osv.osv):
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
@@ -286,6 +287,7 @@ class account_invoice(osv.osv):
         'check_total': 0.0,
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
+        'sent': False,
     }
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
@@ -366,6 +368,47 @@ class account_invoice(osv.osv):
             else:
                 raise orm.except_orm(_('Unknown Error'), str(e))
 
+    def invoice_print(self, cr, uid, ids, context=None):
+        '''
+        This function prints the invoice and mark it as sent, so that we can see more easily the next step of the workflow
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        self.write(cr, uid, ids, {'sent': True}, context=context)
+        datas = {
+             'ids': ids,
+             'model': 'account.invoice',
+             'form': self.read(cr, uid, ids[0], context=context)
+        }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.invoice',
+            'datas': datas,
+            'nodestroy' : True
+        }
+
+    def action_invoice_sent(self, cr, uid, ids, context=None):
+        '''
+        This function opens a window to compose an email, with the edi invoice template message loaded by default
+        '''
+        mod_obj = self.pool.get('ir.model.data')
+        template = mod_obj.get_object_reference(cr, uid, 'account', 'email_template_edi_invoice')
+        template_id = template and template[1] or False
+        res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
+        res_id = res and res[1] or False
+        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
+        ctx.update({'mail.compose.template_id': template_id})
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'mail.compose.message',
+                'views': [(res_id, 'form')],
+                'view_id': res_id,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': ctx,
+                'nodestroy': True,
+        }
+
     def confirm_paid(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -604,6 +647,7 @@ class account_invoice(osv.osv):
             'move_name':False,
             'internal_number': False,
             'period_id': False,
+            'sent': False,
         })
         if 'date_invoice' not in default:
             default.update({
@@ -938,7 +982,6 @@ class account_invoice(osv.osv):
     
     def invoice_validate(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
-        self.invoice_validate_send_note(cr, uid, ids, context=context)
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -1002,7 +1045,7 @@ class account_invoice(osv.osv):
                 if obj_inv.type in ('out_invoice', 'out_refund'):
                     ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _("Invoice  '%s' is validated.") % name
-                self.log(cr, uid, inv_id, message, context=ctx)
+                self.message_append_note(cr, uid, [inv_id], body=message, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1232,7 +1275,7 @@ class account_invoice(osv.osv):
             # TODO: use currency's formatting function
             msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
                     (name, pay_amount, code, invoice.amount_total, code, total, code)
-            self.log(cr, uid, inv_id,  msg)
+            self.message_append_note(cr, uid, [inv_id], body=msg, context=context)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
@@ -1256,10 +1299,6 @@ class account_invoice(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
             
-    def invoice_validate_send_note(self, cr, uid, ids, context=None):
-         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>validated</b>.") % (self._get_document_type(obj.type)), context=context)
-    
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
          for obj in self.browse(cr, uid, ids, context=context):
             self.message_append_note(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
@@ -1307,7 +1346,7 @@ class account_invoice_line(osv.osv):
     _description = "Invoice Line"
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
+        'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
@@ -1669,4 +1708,14 @@ class res_partner(osv.osv):
 
 res_partner()
 
+class mail_message(osv.osv):
+    _name = 'mail.message'
+    _inherit = 'mail.message'
+
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        if message.model == 'account.invoice':
+            self.pool.get('account.invoice').write(cr, uid, [message.res_id], {'sent':True}, context=context)
+        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+
+mail_message()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_invoice_view.xml

@@ -132,8 +132,6 @@
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
-
-                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -144,10 +142,19 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Supplier Invoice">
-                    <group col="8" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                </header>
+                <sheet string="Supplier Invoice" layout="auto">
+                    <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <field name="number" readonly="1"/>
+                        <field name="number" readonly="1" placeholder="PO0025"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
@@ -165,7 +172,7 @@
                         <page string="Invoice">
                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="reference_type" nolabel="1" size="0"/>
-                            <field name="reference" nolabel="1"/>
+                            <field name="reference" nolabel="1" placeholder="Payment Reference"/>
                             <field name="date_due"/>
                             <field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
@@ -203,15 +210,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -221,7 +220,7 @@
                             <field name="payment_term" widget="selection"/>
                             <field name="name"/>
                             <newline/>
-                            <field name="origin"/>
+                            <field name="origin" placeholder="PO0025"/>
                             <field name="user_id"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
@@ -243,7 +242,10 @@
                             </field>
                         </page>
                     </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -253,8 +255,21 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice">
-                    <group colspan="4" col="8">
+                <form layout="manual">
+                <header>
+                	<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
+                	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                </header>
+                <sheet string="Invoice" layout="auto">
+                    <group colspan="4" col="8" class="oe_form_header">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
@@ -269,7 +284,8 @@
                     <field name="payment_term" widget="selection"/>
                     <newline/>
                     <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
-                    <field name="name"/>
+                    <field name="name" placeholder="Project XYZ"/>
+                    <field name="sent"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
@@ -297,17 +313,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
-                                <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -317,7 +323,7 @@
                             <field name="user_id"/>
                             <newline/>
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
-                            <field name="origin"/>
+                            <field name="origin" placeholder="SO0032"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -338,7 +344,10 @@
                             </field>
                         </page>
                     </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -360,7 +369,7 @@
                             string="Reference"
                             filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesman">
+                        <field name="user_id" widget="selection" string="Salesperson">
                             <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
                     </group>
@@ -375,7 +384,7 @@
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>

addons/account/account_menuitem.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="14"
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>

addons/account/account_move_line.py

@@ -508,7 +508,7 @@ class account_move_line(osv.osv):
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
         'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
-        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
+        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\

addons/account/account_report.xml

@@ -21,7 +21,7 @@
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
             usage="default"
-            multi="True"/>
+            />
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 

addons/account/account_view.xml

@@ -11,8 +11,14 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscalyear">
-                    <group>
+                <form layout="manual">
+                <header>
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </header>
+                <sheet string="Fiscalyear" layout="auto">
+                    <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -30,12 +36,7 @@
                             <field name="special"/>
                         </form>
                     </field>
-                    <separator colspan="4" string="States"/>
-                    <group>
-                        <field name="state" select="1" readonly="1"/>
-                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -68,7 +69,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -92,7 +93,13 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Period">
+                <form layout="manual">
+                <header>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </header>
+                <sheet string="Period" layout="auto">
+                <group class="oe_form_header">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -100,9 +107,8 @@
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id" widget="selection"/>
                     <field name="special"/>
-                    <separator colspan="4" string="States"/>
-                    <field name="state"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -119,8 +125,6 @@
                     <field name="special"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new" groups="account.group_account_manager"/>
-                    <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -535,7 +539,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
@@ -557,8 +561,6 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end" invisible="1"/>
                     <field name="state"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -580,7 +582,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
@@ -592,8 +594,15 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -637,13 +646,7 @@
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                        <field name="balance_end"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -653,8 +656,15 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
+                    <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet string="Bank Statement" layout="auto">
+                    <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
@@ -684,12 +694,9 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1186,7 +1193,7 @@
                             <newline/>
                             <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                             <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                            <separator colspan="4" string="State"/>
+                            <separator colspan="4" string="Status"/>
                             <newline/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
@@ -1333,7 +1340,6 @@
                     <field name="amount" sum="Total Amount"/>
                     <field name="to_check"/>
                     <field name="state"/>
-                    <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -1342,8 +1348,14 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entries">
-                    <group colspan="4" col="6">
+                <form layout="manual">
+                <header>
+                    <button name="button_validate" states="draft" string="Post" type="object"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </header>
+                <sheet string="Journal Entries" layout="auto">
+                    <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
                         <field name="to_check"/>
@@ -1452,13 +1464,9 @@
                             </field>
                             <separator colspan="4" string="Internal Note"/>
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
-                            <group col="4" colspan="4">
-                                <field name="state" select="1"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
-                            </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -2599,9 +2607,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <field name="state"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
-                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
                 </tree>
             </field>
         </record>
@@ -2611,8 +2616,15 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statement">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
+                    <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet string="Statement" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
@@ -2701,12 +2713,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="balance_end_cash"/>
                         </group>
                     </group>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object"/>
-                        <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
-                    </group>
+                </sheet>
                 </form>
             </field>
         </record>

addons/account/board_account_view.xml

@@ -63,8 +63,6 @@
 
         <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
-
 
     </data>
 </openerp>

addons/account/company_view.xml

@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
-                      <field name="paypal_account" />
+                      <field name="paypal_account"  placeholder="sales@openerp.com"/>
                 </field>
             </field>
         </record>

addons/account/data/account_data.xml

@@ -125,7 +125,7 @@
         </record>
         <record id="bank_col23" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -212,7 +212,7 @@
         </record>
         <record id="bank_col23_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -287,7 +287,7 @@
         </record>
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -368,7 +368,7 @@
         </record>
         <record id="sp_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
@@ -454,7 +454,7 @@
         </record>
         <record id="sp_refund_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">State</field>
+            <field name="name">Status</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>

addons/account/edi/invoice.py

@@ -21,6 +21,7 @@
 
 from osv import fields, osv, orm
 from edi import EDIMixin
+from edi.models import edi
 
 INVOICE_LINE_EDI_STRUCT = {
     'name': True,
@@ -71,6 +72,16 @@ INVOICE_EDI_STRUCT = {
 class account_invoice(osv.osv, EDIMixin):
     _inherit = 'account.invoice'
 
+    def action_invoice_sent(self, cr, uid, ids, context=None):
+        """"Override this method to add a link to mail"""
+        if context is None:
+            context = {}
+        invoice_objs = self.browse(cr, uid, ids, context=context) 
+        edi_token = self.pool.get('edi.document').export_edi(cr, uid, invoice_objs, context = context)[0]
+        web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        ctx = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
+        return super(account_invoice, self).action_invoice_sent(cr, uid, ids, context=ctx)
+
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Exports a supplier or customer invoice"""
         edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT)

addons/account/i18n/fr.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-22 12:17+0000\n"
+"Last-Translator: Francois Degrave <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
@@ -3767,7 +3767,7 @@ msgstr "Date"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr "Message"
+msgstr "Comptabiliser"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -10886,7 +10886,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Créer un avoir"
+msgstr "Avoir"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice

addons/account/i18n/hu.po

@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-05-17 13:09+0000\n"
+"Last-Translator: Peter <herczegp@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "előző hónap"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3962,7 +3961,7 @@ msgstr "Gyűjtőkód karton"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Eszközök"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -6825,7 +6824,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
-msgstr ""
+msgstr "Napló"
 
 #. module: account
 #: view:account.partner.balance:0

addons/account/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-15 06:17+0000\n"
+"PO-Revision-Date: 2012-06-01 01:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-02 05:35+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1662,7 +1662,7 @@ msgstr "切り離された仕訳帳順序"
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "責任担当"
+msgstr "担当"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1679,7 +1679,7 @@ msgstr "請求書のキャンセル：現在の請求書をキャンセルする
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr "請求"
+msgstr "請求中"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
@@ -2615,7 +2615,7 @@ msgstr "銀行消し込み"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "ディスク（%）"
+msgstr "割引（％）"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -4445,7 +4445,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "損益勘定を使うためは空のままとして下さい。"
+msgstr "収益勘定を使うためは空のままとして下さい。"
 
 #. module: account
 #: code:addons/account/account.py:3299
@@ -5300,7 +5300,7 @@ msgstr "年度エントリー仕訳帳の末尾"
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "設定エラー。"
+msgstr "設定エラーです。"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -5592,7 +5592,7 @@ msgstr "買掛金合計"
 #: model:account.account.type,name:account.data_account_type_income
 #: model:account.financial.report,name:account.account_financial_report_income0
 msgid "Income"
-msgstr "収益"
+msgstr "収入"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -5888,7 +5888,7 @@ msgstr "サブスクリプション期間中"
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "会計ポジション注釈："
+msgstr "会計ポジションの注釈："
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -7024,7 +7024,7 @@ msgstr "財務レポートの階層"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr "製品単位"
+msgstr "製品の単位"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -7335,7 +7335,7 @@ msgstr ""
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "請求行"
+msgstr "請求書行"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7590,7 +7590,7 @@ msgstr "仕訳帳の仕訳帳エントリー記帳"
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "消費税（売上）"
+msgstr "消費税"
 
 #. module: account
 #: field:account.financial.report,name:0
@@ -8156,7 +8156,7 @@ msgstr "一部が支払済の請求書のキャンセルはできません。ま
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "収益分類のアカウント"
+msgstr "収入分類のアカウント"
 
 #. module: account
 #: field:account.account,adjusted_balance:0
@@ -9454,7 +9454,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "保留"
+msgstr "保留中"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -10758,3 +10758,9 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 
 #~ msgid "Description On Invoices"
 #~ msgstr "請求書説明"
+
+#~ msgid "Write-Off journal"
+#~ msgstr "償却仕訳帳"
+
+#~ msgid "Full Payment"
+#~ msgstr "全支払"

addons/account/i18n/pt.po

@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-06-05 09:38+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "mês anterior"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Pagamento do sistema"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Outras configurações"
+msgstr "Outras Configurações"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -57,7 +57,7 @@ msgstr "Estatisticas da Conta"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Proforma/ Abrir / Faturas Pagas"
+msgstr "Proforma / Abrir / Faturas Pagas"
 
 #. module: account
 #: field:report.invoice.created,residual:0
@@ -93,7 +93,7 @@ msgstr "Antiguidade de saldos de clientes até hoje."
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "Importar da fatura ou do pagamento"
+msgstr "Importar da fatura ou pagamento"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -274,7 +274,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr "Sub-total :"
+msgstr "Sub-Total :"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -404,12 +404,12 @@ msgstr "account.bank.accounts.wizard"
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "Data de criação"
+msgstr "Data da Criação"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Nota de Crédito de Compras"
+msgstr "Reembolso da Compra"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -686,7 +686,7 @@ msgstr "Fechar periodo"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Relatório Comum de Conta de Paceiros"
+msgstr "Relatório Comum de Conta de Parceiros"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -715,7 +715,7 @@ msgstr "Todos os movimentos a conciliar devem ser da mesma empresa."
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr "Contas a receber"
+msgstr "Contas a Receber"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -873,6 +873,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"Ao fazer transações multi-moeda, pode perder ou ganhar alguma quantia devida "
+"a alterações da taxa de câmbio. Este menu dá uma previsão do ganho ou perda "
+"que percebeu se essas transações foram terminadas hoje. Somente para contas "
+"com um conjunto moeda secundária."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -881,7 +885,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr "setembro"
+msgstr "Setembro"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -1000,7 +1004,7 @@ msgstr "Responsabilidade"
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Filtros Extendidos..."
+msgstr "Filtros Avançados..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -1157,7 +1161,7 @@ msgstr "Em disputa"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Registos de Caixa"
+msgstr "Caixa Registadora"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1289,7 +1293,7 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
-"Não pode usar esta conta geral nesta diário, verificar 'Controles de "
+"Não pode usar esta conta geral neste diário, verificar 'Controles de "
 "Entrada' do guia do diário relacionado!"
 
 #. module: account
@@ -1434,7 +1438,7 @@ msgstr "Saldo de abertura"
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr "Voltar a rascunho"
+msgstr "Redefinir para rascunho"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1518,7 +1522,7 @@ msgstr "Calcular impostos"
 #: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "Nº de dígitos"
+msgstr "# de Dígitos"
 
 #. module: account
 #: field:account.journal,entry_posted:0
@@ -1529,7 +1533,7 @@ msgstr "Saltar o estado \"Rascunho\" para lançamentos manuais"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr "Total, com taxas"
+msgstr "Total sem Impostos"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1547,7 +1551,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr "Nº. de movimentos "
+msgstr "# de Entradas "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1652,7 +1656,7 @@ msgstr "Conta de imposto para notas de crédito"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Linhas de extrato"
+msgstr "Linhas do extrato"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1681,7 +1685,7 @@ msgstr "Data/Código"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr "Contas gerais"
+msgstr "Conta Geral"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -1730,8 +1734,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
-"Anular fatura: Cria uma nota de crédito, valida-a e aloca-a à fatura atual, "
-"Ficando as duas no estado pago."
+"Cancelar fatura: Cria uma nota de crédito, valida-a e aloca-a à fatura "
+"atual, Ficando as duas no estado pago."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1865,7 +1869,7 @@ msgstr "Erro!"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Valor de crédito ou débito errado no movimento contabilístico !"
+msgstr "Valor de Crédito ou débito errado na entrada de contabilidade!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1898,7 +1902,7 @@ msgstr "Baseado em"
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Lançamento de diário"
+msgstr "Entradas no diário"
 
 #. module: account
 #: view:account.tax:0
@@ -1932,7 +1936,7 @@ msgstr "Venda / Compra Diário"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "Conta analítica"
+msgstr "Conta Analítica"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
@@ -2045,7 +2049,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr "Valor sem Impostos"
+msgstr "Montante sem Impostos"
 
 #. module: account
 #: help:account.tax,active:0
@@ -2053,7 +2057,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
-"Se o campo activo for definido como 'Falso', ele permitirá que oculte o "
+"Se o campo ativo for definido como 'Falso', ele permitirá que oculte o "
 "imposto sem o remover."
 
 #. module: account
@@ -2123,7 +2127,7 @@ msgstr "Importar da fatura"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr "janeiro"
+msgstr "Janeiro"
 
 #. module: account
 #: view:account.journal:0
@@ -2261,7 +2265,7 @@ msgstr "ECNJ"
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "Em execução"
+msgstr "Em Funcionamento"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2307,7 +2311,7 @@ msgstr "# de Qt. de Artigos "
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Template Artigo"
+msgstr "Template do Artigo"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2505,7 +2509,7 @@ msgstr "Progresso de 30% ao fim de 30 dias"
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr "Movimentos Dereconciliado"
+msgstr "Movimentos Desreconciliados"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2606,7 +2610,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr "Seleccione o período"
+msgstr "Selecione o período"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
@@ -2679,7 +2683,7 @@ msgstr "Erro de Configuração!"
 #. module: account
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr "Preço médio"
+msgstr "Preço Médio"
 
 #. module: account
 #: report:account.overdue:0
@@ -2824,8 +2828,8 @@ msgid ""
 "always skipping that state."
 msgstr ""
 "Marque esta caixa se não pretende que os novos movimentos do diário passem "
-"através do estado \"rascunho\" e vão directamente para o estado "
-"\"Publicado\" sem qualquer validação manual.\n"
+"através do estado 'rascunho' e vão diretamente para o estado 'Publicado' sem "
+"qualquer validação manual.\n"
 "Note que os movimentos do diário que são automaticamente criados pelo "
 "sistema também ignoram este estado."
 
@@ -2949,7 +2953,7 @@ msgstr "Obrigatório"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Conta de gastos"
+msgstr "Conta de Despesas"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -2999,7 +3003,7 @@ msgid ""
 msgstr ""
 "A data de maturidade dos movimentos gerados por este modelo. Pode escolher "
 "entre a data de criação ou a data de criação dos movimentos mais os termos "
-"de pagamento dos Paceiros."
+"de pagamento dos Parceiros."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -3023,7 +3027,7 @@ msgstr "Lucro e prejuízo"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Posição fiscal"
+msgstr "Posição Fiscal"
 
 #. module: account
 #: code:addons/account/account_invoice.py:735
@@ -3044,7 +3048,7 @@ msgstr "Um parceiro por página"
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr "Contas-filho"
+msgstr "Descendentes"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3097,7 +3101,7 @@ msgstr "Transação a dinheiro"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "Conta bancária"
+msgstr "Conta Bancária"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -3190,7 +3194,7 @@ msgstr "BNK"
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr "Linhas da analítica"
+msgstr "Linhas analíticas"
 
 #. module: account
 #: view:account.invoice:0
@@ -3220,7 +3224,7 @@ msgstr "Começa em"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "Balancete de Contas de Terceiro"
+msgstr "Balancete de Contas do Parceiro"
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -8774,7 +8778,7 @@ msgstr "Diário de Compra"
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
 msgstr ""
-"Nota de crédito: Emite uma nota de crédito, para ser editada / confirmada à "
+"Estornar fatura: Emite uma  nota de crédito, para ser editada / confirmada à "
 "mão."
 
 #. module: account
@@ -10690,7 +10694,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Descrição de Faturas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart

addons/account/i18n/zh_TW.po

@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 10:01+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-06-05 02:38+0000\n"
+"Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "上月"
+msgstr "上個月"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -419,7 +419,7 @@ msgstr "貸方合計"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "開啟反核銷"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -2737,7 +2737,7 @@ msgstr "要設置期初餘額需在憑證簿設置中勾選合併選項"
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "稅碼"
 
 #. module: account
 #: view:account.account:0
@@ -4593,7 +4593,7 @@ msgstr "已付"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "您確定嗎？"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5930,7 +5930,7 @@ msgstr "銷售稅(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "根據這個範本建立使用者"
 
 #. module: account
 #: view:account.account.type:0
@@ -7868,7 +7868,7 @@ msgstr "反向輔助核算餘額 -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr ""
+msgstr "開啟銀行核銷"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9126,7 +9126,7 @@ msgstr "為了對賬，您必須在賬簿中定義一個銀行帳號。"
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr ""
+msgstr "核銷交易"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu

addons/account/project/project_view.xml

@@ -46,7 +46,7 @@
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -80,7 +80,8 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic account">
+                <form layout="manual">
+                <sheet string="Analytic account" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" colspan="4"/>
                         <field name="code"/>
@@ -106,6 +107,7 @@
                             <field colspan="4" name="description" nolabel="1"/>
                         </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>

addons/account/report/account_entries_report.py

@@ -51,7 +51,7 @@ class account_entries_report(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True),
-        'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True),
+        'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True),
         'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
         'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
         'partner_id': fields.many2one('res.partner','Partner', readonly=True),

addons/account/report/account_invoice_report.py

@@ -45,7 +45,7 @@ class account_invoice_report(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'currency_rate': fields.float('Currency Rate', readonly=True),

addons/account/report/account_invoice_report_view.xml

@@ -107,12 +107,12 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>

addons/account/report/account_print_invoice.rml

@@ -191,7 +191,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
     <td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Code</para>

addons/account/report/account_report.py

@@ -175,7 +175,7 @@ class report_invoice_created(osv.osv):
             ('open','Open'),
             ('paid','Done'),
             ('cancel','Cancelled')
-        ],'State', readonly=True),
+        ],'Status', readonly=True),
         'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."),
         'create_date': fields.datetime('Create Date', readonly=True)
     }

addons/account/res_config_view.xml

@@ -16,10 +16,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Accounting" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <field name="has_default_company" invisible="1" />
                         <field name="has_chart_of_accounts" invisible="1"/>

addons/account/wizard/account_financial_report_view.xml

@@ -53,7 +53,7 @@
              <field name="view_mode">form</field>
              <field name="view_id" ref="accounting_report_view"/>
              <field name="target">new</field>
-             <field name="context"></field>
+             <field name="context">{}</field>
              <field name="context" eval="{'default_account_report_id':ref('account.account_financial_report_profitandloss0')}"/>
         </record>
         <menuitem icon="STOCK_PRINT" name="Profit And Loss" action="action_account_report_pl" id="menu_account_report_pl" parent="final_accounting_reports"/>

addons/account_accountant/__openerp__.py

@@ -24,7 +24,6 @@
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
     "sequence": 10,
-    'complexity': "normal",
     "description": """
 Accounting Access Rights.
 =========================

addons/account_analytic_analysis/__openerp__.py

@@ -24,7 +24,6 @@
     'name': 'Contracts Management',
     'version': '1.1',
     'category': 'Sales Management',
-    'complexity': "normal",
     'description': """
 This module is for modifying account analytic view to show important data to project manager of services companies.
 ===================================================================================================================

addons/account_analytic_analysis/account_analytic_analysis_menu.xml

@@ -43,7 +43,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>

addons/account_analytic_analysis/i18n/pt.po

@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-09 09:33+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-05-31 15:05+0000\n"
+"Last-Translator: Marcelo Almeida <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:32+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Receita por hora (real)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Processado com a fórmula: Preço Máximo da Factura - Montante Facturado."
+"Calculado utilizando a fórmula: Valor Máximo da Fatura - Valor da Fatura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -38,11 +38,13 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
+"Os contratos a serem renovados, porque o prazo é passado ou as horas de "
+"trabalho são maiores do que as horas atribuídas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "Contratos pendentes de renovação com o seu cliente"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -50,31 +52,33 @@ msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Número de tempo (horas ou dias) (de Diário do  tipo 'geral') que podem ser "
+"faturados, se fatura com base na conta analítica"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline in one month."
-msgstr ""
+msgstr "Contas Analíticas com um prazo limite ultrapassando um mês."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupo por..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Criar Fatura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "Data da última factura"
+msgstr "Data da última fatura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -87,16 +91,18 @@ msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
 msgstr ""
+"Número de tempo que gastou na conta analítica (da folha de horas). Ele "
+"calcula quantidades em todos os Diários do tipo 'geral'."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Contractos em progresso"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "Quantidade em atraso"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -108,6 +114,12 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"Vai encontrar aqui os contratos a serem renovados, porque o prazo é passado "
+"ou as horas de trabalho são maiores do que as horas atribuídas. OpenERP "
+"define automaticamente essas contas analíticas para o estado pendente, a fim "
+"de emitir um aviso durante a gravação da folha de horas. Vendedores devem "
+"rever todas as contas pendentes e reabrir ou fechar o acordo com a "
+"negociação com o cliente."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -117,7 +129,7 @@ msgstr "Retorno Teórico"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "Tempo não faturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -125,13 +137,13 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"Se facturado dos custos, esta é a data do último trabalho ou dos custos que "
-"foram facturados."
+"Se faturado dos custos, esta é a data do último trabalho ou dos custos que "
+"foram faturados."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "Para renovar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -141,24 +153,26 @@ msgstr "Data do Último Custo/Trabalho"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Tempo faturado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
 msgstr ""
+"Um contrato em OpenERP é um relato analítico a ter num conjunto parceiro "
+"sobre ele."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tempo Restante"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Contratos para renovar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -168,7 +182,7 @@ msgstr "Margem Teórica"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " +1 mês"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -177,29 +191,29 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
-"Baseado nos custos que teve no projecto, qual é que seria o rendimento se "
-"todos estes custos fossem facturados ao preço normal da venda fornecidos "
-"pela tabela de preço."
+"Baseado nos custos que teve no projeto, qual é que seria o rendimento se "
+"todos estes custos fossem faturados ao preço normal da venda fornecidos pela "
+"tabela de preço."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr "Montante não Facturado"
+msgstr "Montante não Faturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Processado ao utilizar a fórmula: Montante Facturado - Custo Total."
+msgstr "Processado ao utilizar a fórmula: Montante Faturado - Custo Total."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "Ascendente"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -221,17 +235,17 @@ msgstr "Resumo de horas por utilizador"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Montante Facturado"
+msgstr "Montante Faturado"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Data do Último Custo Facturado"
+msgstr "Data do Último Custo Faturado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "Contrato"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -246,7 +260,7 @@ msgstr "Margem Real"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr "Montante da facturação total do cliente para esta conta"
+msgstr "Montante da faturação total do cliente para esta conta"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -266,7 +280,7 @@ msgstr "Receita Restante"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "Cálculo utilizando a fórmula: Tempo máximo - Tempo Total"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -274,6 +288,8 @@ msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
 msgstr ""
+"Número de tempo (horas ou dias) que pode ser faturado mais aqueles que já "
+"tenham sido faturados."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -281,13 +297,13 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
-"Se facturado a partir da conta analítica, o montante restante que pode "
-"facturar ao cliente baseado nos custos totais."
+"Se faturado a partir da conta analítica, o montante restante que pode "
+"faturar ao cliente baseado nos custos totais."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Calculado através da fórmula: Valor faturado / Tempo Total"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -312,38 +328,38 @@ msgstr "Conta Analítica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "Contractos"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Gestor"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr "Todas os Movimentos não Facturados"
+msgstr "Todos os Movimentos não Faturados"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
+msgstr "Se for fatura dos custos, esta é a data da última faturada."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Parceiro associado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Contratos que não são atribuídos a um gestor de conta."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
@@ -358,18 +374,12 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
-"Total de custos para esta conta. Que inclui custos reais (das facturas) e "
+"Total de custos para esta conta. Que inclui custos reais (das faturas) e "
 "custos indirectos, como o tempo gasto em folha de horas."
 
 #~ msgid "Invoicing"
 #~ msgstr "Facturação"
 
-#~ msgid ""
-#~ "Number of hours that can be invoiced plus those that already have been "
-#~ "invoiced."
-#~ msgstr ""
-#~ "Número de horas que podem ser facturadas mais as que já foram facturadas."
-
 #~ msgid "Hours summary by user"
 #~ msgstr "Resumo de horas por utilizador"
 
@@ -505,7 +515,15 @@ msgstr ""
 #~ "Pode também ver o relatório sumário de contas analíticas\n"
 #~ "por utilizador bem como por mês.\n"
 
+#~ msgid ""
+#~ "Number of hours that can be invoiced plus those that already have been "
+#~ "invoiced."
+#~ msgstr ""
+#~ "Número de horas que podem ser facturadas mais aquelas que já tenham sido "
+#~ "facturadas."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
-#~ msgstr "Erro! A divisa tem que ser a mesma que a da empresa seleccionada"
+#~ msgstr ""
+#~ "Erro! A divisa tem que ser a mesma que a divisa da empresa seleccionada"

addons/account_analytic_default/__openerp__.py

@@ -23,7 +23,6 @@
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
     "category": 'Accounting & Finance',
-    'complexity': "normal",
     'description': """Set default values for your analytic accounts
 Allows to automatically select analytic accounts based on criterions:
 =====================================================================

addons/account_analytic_plans/__openerp__.py

@@ -24,7 +24,6 @@
     'name': 'Multiple Analytic Plans',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 This module allows to use several analytic plans, according to the general journal.
 ===================================================================================

addons/account_analytic_plans/account_analytic_plans_view.xml

@@ -303,10 +303,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
                     <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
                 </xpath>
             </field>

addons/account_anglo_saxon/__openerp__.py

@@ -23,7 +23,6 @@
     "version": "1.2",
     "author": "OpenERP SA, Veritos",
     "website": "http://tinyerp.com - http://veritos.nl",
-    'complexity': "normal",
     "description": """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================

addons/account_anglo_saxon/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-28 01:18+0000\n"
+"PO-Revision-Date: 2012-05-31 06:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
+"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -35,7 +35,7 @@ msgstr "製品分類"
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "参照は会社内ではユニークでなければいけません。"
+msgstr "参照は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
@@ -87,7 +87,7 @@ msgstr "出庫票"
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとにユニークでなければいけません。"
+msgstr "請求書番号は会社ごとに固有である必要があります。"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0

addons/account_asset/__openerp__.py

@@ -51,7 +51,7 @@
     ],
     "auto_install": False,
     "installable": True,
-    "application": True,
+    "application": False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account_asset/account_asset.py

@@ -223,7 +223,7 @@ class account_asset_asset(osv.osv):
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
         'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True,
+        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True,
                                   help="When an asset is created, the state is 'Draft'.\n" \
                                        "If the asset is confirmed, the state goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \
                                        "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that state."),

addons/account_asset/account_asset_view.xml

@@ -78,8 +78,15 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-           <form string="Asset">
-              <group col="6" colspan="4">
+           <form layout="manual">
+           <div class="oe_form_topbar">
+               <button name="validate" states="draft" string="Confirm Asset" type="object"/>
+               <button name="set_to_close" states="open" string="Set to Close" type="object"/>
+               <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
+               <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+           </div>
+           <sheet string="Asset" layout="auto">
+              <group col="6" colspan="4" class="oe_form_header">
                  <field name="name"/>
                  <field name="category_id" on_change="onchange_category_id(category_id)"/>
                  <field name="code"/>
@@ -111,14 +118,6 @@
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                     </group>
-                    <newline/>
-                    <separator string="" colspan="4"/>
-                    <field name="state" readonly="1" colspan="2"/>
-                    <group colspan="2" col="4">
-                       <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-                       <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
-                       <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-                    </group>
                  </page>
                  <page string="Depreciation Board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
@@ -148,6 +147,7 @@
                     <field name="note" nolabel="1"/>
                  </page>
               </notebook>
+              </sheet>
            </form>
        </field>
     </record>

addons/account_asset/i18n/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-22 12:19+0000\n"
+"Last-Translator: Quentin THEURET <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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -621,7 +621,7 @@ msgstr "Prorata temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informations comptables"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice

addons/account_asset/i18n/id.po

@@ -0,0 +1,793 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-21 16:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@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: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Tanggal pembelian aset"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Metode Perhitungan"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Informasi lainnya"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Bulan"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Tanggal"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filter Tambahan..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktur"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Metode Depresiasi"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Tanggal Pembelian"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Mata Uang"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nama"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Hirarki Aset"

addons/account_asset/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-16 19:05+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:37+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -196,7 +196,7 @@ msgstr "会計エントリーにおいて貸方または借方の値が誤って
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr "減価償却行の番号"
+msgstr "減価償却行の数"
 
 #. module: account_asset
 #: view:asset.asset.report:0

addons/account_asset/i18n/pt.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-12-10 11:58+0000\n"
-"Last-Translator: Paulino Ascenção <Unknown>\n"
+"PO-Revision-Date: 2012-05-31 15:07+0000\n"
+"Last-Translator: ThinkOpen Solutions <Unknown>\n"
 "Language-Team: Portuguese <pt@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: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -439,7 +439,7 @@ msgstr "Método tempo"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Informação Analitica"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -620,7 +620,7 @@ msgstr "Prorata Temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informação contabilística"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice

addons/account_asset/report/account_asset_report.py

@@ -33,7 +33,7 @@ class asset_asset_report(osv.osv):
         'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True),
         'asset_category_id': fields.many2one('account.asset.category',string='Asset category'),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', readonly=True),
+        'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', readonly=True),
         'depreciation_value': fields.float('Amount of Depreciation Lines', readonly=True),
         'move_check': fields.boolean('Posted', readonly=True),
         'nbr': fields.integer('# of Depreciation Lines', readonly=True),

addons/account_bank_statement_extensions/account_bank_statement.py

@@ -113,7 +113,7 @@ class account_bank_statement_line(osv.osv):
         'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
             relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
-            'State', required=True, readonly=True),    
+            'Status', required=True, readonly=True),    
         'counterparty_name': fields.char('Counterparty Name', size=35),
         'counterparty_bic': fields.char('Counterparty BIC', size=11),
         'counterparty_number': fields.char('Counterparty Number', size=34),

addons/account_bank_statement_extensions/account_bank_statement_view.xml

@@ -42,17 +42,17 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
+          <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+          <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
             <field name="globalisation_id" string="Glob. Id"/>
             <field name="state" invisible="1"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
+          <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after">
             <field name="val_date"/>
           </xpath>
-          <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
+          <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
             <field name="globalisation_id"/>
             <field name="state" invisible="1"/>
           </xpath>

addons/account_bank_statement_extensions/i18n/gu.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-17 09:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-06-01 04:42+0000\n"
+"Last-Translator: Jalpesh Patel(OpenERP) <pja@tinyerp.com>\n"
 "Language-Team: Gujarati <gu@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: 2012-04-18 04:42+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-06-02 05:35+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -42,7 +42,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
 msgid "Parent Code"
-msgstr "પેરેંટ કોડ"
+msgstr "પિતૃ સંકેત"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Group By..."
-msgstr "ગ્રુપ દ્વારા..."
+msgstr "સમૂહ દ્વારા"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
@@ -80,25 +80,25 @@ msgstr "કાચું"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement"
-msgstr "વિધાન"
+msgstr "નિવેદન"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr ""
+msgstr "પસંદ કરેલ નિવેદન લીટીઓ ખાતરી કરો"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 #: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
 msgid "Bank Statement Balances Report"
-msgstr ""
+msgstr "બેન્ક નિવેદન સિલક અહેવાલ"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Cancel Lines"
-msgstr ""
+msgstr "લીટીઓ રદ કરો"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirm Lines"
-msgstr ""
+msgstr "લીટીઓ પુષ્ટિ કરો"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -134,33 +134,33 @@ msgstr "રોજનામું"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "પુષ્ટિ નિવેદન આવેલ લીટીઓ."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "ધિરાણ વ્યવહારો."
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "પસંદ કરેલ લીટીઓની નિવેદન રદ કરો."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "પ્રતિકૂળ સંખ્યા"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "વ્યવહારો"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "ચેતવણી"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Date"
-msgstr ""
+msgstr "તારીખ"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -181,17 +181,17 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Debit Transactions."
-msgstr ""
+msgstr "ઉધાર વ્યવહારો."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "વિસ્તૃત ગાળકો ..."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirmed lines cannot be changed anymore."
-msgstr ""
+msgstr "પુષ્ટિ લીટીઓ હવે બદલી શકાતી નથી"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -204,47 +204,47 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "ચલણ તારીખો"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
 msgid "Confirm selected statement lines."
-msgstr ""
+msgstr "પસંદ નિવેદન લીટીઓ ખાતરી કરો."
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "શું તમે ખરેખર પસંદિત બેન્ક નિવેદન લાઇન્સ રદ કરવા માંગો છો?"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr ""
+msgstr "નામ"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
-msgstr ""
+msgstr "ISO 20022"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Notes"
-msgstr ""
+msgstr "નોંધ"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "માર્ગદર્શિકા"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "જમા"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "કિંમત"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -254,7 +254,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "પ્રતિકૂળ ચલણ"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
@@ -269,7 +269,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "શું તમે ખરેખર  પસંદિત બેન્ક નિવેદન લાઇન્સ ખાતરી કરવા માંગો છો?"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
@@ -288,7 +288,7 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "કાચું નિવેદન લીટીઓ."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -298,27 +298,27 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "બેન્ક વિધાન લીટી"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "સંકેત"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "પ્રતિકૂળ નામ"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "સંચાર"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "બેંક હિસાબી"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
@@ -328,24 +328,24 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "બેન્ક સ્ટેટમેન્ટ"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "વિધાન લીટી"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "કોડ અજોડ હોવું જ જોઈએ!"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "બેંક વિધાન લીટીઓ"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
@@ -356,17 +356,17 @@ msgstr ""
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "રદ કરો"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "વિધાન લીટીઓ"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "કુલ રકમ"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0

addons/account_bank_statement_extensions/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-16 23:00+0000\n"
+"PO-Revision-Date: 2012-05-23 06:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-04-18 04:42+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -80,14 +80,14 @@ msgstr "ドラフト"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement"
-msgstr "明細書"
+msgstr "取引明細書"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr "選択した明細行の確認"
+msgstr "選択した取引明細書行の確認"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -165,7 +165,7 @@ msgstr "警告"
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr "締切残高"
+msgstr "期末残高"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -176,7 +176,7 @@ msgstr "日付"
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr "国際化金額"
+msgstr "全体の金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -201,7 +201,7 @@ msgid ""
 "valid payments"
 msgstr ""
 "\n"
-"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC / SWIFTコードを定義して下さい。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -221,7 +221,7 @@ msgstr "選択した銀行明細行のキャンセルを本当に行いますか
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr "名称"
+msgstr "氏名"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -295,7 +295,7 @@ msgstr "ドラフト明細行"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr "国際化総額"
+msgstr "全体の金額"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
@@ -340,7 +340,7 @@ msgstr "明細行"
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr "コードは固有でなければなりません。"
+msgstr "コードは固有であるべきです。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0

addons/account_bank_statement_extensions/i18n/ro.po

@@ -0,0 +1,385 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-21 11:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Cauta Tranzactii Bancare"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmat(a)"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Id Glob."
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Cod parinte"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Anuleaza liniile selectate ale extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "Codul RIB si/sau IBAN nu este valabil"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupeaza dupa..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stare"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Ciorna"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirma liniile extrasului de cont selectat"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Raport Sold Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Anuleaza Liniile"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informatii Plata Lot"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirma Liniile"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Operatiune de stergere nepermisa! Va rugam sa mergeti la extrasul de cont "
+"asociat pentru a sterge si/sau modifica aceasta linie a extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tip:"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Liniile confirmate ale Extrasului de cont."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Operatiuni de credit"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "anuleaza liniile extrasului de cont selectat."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Numar Echivalent"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Tranzactii"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Atentionare"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sold la inchidere"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Suma Glob."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Tranzactii de debit."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtre Extinse..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Liniile confirmate nu mai pot fi modificate."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Va rugam sa definiti un cod BIC/Swift la banca pentru ca Contul bancar de "
+"tip IBAN sa faca plati valabile"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Data Valuta"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirmati liniile extrasului de cont selectat."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Sunteti sigur(a) ca doriti sa anulati liniile Extrasului de cont selectat ?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nume"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Suma"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Cont Fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moneda echivalenta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC echivalent"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Coduri subordonate"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Sunteti sigur(a) ca doriti sa confirmati liniile Extrasului de cont selectat "
+"?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Suma de pe chitanta trebuie sa fie aceeasi ca si cea din linia extrasului"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Cod pentru identificarea tranzactiilor care apartin aceluiasi nivel de "
+"globalizare din cadrul unei plati a unui lot"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Linii ale Extrasului de cont ciorna."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Suma Glob."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linie extras de cont"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Cod"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nume echivalent"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicare"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Conturi Bancare"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Jurnalul si perioada aleasa trebuie sa apartina aceleiasi companii."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linie a Extrasului de cont"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Codul trebuie sa fie unic !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linii Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Plati secundare lot"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Anuleaza"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linii Extras de cont"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Suma totala"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID globalizare"

addons/account_budget/__openerp__.py

@@ -24,7 +24,6 @@
     'name': 'Budgets Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
 ==========================================================================

addons/account_budget/account_budget.py

@@ -62,7 +62,7 @@ class crossovered_budget(osv.osv):
         'validating_user_id': fields.many2one('res.users', 'Validate User', readonly=True),
         'date_from': fields.date('Start Date', required=True, states={'done':[('readonly',True)]}),
         'date_to': fields.date('End Date', required=True, states={'done':[('readonly',True)]}),
-        'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('validate','Validated'),('done','Done'),('cancel', 'Cancelled')], 'Status', select=True, required=True, readonly=True),
+        'state' : fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('confirm','Confirmed'),('validate','Validated'),('done','Done')], 'Status', select=True, required=True, readonly=True),
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'crossovered_budget_id', 'Budget Lines', states={'done':[('readonly',True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }

addons/account_budget/account_budget_view.xml

@@ -104,7 +104,17 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budget">
+                <form layout="manual">
+                <header>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                    <button string="Done" name="done" states="validate" type="workflow"   />
+                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet string="Budget" layout="auto">
+                <group class="oe_form_header">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -134,15 +144,8 @@
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
-                            <field name="state" select="1"/>
-                            <group col="4" colspan="2">
-                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
-                                <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                                <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
-
+                    </sheet>
                 </form>
             </field>
         </record>

addons/account_cancel/__openerp__.py

@@ -24,7 +24,6 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
-    'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
 =====================================

addons/account_cancel/account_cancel_view.xml

@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="//button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
@@ -31,7 +31,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                <xpath expr="//button[@name='invoice_cancel']" position="replace">
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>

addons/account_check_writing/i18n/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:29+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:30+0000\n"
+"Last-Translator: Quentin THEURET <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: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -155,7 +155,7 @@ msgstr "Sociétés"
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Default Check Layout"
-msgstr ""
+msgstr "Disposition par défaut des chèques"
 
 #. module: account_check_writing
 #: constraint:account.journal:0

addons/account_check_writing/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:14+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-01 06:41+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-02 05:35+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -100,7 +100,7 @@ msgstr "小切手の振出"
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Discount"
-msgstr "割引き"
+msgstr "割引"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0

addons/account_check_writing/i18n/ro.po

@@ -0,0 +1,213 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-21 12:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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: 2012-05-24 11:09+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cecul in partea de sus"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"Forma de plata prin cec va permite sa tineti evidenta platilor pe care le "
+"faceti furnizorilor d-voastra mai ales prin cecuri. Atunci cand selectati un "
+"furnizor, metoda de plata si o suma pentru plata, OpenERP va propune "
+"reconcilierea platii d-voastra cu facturile deschise ale furnizorului. "
+"Puteti printa cecul"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Printeaza Cecul"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cecul la mijloc"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Cecul in partea de sus este compatibil cu Quicken, QuickBooks si Microsoft "
+"Money. Cecul la mijloc este compatibil cu Peachtree, ACCPAC si DacEasy. "
+"Cecul in partea de jos este compatibil numai cu Peachtree, ACCPAC si DacEasy"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cecul in partea de jos"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Eroare! Nu puteti crea companii recursive."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+"Bifati aceasta casuta daca jurnalul va fi folosit pentru scrierea de cecuri."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permite scrierea de cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descriere"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Scrieti Cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Reducere"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Suma Initiala"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configurare"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permiteti Scrierea de Cecuri"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Plata"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Folositi Cecuri pre-tiparite"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Numele companiei trebuie sa fie unic !"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Data scadentei"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Companii"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Eroare de configurare! Moneda aleasa ar trebui sa fie comuna si conturilor "
+"predefinite."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Sold datorat"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Suma Cec"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Chitanta contabila"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Numele jurnalului trebuie sa fie unic per companie !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Codul jurnalului trebuie sa fie unic per companie !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Suma in litere"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Sold la deschidere"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Alegeti formatul Cecului"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Formatul implicit al cecului"

addons/account_coda/__openerp__.py

@@ -24,7 +24,6 @@
     "version": '2.1',
     "author": 'Noviat',
     "category": 'Accounting & Finance',
-    "complexity": "normal",
     "description": '''
 Module to import CODA bank statements.
 ======================================

addons/account_coda/i18n/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-31 10:33+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: gde (OpenERP) <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: 2012-05-11 05:08+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -70,7 +70,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "Intérêts payés"
 
 #. module: account_coda
 #: field:account.coda.trans.type,parent_id:0

addons/account_coda/i18n/pt.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-20 19:21+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2012-05-31 15:12+0000\n"
+"Last-Translator: ThinkOpen Solutions <Unknown>\n"
 "Language-Team: Portuguese <pt@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: 2012-05-11 05:09+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -1780,6 +1780,8 @@ msgstr "Pagamentos de salários coletivos"
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_17
 msgid "Collected for unsealed deposit of securities, and other parcels"
 msgstr ""
+"Recolhidos para o depósito de valores mobiliários sem lacre, e outras "
+"parcelas"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_004
@@ -1853,7 +1855,7 @@ msgstr "Documentário de taxas gerais de crédito"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_25
 msgid "Renting of direct debit box"
-msgstr ""
+msgstr "Locação de caixa de débito direto"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_52
@@ -1871,6 +1873,9 @@ msgid ""
 "globalisation of which this record is the first.\n"
 "The same code will be repeated at the end of the globalisation."
 msgstr ""
+"O valor que é mencionado (1 a 9), especifica o nível de hierarquia da "
+"globalização do que este disco é o primeiro.\n"
+"O mesmo código será repetido no final da globalização."
 
 #. module: account_coda
 #: field:coda.bank.account,description2:0
@@ -1880,7 +1885,7 @@ msgstr "Descrição da Conta Secundária"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_211
 msgid "Credit arrangement fee | Additional credit arrangement fee"
-msgstr ""
+msgstr "Taxa de arranjo de Crédito | taxa de arranjo de crédito adicional"
 
 #. module: account_coda
 #: view:coda.bank.statement:0
@@ -1925,7 +1930,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_035
 msgid "Charges foreign documentary bill"
-msgstr ""
+msgstr "Encargos conta documentário estrangeiro"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_39
@@ -2191,6 +2196,8 @@ msgid ""
 "Credit transfer or cash payment with reconstituted structured format "
 "communication"
 msgstr ""
+"Transferência de crédito ou pagamento em dinheiro com a comunicação "
+"reconstituída do formato estruturado"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_86
@@ -2279,7 +2286,7 @@ msgstr "Pesquisar Extratos Bancários CODA"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_410
 msgid "Reclamation charges"
-msgstr ""
+msgstr "Taxas de Contestação"
 
 #. module: account_coda
 #: model:ir.actions.act_window,help:account_coda.action_coda_bank_statements
@@ -2347,7 +2354,7 @@ msgstr "Assistente em estado incorreto. Por favor, clique no botão Cancelar!"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_418
 msgid "Endorsement commission"
-msgstr ""
+msgstr "Comissão de Averbamento"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_005
@@ -2381,6 +2388,10 @@ msgid ""
 "credit transfers with a structured communication As a matter of principle, "
 "this type will also be used when no detailed data (type 6 or 7) is following."
 msgstr ""
+"Montante foi totalizado pelo banco; por exemplo, : O montante total de uma "
+"série de transferências de crédito com uma comunicação estruturada como uma "
+"questão de princípio, este tipo também será usado quando nenhum dado "
+"detalhado (tipo 6 ou 7) está a seguir."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_37
@@ -2400,7 +2411,7 @@ msgstr "Levantamento de dinheiro pela sua filial ou agentes"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_049
 msgid "Fiscal stamps/stamp duty"
-msgstr ""
+msgstr "Selos fiscais / imposto de selo"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_58
@@ -2414,7 +2425,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Select Your File :"
-msgstr ""
+msgstr "Selecione o seu ficheiro:"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_06
@@ -2485,7 +2496,7 @@ msgstr "Pesquisar ficheiros CODA"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_52
 msgid "Remittance of commercial paper - credit under usual reserve"
-msgstr ""
+msgstr "Remessa de papel comercial - crédito sob reserva habitual"
 
 #. module: account_coda
 #: help:coda.bank.account,active:0
@@ -2499,7 +2510,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_54
 msgid "Among other things advances or promissory notes"
-msgstr ""
+msgstr "Entre outras coisas avanços ou notas promissórias"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_10
@@ -2543,7 +2554,7 @@ msgstr "Para os profissionais, tais como seguros e corretores"
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_19
 msgid ""
 "Collected for securities, gold, pass-books, etc. placed in safe custody"
-msgstr ""
+msgstr "Títulos Coletados, ouro, passa-livros, etc. colocados sob custódia"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_09_19
@@ -2551,6 +2562,8 @@ msgid ""
 "Used in case of payments accepted under reserve of count, result of "
 "overcrediting"
 msgstr ""
+"Usado no caso de pagamentos aceites com reserva de contagem, resultado sobre "
+"crédito"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:630
@@ -2597,7 +2610,7 @@ msgstr "Comissão para as despesas de manutenção"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_03
 msgid "Subscription to securities"
-msgstr ""
+msgstr "Subscrição de valores"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_425
@@ -2659,6 +2672,7 @@ msgstr "Bonificação de juros"
 #: model:account.coda.trans.code,description:account_coda.actcf_41
 msgid "International credit transfers - non-SEPA credit transfers"
 msgstr ""
+"Transferências internacionais de crédito - transferências de crédito não SEPA"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_87
@@ -2856,6 +2870,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcf_35
 msgid "Closing (periodical settlements for interest, costs,…)"
 msgstr ""
+"Encerramento (estabelecimentos periódicos relativos aos juros, custos, ...)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_51
@@ -3057,6 +3072,8 @@ msgid ""
 "Costs charged for calculating the amount of the tax to be paid (e.g. "
 "Fiscomat)."
 msgstr ""
+"Custos cobrados para o cálculo do montante do imposto a ser pago (Fiscomat "
+"por exemplo)."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_014
@@ -3181,7 +3198,7 @@ msgstr "Subsídio"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_06
 msgid "Payment with tank card"
-msgstr ""
+msgstr "Pagamento com cartão de depósito"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_107
@@ -3496,13 +3513,14 @@ msgstr "Licitações"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_07
 msgid "Unpaid foreign cheque"
-msgstr ""
+msgstr "Cheque estrangeiro Não remunerado"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_03
 msgid ""
 "Bonds, shares, tap issues of CDs, with or without payment of interest, etc."
 msgstr ""
+"Obrigações, ações, questões de CDs, com ou sem pagamento de juros, etc"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_66
@@ -3512,7 +3530,7 @@ msgstr "Resgate de cupões de gasolina"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_058
 msgid "Capital premium"
-msgstr ""
+msgstr "Prémio Capital"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_15
@@ -3528,7 +3546,7 @@ msgstr "Moeda da contraparte"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_202
 msgid "Advising commission | Additional advising commission"
-msgstr ""
+msgstr "Comissões da Assessoria | comissão adicional aconselhada"
 
 #. module: account_coda
 #: field:coda.bank.account,find_partner:0
@@ -3736,6 +3754,8 @@ msgstr "Pagamento do cheque"
 #: model:account.coda.trans.code,comment:account_coda.actcc_43_07
 msgid "Foreign cheque remitted for collection that returns unpaid"
 msgstr ""
+"Cheques estrangeiros remetidos para a recolha que retorna como não "
+"remunerados"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_07
@@ -3982,7 +4002,7 @@ msgstr "Custos de ATM no estrangeiro"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_018
 msgid "Tental guarantee charges"
-msgstr ""
+msgstr "Tental taxas de garantia"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_430

addons/account_followup/__openerp__.py

@@ -23,7 +23,6 @@
     'name': 'Followup Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
-    'complexity': "normal",
     'description': """
 Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================

addons/account_followup/i18n/fr.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:37+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: YannUbuntu <yannubuntu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -69,6 +69,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher % (partner_name)s,\n"
+"\n"
+"Nous constatons que, malgré l'envoi d'un rappel, votre compte client "
+"présente toujours à ce jour un solde débiteur.\n"
+"\n"
+"Il est essentiel que le règlement soit réalisé immédiatement faute de quoi "
+"nous devrons envisager de stopper\n"
+"nos relations commerciales jusqu'à apurement de la situation.\n"
+"\n"
+"Merci de prendre les mesures appropriées pour que le règlement intervienne "
+"dans les 8 prochains jours.\n"
+"\n"
+"S'il subsiste un problème avec le paiement de la facture dont nous n'avons "
+"pas été informé, n'hésitez pas à contacter notre service comptabilité  au "
+"(+32) .12.34.56.78 afin que nous puissions le solutionner rapidement.\n"
+"\n"
+"Le détails de paiements dus est imprimé ci-dessous.\n"
+"\n"
+"Nous vous prions d’agréer, Madame, Monsieur, nos respectueuses salutations.\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -123,7 +143,7 @@ msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr "Jour ouvrable"
+msgstr "Jours ouvrables"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -340,6 +360,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Votre description n'est pas correcte, utilisez une légende exacte  ou %% si "
+"vous souhaitez utiliser le caractère pour cent."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -449,7 +471,7 @@ msgstr "Envoyer un Message de confirmation"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr "Total:"
+msgstr "Total :"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -529,7 +551,7 @@ msgstr "Rapport des Relances"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Niveaux de relance"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -561,7 +583,7 @@ msgstr "Niveau de relance maximal"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Définir les relances"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -576,6 +598,11 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Définissez les niveaux de relance, leur message et leur déclenchement. Pour "
+"chaque étape, spécifiez le message et le nombre de jours avant la relance. "
+"Utilisez la légende pour connaître le code à utiliser pour adapter "
+"dynamiquement le contenu du courriel  (nom, date). Vous pouvez aussi gérer "
+"la langue des messages en fonction des destinataires."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -590,6 +617,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Aucun courriel n'a été envoyé aux partenaires suivants. Leur adresse de "
+"courriel n'est pas renseignée !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -605,7 +636,7 @@ msgstr "%(date)s: Date Courante"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Inclure les écritures marquées comme litigieuses"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -621,7 +652,7 @@ msgstr "Description"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Une seule relance par société"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -715,11 +746,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher% (partner_name)s,\n"
+"\n"
+"Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"\n"
+"A moins d'un paiement intégral effectué dans les 8 prochains jours, une "
+"action  pour le recouvrement de la dette sera entreprise sans autre avis.\n"
+"\n"
+"Je suis convaincu que cette action se révélera inutile. Le  détails des "
+"sommes dues est imprimé ci-dessous.\n"
+"\n"
+"En cas de question concernant cette situation, n'hésitez pas à contacter "
+"notre service comptabilité au (+32) .12.34.56.78.\n"
+"\n"
+"Cordialement,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas passer d'écritures sur un compte clôturé."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -744,7 +790,7 @@ msgstr "Réf. Client"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Tester l'impression"
 
 #. module: account_followup
 #: view:account.followup.print.all:0

addons/account_followup/report/account_followup_report.xml

@@ -18,8 +18,7 @@
                     <field name="balance" sum="Balance"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="blocked" invisible="1" />
-					<field name="period_id" invisible="1" />
-
+                    <field name="period_id" invisible="1" />
                 </tree>
             </field>
         </record>

addons/account_invoice_layout/__openerp__.py

@@ -24,7 +24,6 @@
     'name': 'Invoice Layouts',
     'version': '1.0',
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     'description': """
 This module provides some features to improve the layout of the invoices.
 =========================================================================

addons/account_invoice_layout/account_invoice_layout_view.xml

@@ -47,7 +47,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
+                <xpath expr="//field[@name='invoice_line']" position="replace">
                     <!-- keep the original fields, because other views position on that, too -->
                     <field name="invoice_line" invisible="True"/>
                     <field name="abstract_line_ids" colspan="4" nolabel="1"/>

addons/account_invoice_layout/i18n/th.po

@@ -0,0 +1,355 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-17 04:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr ""
+
+#. module: account_invoice_layout
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""

addons/account_invoice_layout/report/report_account_invoice_layout.rml

@@ -228,7 +228,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
 	<td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Code</para>

addons/account_invoice_layout/report/special_message_invoice.rml

@@ -232,7 +232,7 @@
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
 	<td>
-          <para style="terp_tblheader_General_Centre">Origin</para>
+          <para style="terp_tblheader_General_Centre">Source</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Your Reference</para>

addons/account_payment/__openerp__.py

@@ -24,7 +24,6 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "category": "Accounting & Finance",
-    'complexity': "easy",
     "description": """
 Module to manage the payment of your supplier invoices.
 =======================================================

addons/account_payment/account_payment.py

@@ -92,9 +92,9 @@ class payment_order(osv.osv):
         'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('open', 'Confirmed'),
             ('cancel', 'Cancelled'),
-            ('done', 'Done')], 'State', select=True,
+            ('open', 'Confirmed'),
+            ('done', 'Done')], 'Status', select=True,
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),

addons/account_payment/account_payment_view.xml

@@ -100,8 +100,16 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment order">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="open" states="draft" string="Confirm Payments" />
+                    <button name="set_done" states="open" string="Make Payments" type="object"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
+                    <button name="cancel" states="draft,open" string="Cancel"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </header>
+                <sheet string="Payment order" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
@@ -162,13 +170,7 @@
                     </field>
                     <field name="date_created"/>
                     <field name="date_done"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="4" colspan="2">
-                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -188,9 +190,6 @@
                     <field name="date_done"/>
                     <field name="total"/>
                     <field name="state"/>
-                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="set_done" states="open" string="Make Payments"  type ="object" icon="gtk-execute"/>
                 </tree>
             </field>
         </record>
@@ -214,7 +213,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>

addons/account_sequence/__openerp__.py

@@ -23,7 +23,6 @@
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
     "category": 'Accounting & Finance',
-    'complexity': "easy",
     'description': """
 This module maintains internal sequence number for accounting entries.
 ======================================================================

addons/account_sequence/i18n/sv.po

@@ -0,0 +1,220 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-06-04 17:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Bolaget måste överenstämma för alla konton och perioder."
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Nästa nummer i sekvensen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Nästa nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Räkna upp nummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Nästa nummer i sekvensen kommer att beräknas utgående från detta"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Inställningar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Suffixvärde för löpnumret"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Numerisk utfyllnad"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Transaktioner"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan inte skapa transaktioner på rubrikkonton."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP lägger automatiskt till några '0' till vänster på 'Nästa nummer' för "
+"att få rätt storlek."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan inte skapa transaktioner på ett stängt konto."
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurationsfel! Vald valuta bör delas mellan standard-konton också."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Fel kredit- eller debetvärde i bokföringstransaktionerna."
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefix för löpnumret"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Kontotransaktion"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Suffix"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalnamnet måste vara unikt per företag!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Valt konto på verifikatet tvingar fram en sekundär valuta. Du kan ta bort "
+"den sekundära valutan på kontot eller välja en flervalutavy för journalen."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Verifikatsdatumet är inte inom den definierade perioden! Du bör ändra datum "
+"eller ta bort denna begränsning från journalen."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden måste vara unik per företag!"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""

addons/account_voucher/__openerp__.py

@@ -23,7 +23,6 @@
     "name" : "eInvoicing & Payments",
     "version" : "1.0",
     "author" : 'OpenERP SA',
-    'complexity': "normal",
     "description": """
 Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc.
 ====================================================================================================================================

addons/account_voucher/account_voucher.py

@@ -275,10 +275,10 @@ class account_voucher(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
+             ('cancel','Cancelled'),
              ('proforma','Pro-forma'),
-             ('posted','Posted'),
-             ('cancel','Cancelled')
-            ], 'State', readonly=True, size=32,
+             ('posted','Posted')
+            ], 'Status', readonly=True, size=32,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
@@ -780,7 +780,7 @@ class account_voucher(osv.osv):
 
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
-        return True
+        return {'type': 'ir.actions.act_window_close'}
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")

addons/account_voucher/account_voucher_pay_invoice.xml

@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward"/>
            </button>
            </field>
         </record>
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <button name="invoice_open" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/>
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward"/>
                 </button>
             </field>
         </record>

addons/account_voucher/account_voucher_view.xml

@@ -17,7 +17,6 @@
                     <field name="amount" sum="Total Amount"/>
                     <field name="audit"/>
                     <field name="state"/>
-                    <button name="proforma_voucher" string="Post" states="draft" icon="terp-document-new"/>
                 </tree>
             </field>
         </record>
@@ -40,8 +39,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Accounting Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                  <header>
+                      <button name="proforma_voucher" string="Post" states="draft"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </header>
+                  <sheet string="Accounting Voucher" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
@@ -101,13 +108,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -139,7 +140,7 @@
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -218,7 +219,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -230,7 +231,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
+                <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -241,7 +242,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                <xpath expr="//page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
@@ -253,7 +254,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
+                <xpath expr="//page/field[@name='line_ids']/form/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>

addons/account_voucher/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-15 04:42+0000\n"
+"PO-Revision-Date: 2012-05-16 19:07+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -364,7 +364,7 @@ msgstr "会社名は固有でなければいけません。"
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr "バウチャー行の番号"
+msgstr "バウチャー行の数"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,type:0

addons/account_voucher/invoice.py

@@ -36,7 +36,7 @@ class invoice(osv.osv):
             'res_model': 'account.voucher',
             'type': 'ir.actions.act_window',
             'nodestroy': True,
-            'target': 'current',
+            'target': 'new',
             'domain': '[]',
             'context': {
                 'default_partner_id': inv.partner_id.id,

addons/account_voucher/report/account_voucher.rml

@@ -185,7 +185,7 @@
     <blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_tblheader_General">State:</para>
+          <para style="terp_tblheader_General">Status:</para>
         </td>
         <td>
           <para style="P2">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>

addons/account_voucher/report/account_voucher_print.rml

@@ -159,7 +159,7 @@
     <blockTable colWidths="52.0,123.0,50.0,198.0,42.0,59.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">State:</para>
+          <para style="terp_tblheader_Details">Status:</para>
         </td>
         <td>
           <para style="P4">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>

addons/account_voucher/report/account_voucher_sales_receipt.py

@@ -37,7 +37,7 @@ class sale_receipt_report(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
         'price_total_tax': fields.float('Total With Tax', readonly=True),
         'nbr':fields.integer('# of Voucher Lines', readonly=True),

addons/account_voucher/report/account_voucher_sales_receipt_view.xml

@@ -91,9 +91,9 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -28,7 +28,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -61,7 +61,7 @@
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -143,8 +143,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bill Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Bill Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
@@ -154,8 +162,8 @@
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
@@ -249,13 +257,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -292,8 +294,16 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Customer Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Customer Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
@@ -307,8 +317,8 @@
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
@@ -401,13 +411,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

addons/account_voucher/voucher_sales_purchase_view.xml

@@ -27,7 +27,7 @@
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -59,7 +59,7 @@
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -80,8 +80,17 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Receipt">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Sales Receipt" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -148,16 +157,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -206,8 +206,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Supplier Voucher">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Supplier Voucher" layout="auto">
+                    <field name="pay_now" invisible="1"/>
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                         <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
@@ -268,17 +278,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                        </group>
-                        <field name="pay_now" invisible="1"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

addons/analytic/analytic.py

@@ -171,7 +171,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \

addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml

@@ -47,7 +47,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)"/>
                 </xpath>
             </field>

addons/analytic_journal_billing_rate/i18n/lv.po

@@ -0,0 +1,79 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-28 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: analytic_journal_billing_rate
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""

addons/analytic_user_function/analytic_user_function_view.xml

@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page" position="after">
+                <xpath expr="//notebook/page" position="after">
                     <page string="Users/Products Rel.">
                         <field name="user_product_ids" colspan="4" nolabel="1"/>
                     </page>
@@ -50,7 +50,7 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -64,7 +64,7 @@
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
+                <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>

addons/anonymization/__openerp__.py

@@ -25,7 +25,6 @@
     'name': 'Database Anonymization',
     'version': '1.0',
     'category': 'Tools',
-    'complexity': "easy",
     'description': """
 This module allows you to anonymize a database.
 ===============================================

addons/anonymization/anonymization.py

@@ -48,7 +48,7 @@ class ir_model_fields_anonymization(osv.osv):
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'field_name': fields.char('Field Name', size=128, required=True),
         'field_id': fields.many2one('ir.model.fields', 'Field', ondelete='set null'),
-        'state': fields.selection(selection=FIELD_STATES, String='State', required=True, readonly=True),
+        'state': fields.selection(selection=FIELD_STATES, String='Status', required=True, readonly=True),
     }
 
     _sql_constraints = [
@@ -209,7 +209,7 @@ class ir_model_fields_anonymization_history(osv.osv):
     _columns = {
         'date': fields.datetime('Date', required=True, readonly=True),
         'field_ids': fields.many2many('ir.model.fields.anonymization', 'anonymized_field_to_history_rel', 'field_id', 'history_id', 'Fields', readonly=True),
-        'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='State', required=True, readonly=True),
+        'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='Status', required=True, readonly=True),
         'direction': fields.selection(selection=ANONYMIZATION_DIRECTION, string='Direction', required=True, readonly=True),
         'msg': fields.text('Message', readonly=True),
         'filepath': fields.char(string='File path', size=256, readonly=True),
@@ -243,7 +243,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         'summary': fields.function(_get_summary, type='text', string='Summary'),
         'file_export': fields.binary(string='Export'),
         'file_import': fields.binary(string='Import'),
-        'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
+        'state': fields.function(_get_state, string='Status', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
         'msg': fields.text(string='Message'),
     }
 

addons/anonymization/i18n/ja.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard

addons/anonymization/i18n/pt.po

@@ -0,0 +1,213 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-18 12:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@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: 2012-05-19 05:21+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Nome do Campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Direção"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Campos Anonimizados"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Anonimização da Base de Dados"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "retirar -> anonimização"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonimizado"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "Desconhecido"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Localização do ficheiro"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Exportar"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Inverter a Anonimização da Base de Dados"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Anonimização da Base de Dados"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonimizar Base de Dados"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Limpar"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Sumário"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Campo Anonimizado"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Instável"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Ocorreu uma Exceção"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Não existe"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Nome do Objeto"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Histórico de Anonimizações"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonimizar Base de Dados"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Nome do Ficheiro"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Iniciado"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Não pode ter dois campos com o mesmo nome no mesmo objeto!"

addons/association/__openerp__.py

@@ -24,7 +24,6 @@
     'name': 'Associations Management',
     'version': '0.1',
     'category': 'Specific Industry Applications',
-    'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.
 ==============================================================

addons/association/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2012-04-08 06:15+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-16 18:27+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -35,7 +35,7 @@ msgstr "物事を完了"
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "このモジュールは協会のためのプロファイルを作成します。"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
@@ -47,7 +47,7 @@ msgstr "設定を進行中"
 msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
-msgstr ""
+msgstr "ここでは選択した協会のプロファイルに関連する特別なアプリケーションです。"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -57,7 +57,7 @@ msgstr "タイトル"
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "イベントの管理と整理を助けます。"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
@@ -69,7 +69,7 @@ msgstr "画像"
 msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
-msgstr ""
+msgstr "従業員の費用を追跡管理します。費用がプロジェクト関連である場合、顧客に自動的に再度の請求書を送ります。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -77,41 +77,42 @@ 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は自分自身と自分のタスクを効果的に整理する方法です。このモジュールはOpenERPのプロジェクト管理とGDTの原理を完全に統合しています。"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "資源管理"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "協会プロファイル"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "費用追跡"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "協会アプリケーション設定"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
 msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
-msgstr ""
+msgstr "ビジネス知識を記録し追跡して、それを従業員の間で共有するために、Wikiページとページグループの作成ができます。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "プロジェクトやタスクを追跡，計画生成などすることにより、あなたのプロジェクトとタスクの管理を補助します。"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
@@ -121,15 +122,15 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "イベント"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "プロジェクト管理"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "設定"

addons/auction/__openerp__.py

@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Auction Houses',
-    'version': '1.0',
-    'category': 'Specific Industry Applications',
-    'complexity': "normal",
-    'description': """
-This module manages the records of artists, auction articles, buyers and sellers.
-=================================================================================
-
-It completely manages an auction such as managing bids,
-keeping track of the sold articles along with the paid
-and unpaid objects including delivery of the articles.
-
-The dashboard for auction includes:
-    * Latest Objects (list)
-    * Latest Deposits (list)
-    * Objects Statistics (list)
-    * Total Adjudications (graph)
-    * Min/Adj/Max (graph)
-    * Objects By Day (graph)
-    """,
-    'author': 'OpenERP SA',
-    'depends': ['base', 'account', 'hr_attendance'],
-    'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
-    'update_xml': [
-        'security/auction_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/auction_lots_make_invoice_buyer_view.xml',
-        'wizard/auction_lots_make_invoice_view.xml',
-        'wizard/auction_taken_view.xml',
-        'wizard/auction_lots_auction_move_view.xml',
-        'wizard/auction_pay_buy_view.xml',
-        'wizard/auction_lots_sms_send_view.xml',
-        'wizard/auction_catalog_flagey_view.xml',
-        'wizard/auction_lots_buyer_map_view.xml',
-        'auction_view.xml',
-        'auction_report.xml',
-        'report/report_auction_view.xml',
-        'auction_wizard.xml',
-        'board_auction_view.xml',
-
-    ],
-    'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
-    'test': ['test/auction.yml',
-             'test/auction_report.yml',
-             ],
-
-    'installable': True,
-    'auction': True,
-    'auto_install': False,
-    'certificate': '0039333102717',
-    'images': ['images/auction1.jpeg','images/auction2.jpeg','images/auction3.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/auction/auction.py

@@ -1,804 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv, orm
-from tools.translate import _
-import netsvc
-import time
-
-#----------------------------------------------------------
-# Auction Artists
-#----------------------------------------------------------
-
-class auction_artists(osv.osv):
-    _name = "auction.artists"
-    _columns = {
-        'name': fields.char('Artist/Author Name', size=64, required=True),
-        'pseudo': fields.char('Pseudo', size=64),
-        'birth_death_dates':fields.char('Lifespan', size=64),
-        'biography': fields.text('Biography'),
-    }
-auction_artists()
-
-#----------------------------------------------------------
-# Auction Dates
-#----------------------------------------------------------
-class auction_dates(osv.osv):
-    """Auction Dates"""
-    _name = "auction.dates"
-    _description=__doc__
-
-    def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res={}
-        total = 0.0
-        lots_obj = self.pool.get('auction.lots')
-        for auction in self.browse(cr, uid, ids):
-            lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)])
-            for lots in lots_obj.browse(cr, uid, lots_ids):
-                total+=lots.obj_price or 0.0
-                res[auction.id]=total
-        return res
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-            return []
-        reads = self.read(cr, uid, ids, ['name', 'auction1'], context=context)
-        name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads]
-        return name
-
-    def _get_invoice(self, cr, uid, ids, name, arg, context=None):
-        lots_obj = self.pool.get('auction.lots')
-        result = {}
-        for data in self.browse(cr, uid, ids, context=context):
-            buyer_inv_ids = []
-            seller_inv_ids = []
-            result[data.id] = {
-                'seller_invoice_history': buyer_inv_ids,
-                'buyer_invoice_history': seller_inv_ids,
-            }
-            lots_ids = lots_obj.search(cr, uid, [('auction_id','=',data.id)])
-            for lot in lots_obj.browse(cr, uid, lots_ids, context=context):
-                if lot.ach_inv_id:
-                    buyer_inv_ids.append(lot.ach_inv_id.id)
-                if lot.sel_inv_id:
-                    seller_inv_ids.append(lot.sel_inv_id.id)
-            result[data.id]['seller_invoice_history'] = seller_inv_ids
-            result[data.id]['buyer_invoice_history'] = buyer_inv_ids
-        return result
-
-    _columns = {
-        'name': fields.char('Auction Name', size=64, required=True),
-        'expo1': fields.date('First Exposition Day', required=True, help="Beginning exposition date for auction"),
-        'expo2': fields.date('Last Exposition Day', required=True, help="Last exposition date for auction"),
-        'auction1': fields.date('First Auction Day', required=True, help="Start date of auction"),
-        'auction2': fields.date('Last Auction Day', required=True, help="End date of auction"),
-        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account journal for buyer"),
-        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account journal for seller"),
-        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account tax for buyer"),
-        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account tax for seller"),
-        'acc_income': fields.many2one('account.account', 'Income Account', required=True),
-        'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
-        'adj_total': fields.function(_adjudication_get, string='Total Adjudication', store=True),
-        'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
-                                  help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
-        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
-        'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True),
-        'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Seller Invoice", type='many2many', multi=True),
-    }
-
-    _defaults = {
-        'state': lambda *a: 'draft',
-    }
-
-    _order = "auction1 desc"
-
-    def close(self, cr, uid, ids, context=None):
-        """
-        Close an auction date.
-
-        Create invoices for all buyers and sellers.
-        STATE ='close'
-
-        RETURN: True
-        """
-        lots_obj = self.pool.get('auction.lots')
-        lots_ids = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('state', '=', 'draft'), ('obj_price', '>', 0)])
-        lots_obj.lots_invoice(cr, uid, lots_ids, {}, None)
-        lots_ids2 = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('obj_price', '>', 0)])
-        lots_obj.seller_trans_create(cr, uid, lots_ids2, {})
-        self.write(cr, uid, ids, {'state': 'closed'}) #close the auction
-        return True
-
-auction_dates()
-
-#----------------------------------------------------------
-# Deposits
-#----------------------------------------------------------
-class auction_deposit(osv.osv):
-    """Auction Deposit Border"""
-
-    _name = "auction.deposit"
-    _description=__doc__
-    _order = "id desc"
-    _columns = {
-        'transfer' : fields.boolean('Transfer'),
-        'name': fields.char('Depositer Inventory', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
-        'date_dep': fields.date('Deposit date', required=True),
-        'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
-        'tax_id': fields.many2one('account.tax', 'Expenses'),
-        'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
-        'info': fields.char('Description', size=64),
-        'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
-        'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
-        'total_neg': fields.boolean('Allow Negative Amount'),
-    }
-    _defaults = {
-        'method': lambda *a: 'keep',
-        'total_neg': lambda *a: False,
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
-    }
-
-auction_deposit()
-
-#----------------------------------------------------------
-# (Specific) Deposit Costs
-#----------------------------------------------------------
-class auction_deposit_cost(osv.osv):
-
-    """Auction Deposit Cost"""
-
-    _name = 'auction.deposit.cost'
-    _description=__doc__
-    _columns = {
-        'name': fields.char('Cost Name', required=True, size=64),
-        'amount': fields.float('Amount'),
-        'account': fields.many2one('account.account', 'Destination Account', required=True),
-        'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
-    }
-auction_deposit_cost()
-
-#----------------------------------------------------------
-# Lots Categories
-#----------------------------------------------------------
-class aie_category(osv.osv):
-
-    _name="aie.category"
-    _order = "name"
-    _columns={
-       'name': fields.char('Name', size=64, required=True),
-       'code':fields.char('Code', size=64),
-       'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
-       'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category")
-    }
-
-    def name_get(self, cr, uid, ids, context=None):
-        res = []
-        if not ids:
-            return res
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1] + ' / ' + name
-            res.append((record['id'], name))
-        return res
-
-aie_category()
-
-class auction_lot_category(osv.osv):
-    """Auction Lots Category"""
-
-    _name = 'auction.lot.category'
-    _description=__doc__
-    _columns = {
-        'name': fields.char('Category Name', required=True, size=64),
-        'priority': fields.float('Priority'),
-        'active' : fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the auction lot category without removing it."),
-        'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
-    }
-    _defaults = {
-        'active' : lambda *a: 1,
-    }
-auction_lot_category()
-
-#----------------------------------------------------------
-# Lots
-#----------------------------------------------------------
-def _type_get(self, cr, uid, context=None):
-    obj = self.pool.get('auction.lot.category')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['name'], context)
-    res = [(r['name'], r['name']) for r in res]
-    return res
-
-class auction_lots(osv.osv):
-
-    """Auction Object"""
-    _name = "auction.lots"
-    _order = "obj_num,lot_num,id"
-    _description=__doc__
-
-    def button_not_bought(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'unsold'})
-
-    def button_taken_away(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'taken_away', 'ach_emp': True})
-
-    def button_unpaid(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'draft'})
-
-    def button_bought(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'sold'})
-
-    def _getprice(self, cr, uid, ids, fields, args, context=None):
-        """This Function compute amount total with tax for buyer and seller.
-        @param ids: List of  auction lots's id
-        @param name: List of function fields.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of function fields value.
-        """
-
-        res = {}
-        account_analytic_line_obj = self.pool.get('account.analytic.line')
-        lots = self.browse(cr, uid, ids, context=context)
-        pt_tax = self.pool.get('account.tax')
-        for lot in lots:
-            taxes = []
-            for name in fields:
-                res[lot.id] = {name: False}
-                amount = lot.obj_price or 0.0
-                result = 0.0
-                if name == "buyer_price":
-                    if lot.author_right:
-                        taxes.append(lot.author_right)
-                    if lot.auction_id:
-                        taxes += lot.auction_id.buyer_costs
-                    tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes']
-                    for t in tax:
-                        result += t.get('amount', 0.0)
-                    result += amount
-                elif name == "seller_price":
-                    if lot.bord_vnd_id.tax_id:
-                        taxes.append(lot.bord_vnd_id.tax_id)
-                    elif lot.auction_id and lot.auction_id.seller_costs:
-                        taxes += lot.auction_id.seller_costs
-                    tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes']
-                    for t in tax:
-                        result += t.get('amount', 0.0)
-                    result += amount
-                elif name == "gross_revenue":
-                    if lot.auction_id:
-                        result = lot.buyer_price - lot.seller_price
-
-                elif name == "net_revenue":
-                    if lot.auction_id:
-                        result = lot.buyer_price - lot.seller_price - lot.costs
-
-                elif name == "gross_margin":
-                    if ((lot.obj_price==0) and (lot.state=='draft')):
-                        amount = lot.lot_est1
-                    else:
-                        amount = lot.obj_price
-                    if amount > 0:
-                        result = (lot.gross_revenue * 100) / amount
-                        result = round(result,2)
-
-                elif name == "net_margin":
-                    if ((lot.obj_price==0) and (lot.state=='draft')):
-                        amount = lot.lot_est1
-                    else:
-                        amount = lot.obj_price
-                    if amount > 0:
-                        result = (lot.net_revenue * 100) / amount
-                        result = round(result,2)
-                elif name == "costs":
-                    # costs: Total credit of analytic account
-                    # objects sold during this auction (excluding analytic lines that are in the analytic journal of the auction date)
-                    #TOCHECK: Calculation OF Indirect Cost
-                    som = 0.0
-                    if lot.auction_id:
-                        auct_id = lot.auction_id.id
-                        lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True)
-                        line_ids = account_analytic_line_obj.search(cr, uid, [
-                                    ('account_id', '=', lot.auction_id.account_analytic_id.id),
-                                    ('journal_id', '<>', lot.auction_id.journal_id.id),
-                                    ('journal_id', '<>', lot.auction_id.journal_seller_id.id)])
-                        for r in lot.bord_vnd_id.specific_cost_ids:
-                            som += r.amount
-                        for line in account_analytic_line_obj.browse(cr, uid, line_ids, context=context):
-                            if line.amount:
-                                som -= line.amount
-                        result = som/lot_count
-
-                elif name=="paid_ach":
-                    result = False
-                    if lot.ach_inv_id and lot.ach_inv_id.state == 'paid':
-                        result = True
-
-                elif name=="paid_vnd":
-                    result = False
-                    if lot.sel_inv_id and lot.sel_inv_id.state == 'paid':
-                        result = True
-
-                res[lot.id][name] = result
-
-
-        return res
-
-    def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None):
-        if obj_ret:
-            return {'value': {'obj_price': 0}}
-        return {}
-
-    _columns = {
-        'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
-        'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction for object"),
-        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide deposit information: seller, Withdrawned Method, Object, Deposit Costs"),
-        'name': fields.char('Title', size=64, required=True, help='Auction object name'),
-        'name2': fields.char('Short Description (2)', size=64),
-        'lot_type': fields.selection(_type_get, 'Object category', size=64),
-        'author_right': fields.many2one('account.tax', 'Author rights', help="Account tax for author commission"),
-        'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
-        'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
-        'lot_num': fields.integer('List Number', required=True, select=1, help="List number in depositer inventory"),
-        'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
-        'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
-        'lot_local':fields.char('Location', size=64, help="Auction Location"),
-        'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
-        'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
-        'important':fields.boolean('To be Emphatized'),
-        'product_id':fields.many2one('product.product', 'Product', required=True),
-        'obj_desc': fields.text('Object Description'),
-        'obj_num': fields.integer('Catalog Number', select=True),
-        'obj_ret': fields.float('Price retired', help="Object Ret"),
-        'obj_comm': fields.boolean('Commission'),
-        'obj_price': fields.float('Adjudication price', help="Object Price"),
-        'ach_avance': fields.float('Buyer Advance'),
-        'ach_login': fields.char('Buyer Username', size=64),
-        'ach_uid': fields.many2one('res.partner', 'Buyer'),
-        'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
-        'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, this field is marked as True"),
-        'is_ok': fields.boolean('Buyer\'s payment', help="When buyer pay for bank statement', this field is marked"),
-        'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
-        'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
-        'vnd_lim': fields.float('Seller limit'),
-        'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
-        'image': fields.binary('Image', help="Object Image"),
-        'paid_vnd':fields.function(_getprice, string='Seller Paid', type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
-        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
-        'state': fields.selection((
-            ('draft', 'Draft'),
-            ('unsold', 'Unsold'),
-            ('paid', 'Paid'),
-            ('sold', 'Sold'),
-            ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
-            help=' * The \'Draft\' state is used when a object is encoding as a new object. \
-                \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
-                \n* The \'Paid\' state is used when user pay for the object \
-                \n* The \'Sold\' state is used when user buy the object.'),
-        'buyer_price': fields.function(_getprice, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
-        'seller_price': fields.function(_getprice, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
-        'gross_revenue':fields.function(_getprice, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
-        'gross_margin':fields.function(_getprice, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
-        'costs':fields.function(_getprice, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
-        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement line for given buyer"),
-        'net_revenue':fields.function(_getprice, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
-        'net_margin':fields.function(_getprice, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
-    }
-    _defaults = {
-        'state':lambda *a: 'draft',
-        'lot_num':lambda *a:1,
-        'is_ok': lambda *a: False,
-    }
-
-    def name_get(self, cr, user, ids, context=None):
-        if not ids:
-            return []
-        result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name', 'obj_num'])]
-        return result
-
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-        if not args:
-            args = []
-        ids = []
-        if name:
-            ids = self.search(cr, user, [('obj_num', '=', int(name))] + args)
-        if not ids:
-            ids = self.search(cr, user, [('name', operator, name)] + args)
-        return self.name_get(cr, user, ids)
-
-    def _sum_taxes_by_type_and_id(self, taxes):
-        """
-        PARAMS: taxes: a list of dictionaries of the form {'id':id, 'amount':amount, ...}
-        RETURNS : a list of dictionaries of the form {'id':id, 'amount':amount, ...}; one dictionary per unique id.
-            The others fields in the dictionaries (other than id and amount) are those of the first tax with a particular id.
-        """
-        taxes_summed = {}
-        for tax in taxes:
-            key = (tax['type'], tax['id'])
-            if key in taxes_summed:
-                taxes_summed[key]['amount'] += tax['amount']
-            else:
-                taxes_summed[key] = tax
-        return taxes_summed.values()
-
-    def compute_buyer_costs(self, cr, uid, ids):
-        amount_total = {}
-        lots = self.browse(cr, uid, ids)
-        ##CHECKME: Is that AC would be worthwhile to make groups of lots that have the same costs to spend a lot of lists compute?
-        taxes = []
-        amount=0.0
-        pt_tax = self.pool.get('account.tax')
-        for lot in lots:
-            taxes = lot.product_id.taxes_id
-            if lot.author_right:
-                taxes.append(lot.author_right)
-            elif lot.auction_id:
-                taxes += lot.auction_id.buyer_costs
-            tax=pt_tax.compute_all(cr, uid, taxes, lot.obj_price, 1)['taxes']
-            for t in tax:
-                amount+=t['amount']
-        amount_total['value']= amount
-        amount_total['amount']= amount
-
-        return amount_total
-
-
-    def _compute_lot_seller_costs(self, cr, uid, lot, manual_only=False):
-        costs = []
-        tax_cost_ids=[]
-
-        border_id = lot.bord_vnd_id
-        if border_id:
-            if border_id.tax_id:
-                tax_cost_ids.append(border_id.tax_id)
-            elif lot.auction_id and lot.auction_id.seller_costs:
-                tax_cost_ids += lot.auction_id.seller_costs
-
-        tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes']
-        # delete useless keys from the costs computed by the tax object... this is useless but cleaner...
-        for cost in tax_costs:
-            del cost['account_paid_id']
-            del cost['account_collected_id']
-
-        if not manual_only:
-            costs.extend(tax_costs)
-            for c in costs:
-                c.update({'type': 0})
-######
-        if lot.vnd_lim_net<0 and lot.obj_price>0:
-            #FIXME:the string passes have lot 'should go through the system translations.
-            obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price)
-            if obj_price_wh_costs < lot.vnd_lim:
-                costs.append({  'type': 1,
-                                'id': lot.obj_num,
-                                'name': 'Remise lot '+ str(lot.obj_num),
-                                'amount': lot.vnd_lim - obj_price_wh_costs}
-                            )
-        return costs
-
-    def compute_seller_costs(self, cr, uid, ids, manual_only=False):
-        lots = self.browse(cr, uid, ids)
-        costs = []
-
-        # group objects (lots) by deposit id
-        # ie create a dictionary containing lists of objects
-        bord_lots = {}
-        for lot in lots:
-            key = lot.bord_vnd_id.id
-            if not key in bord_lots:
-                bord_lots[key] = []
-            bord_lots[key].append(lot)
-
-        # use each list of object in turn
-        for lots in bord_lots.values():
-            total_adj = 0
-            total_cost = 0
-            for lot in lots:
-                total_adj += lot.obj_price or 0.0
-                lot_costs = self._compute_lot_seller_costs(cr, uid, lot, manual_only)
-                for c in lot_costs:
-                    total_cost += c['amount']
-                costs.extend(lot_costs)
-            bord = lots[0].bord_vnd_id
-            if bord:
-                if bord.specific_cost_ids:
-                    bord_costs = [{'type':2, 'id':c.id, 'name':c.name, 'amount':c.amount, 'account_id':c.account} for c in bord.specific_cost_ids]
-                    for c in bord_costs:
-                        total_cost += c['amount']
-                    costs.extend(bord_costs)
-            if (total_adj+total_cost)<0:
-                #FIXME: translate tax name
-                new_id = bord and bord.id or 0
-                c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'}
-                costs.append(c)
-        return self._sum_taxes_by_type_and_id(costs)
-
-    # sum remise limite net and ristourne
-    def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id
-
-        """This Fuction  sum Net remittance limit and refund"""
-
-        taxes = self.compute_seller_costs(cr, uid, ids)
-        taxes_summed = {}
-        for tax in taxes:
-            if tax['type'] == 1:
-                tax['id'] = 0
-                #FIXME: translate tax names
-                tax['name'] = 'Discount sharp boundary'
-            elif tax['type'] == 2:
-                tax['id'] = 0
-                tax['name'] = 'Miscellaneous expenditure'
-            elif tax['type'] == 3:
-                tax['id'] = 0
-                tax['name'] = 'Cross.'
-            key = (tax['type'], tax['id'])
-            if key in taxes_summed:
-                taxes_summed[key]['amount'] += tax['amount']
-            else:
-                taxes_summed[key] = tax
-        return taxes_summed.values()
-
-    def buyer_proforma(self, cr, uid, ids, context=None):
-
-        invoices = {}
-        inv_ref = self.pool.get('account.invoice')
-        res_obj = self.pool.get('res.partner')
-        inv_line_obj = self.pool.get('account.invoice.line')
-        wf_service = netsvc.LocalService('workflow')
-        for lot in self.browse(cr, uid, ids, context=context):
-            if not lot.obj_price>0:
-                continue
-            if not lot.ach_uid.id:
-                raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
-            else:
-                partner_ref =lot.ach_uid.id
-                res = res_obj.address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
-                contact_addr_id = res['contact']
-                invoice_addr_id = res['invoice']
-                if not invoice_addr_id:
-                    raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,))
-                inv = {
-                    'name': 'Auction proforma:' +lot.name,
-                    'journal_id': lot.auction_id.journal_id.id,
-                    'partner_id': partner_ref,
-                    'type': 'out_invoice',
-                }
-                inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value'])
-                inv['account_id'] = inv['account_id'] and inv['account_id'][0]
-                inv_id = inv_ref.create(cr, uid, inv, context)
-                invoices[partner_ref] = inv_id
-                self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'})
-
-                #calcul des taxes
-                taxes = map(lambda x: x.id, lot.product_id.taxes_id)
-                taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs)
-                if lot.author_right:
-                    taxes.append(lot.author_right.id)
-
-                inv_line= {
-                    'invoice_id': inv_id,
-                    'quantity': 1,
-                    'product_id': lot.product_id.id,
-                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name,
-                    'invoice_line_tax_id': [(6, 0, taxes)],
-                    'account_analytic_id': lot.auction_id.account_analytic_id.id,
-                    'account_id': lot.auction_id.acc_income.id,
-                    'price_unit': lot.obj_price,
-                }
-                inv_line_obj.create(cr, uid, inv_line, context)
-            inv_ref.button_compute(cr, uid, invoices.values())
-            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr)
-        return invoices.values()
-
-    # creates the transactions between the auction company and the seller
-    # this is done by creating a new in_invoice for each
-    def seller_trans_create(self, cr, uid, ids, context=None):
-        """
-            Create a seller invoice for each bord_vnd_id, for selected ids.
-        """
-        # use each list of object in turn
-        invoices = {}
-        inv_ref=self.pool.get('account.invoice')
-        inv_line_obj = self.pool.get('account.invoice.line')
-        wf_service = netsvc.LocalService('workflow')
-        for lot in self.browse(cr, uid, ids, context=context):
-            if not lot.auction_id.id:
-                continue
-            if lot.bord_vnd_id.id in invoices:
-                inv_id = invoices[lot.bord_vnd_id.id]
-            else:
-                inv = {
-                    'name': 'Auction:' +lot.name,
-                    'journal_id': lot.auction_id.journal_seller_id.id,
-                    'partner_id': lot.bord_vnd_id.partner_id.id,
-                    'type': 'in_invoice',
-                }
-                inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value'])
-                inv_id = inv_ref.create(cr, uid, inv, context)
-                invoices[lot.bord_vnd_id.id] = inv_id
-
-            self.write(cr, uid, [lot.id], {'sel_inv_id':inv_id, 'state':'sold'})
-
-            taxes = map(lambda x: x.id, lot.product_id.taxes_id)
-            if lot.bord_vnd_id.tax_id:
-                taxes.append(lot.bord_vnd_id.tax_id.id)
-            else:
-                taxes += map(lambda x: x.id, lot.auction_id.seller_costs)
-
-            inv_line= {
-                'invoice_id': inv_id,
-                'quantity': 1,
-                'product_id': lot.product_id.id,
-                'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
-                'invoice_line_tax_id': [(6, 0, taxes)],
-                'account_analytic_id': lot.auction_id.account_analytic_id.id,
-                'account_id': lot.auction_id.acc_expense.id,
-                'price_unit': lot.obj_price,
-            }
-            inv_line_obj.create(cr, uid, inv_line, context)
-            inv_ref.button_compute(cr, uid, invoices.values())
-        for inv in inv_ref.browse(cr, uid, invoices.values(), context=context):
-            inv_ref.write(cr, uid, [inv.id], {
-                'check_total': inv.amount_total
-            })
-            wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr)
-        return invoices.values()
-
-    def lots_invoice(self, cr, uid, ids, context, invoice_number=False):
-        """(buyer invoice
-            Create an invoice for selected lots (IDS) to BUYER_ID.
-            Set created invoice to the ACTION state.
-            PRE:
-                ACTION:
-                    False: no action
-                    xxxxx: set the invoice state to ACTION
-
-            RETURN: id of generated invoice
-        """
-        inv_ref = self.pool.get('account.invoice')
-        res_obj = self.pool.get('res.partner')
-        inv_line_obj = self.pool.get('account.invoice.line')
-        wf_service = netsvc.LocalService('workflow')
-        invoices={}
-        for lot in self.browse(cr, uid, ids, context):
-            if not lot.auction_id.id:
-                continue
-            if not lot.ach_uid.id:
-                raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
-            if (lot.auction_id.id, lot.ach_uid.id) in invoices:
-                inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)]
-            else:
-                add = res_obj.address_get(cr, uid, [lot.ach_uid.id], ['default'])['default']
-                if not add:
-                    raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Address.'))
-                inv = {
-                    'name':lot.auction_id.name or '',
-                    'reference': lot.ach_login,
-                    'journal_id': lot.auction_id.journal_id.id,
-                    'partner_id': lot.ach_uid.id,
-                    'type': 'out_invoice',
-                }
-                if invoice_number:
-                    inv['number'] = invoice_number
-                inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', lot.ach_uid.id)['value'])
-                inv_id = inv_ref.create(cr, uid, inv, context)
-                invoices[(lot.auction_id.id, lot.ach_uid.id)] = inv_id
-            self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'})
-            #calcul des taxes
-            taxes = map(lambda x: x.id, lot.product_id.taxes_id)
-            taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs)
-            if lot.author_right:
-                taxes.append(lot.author_right.id)
-
-            inv_line= {
-                'invoice_id': inv_id,
-                'quantity': 1,
-                'product_id': lot.product_id.id,
-                'name': '['+str(lot.obj_num)+'] '+ lot.name,
-                'invoice_line_tax_id': [(6, 0, taxes)],
-                'account_analytic_id': lot.auction_id.account_analytic_id.id,
-                'account_id': lot.auction_id.acc_income.id,
-                'price_unit': lot.obj_price,
-            }
-            inv_line_obj.create(cr, uid, inv_line, context)
-            inv_ref.button_compute(cr, uid, [inv_id])
-        for l in  inv_ref.browse(cr, uid, invoices.values(), context):
-            wf_service.trg_validate(uid, 'account.invoice', l.id, 'invoice_open', cr)
-        return invoices.values()
-
-auction_lots()
-
-#----------------------------------------------------------
-# Auction Bids
-#----------------------------------------------------------
-class auction_bid(osv.osv):
-    """Bid Auctions"""
-
-    _name = "auction.bid"
-    _description=__doc__
-    _order = 'id desc'
-    _columns = {
-        'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
-        'contact_tel':fields.char('Contact Number', size=64),
-        'name': fields.char('Bid ID', size=64, required=True),
-        'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
-        'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
-    }
-    _defaults = {
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
-    }
-
-    def onchange_contact(self, cr, uid, ids, partner_id):
-        if not partner_id:
-            return {'value': {'contact_tel':False}}
-        contact = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        if contact:
-            v_contact=contact.phone
-        else:
-            v_contact = False
-        return {'value': {'contact_tel': v_contact}}
-
-auction_bid()
-
-class auction_lot_history(osv.osv):
-    """Lot History"""
-
-    _name = "auction.lot.history"
-    _description=__doc__
-    _columns = {
-        'name': fields.date('Date', size=64),
-        'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
-        'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
-        'price': fields.float('Withdrawn price', digits=(16, 2))
-    }
-    _defaults = {
-        'name': lambda *args: time.strftime('%Y-%m-%d')
-    }
-auction_lot_history()
-
-class auction_bid_lines(osv.osv):
-    _name = "auction.bid_line"
-    _description="Bid"
-
-    _columns = {
-        'name': fields.char('Bid date', size=64),
-        'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
-        'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
-        'call': fields.boolean('To be Called'),
-        'price': fields.float('Maximum Price'),
-        'auction': fields.char(string='Auction Name', size=64)
-    }
-    _defaults = {
-        'name': lambda *args: time.strftime('%Y-%m-%d')
-    }
-
-    def onchange_name(self, cr, uid, ids, lot_id):
-        if not lot_id:
-            return {'value': {'auction':False}}
-        auctions = self.pool.get('auction.lots').browse(cr, uid, lot_id)
-        v_auction=auctions.auction_id.name or False
-        return {'value': {'auction': v_auction}}
-
-
-auction_bid_lines()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/auction/auction_data.xml

@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-	
-	
-	<!-- Auction lots category data -->
-	
-    <record model="aie.category" id="aie_category_anti_view">
-        <field name="name">Antiques</field>
-        <field name="code">ANTI</field>
-    </record>
-    
-    <record model="aie.category" id="aie_category_paint_view">
-        <field name="name">Painting</field>
-        <field name="code">PAINT</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <record model="aie.category" id="aie_category_furn_view">
-        <field name="name">Furnitures</field>
-        <field name="code">FURN</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-   <record model="aie.category" id="aie_category_pcg_view">
-        <field name="name">Porcelain, Ceramics, Glassmaking, ...</field>
-        <field name="code">PCG</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-
-   <record model="aie.category" id="aie_category_sbe_view">
-        <field name="name">Sculpture, bronze, eso</field>
-        <field name="code">SBE</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>    
-    
-     <record model="aie.category" id="aie_category_clock_view">
-        <field name="name">Clocks and watches</field>
-        <field name="code">CLW</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>  
-    
-    <record model="aie.category" id="aie_category_caob_view">
-        <field name="name">Collectible and art objects</field>
-        <field name="code">COAO</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-   <record model="aie.category" id="aie_category_engr_view">
-        <field name="name">Engravings</field>
-        <field name="code">ENGR</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>       
-    
-    <record model="aie.category" id="aie_category_gart_view">
-        <field name="name">Graphic Arts</field>
-        <field name="code">GART</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_light_view">
-        <field name="name">Lightings</field>
-        <field name="code">LGT</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>   
-    
-    <record model="aie.category" id="aie_category_metal_view">
-        <field name="name">Metal Ware</field>
-        <field name="code">MW</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_mini_view">
-        <field name="name">Miniatures</field>
-        <field name="code">MAT</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>  
-    
-    <record model="aie.category" id="aie_category_collect_view">
-        <field name="name">Collections</field>
-        <field name="code">CLT</field>
-        <field name="parent_id" ref="aie_category_mini_view"/>
-    </record>    
-    
-    <record model="aie.category" id="aie_category_mi_view">
-        <field name="name">Musical Instruments</field>
-        <field name="code">MI</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_owm_view">
-        <field name="name">Old weapons and militaria</field>
-        <field name="code">OWM</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_oart_view">
-        <field name="name">Oriental Arts</field>
-        <field name="code">OART</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_chf_view">
-        <field name="name">Chineese furnitures</field>
-        <field name="code">CHF</field>
-        <field name="parent_id" ref="aie_category_oart_view"/>
-    </record>    
-    
-    <record model="aie.category" id="aie_category_othr_view">
-        <field name="name">Others</field>
-        <field name="code">OTR</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_pst_view">
-        <field name="name">Posters</field>
-        <field name="code">PST</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_rel_view">
-        <field name="name">Religiosa</field>
-        <field name="code">REL</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_sin_view">
-        <field name="name">Scientific Instruments</field>
-        <field name="code">SIN</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-        
-    <record model="aie.category" id="aie_category_tin_view">
-        <field name="name">Tin</field>
-        <field name="code">TIN</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_cwa_view">
-        <field name="name">Copper wares</field>
-        <field name="code">CWA</field>
-        <field name="parent_id" ref="aie_category_tin_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_ty_view">
-        <field name="name">Toys</field>
-        <field name="code">TY</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_vrs_view">
-        <field name="name">Verreries</field>
-        <field name="code">VRS</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_wne_view">
-        <field name="name">Wine</field>
-        <field name="code">WNE</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record> 
-    
-    <!--  -->
-
-    <record model="aie.category" id="aie_category_con_view">
-        <field name="name">Contemporary Art</field>
-        <field name="code">CONTEM</field>
-    </record>
-    
-    <record model="aie.category" id="aie_category_con_art_view">
-        <field name="name">Arts</field>
-        <field name="code">ARTS</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_con_curi_view">
-        <field name="name">Curiosa</field>
-        <field name="code">CRS</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record> 
-    
-    <record model="aie.category" id="aie_category_con_ome_view">
-        <field name="name">Other Media</field>
-        <field name="code">OME</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record> 
-       
-    <record model="aie.category" id="aie_category_con_pht_view">
-        <field name="name">Photo</field>
-        <field name="code">PHT</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record>     
-    
-    <record model="aie.category" id="aie_category_con_paint_view">
-        <field name="name">Painting</field>
-        <field name="code">CPAINT</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record>  
-    
-    <record model="aie.category" id="aie_category_con_scul_view">
-        <field name="name">Sculpture</field>
-        <field name="code">SCUL</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record>      
-
-    <record model="aie.category" id="aie_category_con_cshe_view">
-        <field name="name">Shows</field>
-        <field name="code">CSHW</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record>  
-    
-    <record model="aie.category" id="aie_category_jew_view">
-        <field name="name">Jewelry</field>
-        <field name="code">JWL</field>
-        <field name="parent_id" ref="aie_category_con_view"/>
-    </record>
-    
-    <!--  -->
-
-    <record model="aie.category" id="aie_category_uncla_view">
-        <field name="name">Unclassifieds</field>
-        <field name="code">UNCLASS</field>
-    </record>
-    
-    <record model="aie.category" id="aie_category_afrart_view">
-        <field name="name">African Arts</field>
-        <field name="code">AFART</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <record model="aie.category" id="aie_category_argen_view">
-        <field name="name">Argenterie</field>
-        <field name="code">ARGENT</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <record model="aie.category" id="aie_category_artfrom_view">
-        <field name="name">Art from the Ivory Coast</field>
-        <field name="code">ARTFORM</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <record model="aie.category" id="aie_category_afrec_view">
-        <field name="name">African Arts</field>
-        <field name="code">AFRART</field>
-        <field name="parent_id" ref="aie_category_artfrom_view"/>
-    </record>
-    
-   <record model="aie.category" id="aie_category_book_view">
-        <field name="name">Books, manuscripts, eso.</field>
-        <field name="code">BME</field>
-         <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-   <record model="aie.category" id="aie_category_carpet_view">
-        <field name="name">Carpet and textilles</field>
-        <field name="code">CARPTEX</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <record model="aie.category" id="aie_category_cartoon_view">
-        <field name="name">Cartoons</field>
-        <field name="code">CATOON</field>
-        <field name="parent_id" ref="aie_category_anti_view"/>
-    </record>
-    
-    <!-- End Of Auction Lots Category -->
-
-	
-
-</data>
-</openerp>

addons/auction/auction_demo.xml

@@ -1,924 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
-    </record>
-
-    <!-- demo data for Account -->
-    <record model="account.account.type" id="account.account_type_tax">
-          <field name="name">Tax</field>
-          <field name="code">tax</field>
-          <field name="close_method">unreconciled</field>
-    </record>
-
-    <record model="account.account" id="auction_income_view">
-        <field name="name">Auction Adjudications</field>
-        <field name="code">A0</field>
-        <field name="type">view</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="0">
-            <value search="[('type','=','view')]" model="account.account"/>
-        </field>
-        <field name="user_type" ref="account.data_account_type_view"/>
-    </record>
-
-    <record model="account.account" id="auction_expense_view">
-        <field name="name">Auction Adjudication Expenses</field>
-        <field name="code">A1</field>
-        <field name="type">view</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="0">
-            <value search="[('type','=','view')]" model="account.account"/>
-        </field>
-        <field name="user_type" ref="account.data_account_type_expense"/>
-    </record>
-
-    <record model="account.account" id="auction_income">
-        <field name="name">Auction Adjudications</field>
-        <field name="code">A7x*</field>
-        <field name="user_type" ref="account.data_account_type_income"/> 
-        <field name="type">other</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="auction_income_view"/>
-    </record>
-
-    <record model="account.account" id="auction_expense">
-        <field name="name">Auction Adjudication Expenses</field>
-        <field name="code">A6x*</field>
-        <field name="user_type" ref="account.data_account_type_expense"/>
-        <field name="type">other</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="auction_expense_view"/>
-    </record>
-
-    <record model="account.account" id="auction_income_costs">
-        <field name="name">Auction Buyer Costs</field>
-        <field name="code">A8x*</field>
-        <field name="type">other</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="auction_income_view"/>
-        <field name="user_type" ref="account.account_type_tax"/>
-    </record>
-    <record model="account.account" id="auction_expense_costs">
-        <field name="name">Auction Seller Costs</field>
-        <field name="code">A9x*</field>
-        <field name="type">other</field>
-        <field name="currency_id" search="[('name','=','EUR')]"/>
-        <field name="parent_id" eval="auction_expense_view"/>
-        <field name="user_type" ref="account.account_type_tax"/>
-    </record>
-
-    <record model="account.tax" id="tax_buyer_author">
-        <field name="name">Author rights (4%)</field>
-        <field name="type">percent</field>
-        <field name="applicable_type">code</field>
-        <field name="amount">0.04</field>
-        <field name="domain">sabam</field>
-        <field name="account_collected_id" ref="auction_income_costs"/>
-        <field name="account_paid_id" ref="auction_income_costs"/>
-        <field name="python_applicable">result = (price_unit&gt;=1250)</field>
-    </record>
-    <record model="account.tax" id="tax_buyer">
-        <field name="name">Buyer Costs (20%)</field>
-        <field name="type">percent</field>
-        <field name="amount">0.20</field>
-        <field name="domain">auction</field>
-        <field name="account_collected_id" ref="auction_income_costs"/>
-        <field name="account_paid_id" ref="auction_income_costs"/>
-    </record>
-    <record model="account.tax" id="tax_seller">
-        <field name="name">Seller Costs (12%)</field>
-        <field name="type">percent</field>
-        <field name="amount">-0.12</field>
-        <field name="domain">auction</field>
-        <field name="account_collected_id" ref="auction_expense_costs"/>
-        <field name="account_paid_id" ref="auction_expense_costs"/>
-    </record>
-    <!--demo data for the product-->
-    <record id="product.product_product_pc2" model="product.product">
-        <field name="list_price">770.0</field>
-        <field name="standard_price">700.0</field>
-    </record>
-
-
-    <!--demo data for the partner-->
-
-    <record id="partner_record1" model="res.partner">
-        <field name="name">Unknown</field>
-        <field name="is_company">1</field>
-    </record>
-
-    <record id="res_partner_unknown_address_1" model="res.partner">
-        <field name="city">Bruxelles1</field>
-        <field name="name">Benoit Mortie1r1</field>
-        <field name="zip">1030</field>
-        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-        <field name="email">info@opensides.be</field>
-        <field name="phone">(+32)2 211 34 83</field>
-        <field name="street">Rue des Palais 44, bte 33</field>
-        <field name="type">default</field>
-        <field name="use_parent_address" eval="0"/>
-        <field name="parent_id" ref="partner_record1"/>
-    </record>
-
-    <record id="res_partner_unknown_address_2" model="res.partner">
-        <field name="city">Avignon CEDEX 091</field>
-        <field name="name">Lara</field>
-        <field name="zip">84911</field>
-        <field name="country_id" model="res.country" search="[('name','=','France')]"/>
-        <field name="email">contact@tecsas.fr</field>
-        <field name="phone">(+33)4.32.74.10.57</field>
-        <field name="street">85 rue du traite de Rome</field>
-        <field name="type">default</field>
-        <field name="use_parent_address" eval="0"/>
-        <field name="parent_id" ref="partner_record1"/>
-    </record>
-
-    <record id="res_partner_unknown_address_3" model="res.partner">
-        <field name="city">Louvain-la-Neuve</field>
-        <field name="name">Thomas Passot</field>
-        <field name="zip">1348</field>
-        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-        <field name="email">info@mediapole.net</field>
-        <field name="phone">(+32).10.45.17.73</field>
-        <field name="street">Rue de l'Angelique, 1</field>
-        <field name="use_parent_address" eval="0"/>
-        <field name="parent_id" ref="partner_record1"/>
-    </record>
-
-        <!-- demo data for the auction_artist object-->
-
-    <record model="auction.artists" id="auction_art_1">
-        <field name="name">Philippe Lavilier</field>
-        <field name="birth_death_dates">1345-1450</field>
-    </record>
-
-    <record model="auction.artists" id="auction_art_2">
-        <field name="name">POREAU OSWALD</field>
-        <field name="birth_death_dates">1877-1955</field>
-    </record>
-
-        <!-- demo data for the account tax code-->
-
-    <record model="account.tax.code" id="account_tax_code_id1">
-        <field name="name">VAT 1%</field>
-        <field name="code">VAT01</field>
-        <field name="company_id" model="res.company"  search="[]"/>
-    </record>
-
-    <record model="account.tax.code" id="account_tax_code_id2">
-        <field name="name">VAT 20%</field>
-        <field name="code">VAT20</field>
-        <field name="company_id" model="res.company"  search="[]"/>
-    </record>
-
-
-    <record model="account.tax.code" id="account_tax_code_id3">
-        <field name="name">VAT 10%</field>
-        <field name="code">VAT10</field>
-        <field name="company_id" model="res.company"  search="[]"/>
-    </record>
-
-    <record model="account.tax.code" id="account_tax_code_id4">
-        <field name="name">VAT 12%</field>
-        <field name="code">VAT12</field>
-        <field name="company_id" model="res.company"  search="[]"/>
-    </record>
-
-    <record model="account.tax.code" id="account_tax_code_id5">
-        <field name="name">VAT 5%</field>
-        <field name="code">VAT5</field>
-        <field name="company_id" model="res.company"  search="[]"/>
-    </record>
-
-
-<!-- demo data for the auction taxes-->
-
-    <record id="auction_tax" model="account.tax">
-        <field name="name">Droit d'auteur</field>
-        <field name="amount">0.05</field>
-        <field name="domain">sabam</field>
-        <field name="base_code_id" ref="account_tax_code_id5"/>
-        <field name="tax_code_id" ref="account_tax_code_id5"/>
-    </record>
-
-    <record id="auction_tax1" model="account.tax">
-        <field name="name">TVA</field>
-        <field name="amount">0.12</field>
-        <field name="domain">auction</field>
-        <field name="base_code_id" ref="account_tax_code_id4"/>
-        <field name="tax_code_id" ref="account_tax_code_id4"/>
-    </record>
-
-    <record id="auction_tax2" model="account.tax">
-        <field name="name">TVA1</field>
-        <field name="amount">0.2</field>
-        <field name="domain">auction</field>
-        <field name="base_code_id" ref="account_tax_code_id2"/>
-        <field name="tax_code_id" ref="account_tax_code_id2"/>
-    </record>
-
-    <record id="auction_tax3" model="account.tax">
-        <field name="name">Buyer Costs</field>
-        <field name="amount">0.21</field>
-        <field name="domain">auction</field>
-        <field name="base_code_id" ref="account_tax_code_id1"/>
-        <field name="tax_code_id" ref="account_tax_code_id1"/>
-    </record>
-
-    <record id="auction_tax4" model="account.tax">
-         <field name="name">Seller Costs1</field>
-         <field name="amount">-0.10</field>
-         <field name="domain">auction</field>
-         <field name="base_code_id" ref="account_tax_code_id1"/>
-         <field name="tax_code_id" ref="account_tax_code_id1"/>
-    </record>
-
-    <record id="auction_tax5" model="account.tax">
-         <field name="name">Seller Costs</field>
-         <field name="amount">-0.10</field>
-         <field name="domain">auction</field>
-         <field name="base_code_id" ref="account_tax_code_id3"/>
-         <field name="tax_code_id" ref="account_tax_code_id3"/>
-    </record>
-
-<!--        example for creating a demo data for the tax with basecode and tax code-->
-
-    <record id="auction_tax6" model="account.tax">
-        <field name="name">Frais de vente</field>
-        <field name="amount">-0.15</field>
-        <field name="domain">auction</field>
-        <field name="base_code_id" ref="account_tax_code_id1"/>
-        <field name="tax_code_id" ref="account_tax_code_id1"/>
-    </record>
-
-    <record id="auction_tax20" model="account.tax">
-       <field name="name">Frais de vente0</field>
-       <field name="amount">0</field>
-       <field name="domain">auction</field>
-       <field name="base_code_id" ref="account_tax_code_id2"/>
-       <field name="tax_code_id" ref="account_tax_code_id2"/>
-    </record>
-
-    <record id="monproduit" model="product.product">
-        <field name="name">Oeuvres a 21%</field>
-        <field name="categ_id" ref="product.product_category_pc"/>
-    </record>
-
-
-<!--===========================================================================================-->
-        <!-- start == demo data for the auction_lot_Category object-->
-    <record model="auction.lot.category" id="auction_cat_1">
-        <field name="name">Painting</field>
-        <field name="priority">1</field>
-        <field name="aie_categ" ref="aie_category_paint_view"/>
-    </record>
-
-    <record model="auction.lot.category" id="auction_cat_2">
-        <field name="name">Furniture</field>
-        <field name="priority">2</field>
-        <field name="aie_categ"  ref="aie_category_furn_view"/>
-    </record>
-
-    <record model="auction.lot.category" id="auction_cat_3">
-        <field name="name">Glass</field>
-        <field name="priority">2</field>
-         <field name="aie_categ"  ref="aie_category_pcg_view"/>
-    </record>
-
-    <record model="auction.lot.category" id="auction_cat_4">
-        <field name="name">Sculpture</field>
-        <field name="priority">10</field>
-        <field name="aie_categ"  ref="aie_category_sbe_view"/>
-    </record>
-
-    <record model="auction.lot.category" id="auction_cat_5">
-        <field name="name">Jawellery</field>
-        <field name="priority">6</field>
-        <field name="aie_categ"  ref="aie_category_jew_view"/>
-    </record>
-
-<!-- end == demo data for the auction_lot_Category-->
-
-<!-- start== demo data for the auction_date-->
-
-    <record model="auction.dates" id="auction_date_1">
-       <field name="name">painting Exhibition</field>
-       <field name="expo1" eval="time.strftime('%Y-%m-01')" />
-       <field name="expo2" eval="time.strftime('%Y-%m-15')" />
-       <field name="auction1" eval="time.strftime('%Y-%m-20')" />
-       <field name="auction2" eval="time.strftime('%Y-%m-28')" />
-       <field name="buyer_costs" model="account.tax" search="[('name','=','Buyer Costs')]"></field>
-       <field name="seller_costs" model="account.tax" search="[('name','=','Seller Costs')]"></field>
-       <field name="acc_income" ref="account.a_sale"/>
-       <field name="acc_expense" ref="account.a_expense"/>
-       <field name="journal_id" ref="account.sales_journal"/>
-       <field name="journal_seller_id" ref="account.expenses_journal"/>
-       <field name="account_analytic_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-    </record>
-
-    <record model="auction.dates" id="auction_date_2">
-        <field name="name">Antique Items Exhibition</field>
-        <field name="expo1" eval="time.strftime('%Y-%m-01')" />
-        <field name="expo2" eval="time.strftime('%Y-%m-10')" />
-        <field name="buyer_costs" model="account.tax" search="[('name','=','Buyer Costs')]"></field>
-        <field name="seller_costs" model="account.tax" search="[('name','=','Seller Costs')]"></field>
-        <field name="auction1" eval="time.strftime('%Y-%m-14')" />
-        <field name="auction2" eval="time.strftime('%Y-%m-28')" />
-        <field name="acc_income" ref="account.a_sale"/>
-        <field name="acc_expense" ref="account.a_expense"/>
-        <field name="journal_id" ref="account.sales_journal"/>
-        <field name="journal_seller_id" ref="account.expenses_journal"/>
-        <field name="account_analytic_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-    </record>
-
-<!-- end == demo data for the auction_dates-->
-
-    <!-- start == demo data for the auction_deposit-->
-
-    <record model="auction.deposit" id="auction_deposit_1">
-        <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
-        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-        <field name="method">keep</field>
-    </record>
-
-    <record model="auction.deposit" id="auction_deposit_2">
-        <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
-        <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
-        <field name="method">keep</field>
-    </record>
-
-    <record model="auction.deposit" id="auction_deposit_3">
-        <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
-        <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
-        <field name="method">keep</field>
-    </record>
-
-    <record model="auction.deposit" id="auction_deposit_4">
-        <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
-        <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
-        <field name="method">keep</field>
-    </record>
-
-    <record model="auction.deposit" id="auction_deposit_5">
-        <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
-        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-        <field name="method">keep</field>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_1_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Aera Glasses</field>
-        <field name="lot_num">1</field>
-        <field name="lot_est1">500</field>
-        <field name="lot_est2">700</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">465.00</field>
-        <field name="obj_num">1</field>
-        <field name="obj_price">0.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_1" />
-        <field name="product_id" ref="monproduit"/>
-        <field name="author_right" ref="auction_tax"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_1_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">lake Photos</field>
-        <field name="lot_num">2</field>
-        <field name="lot_est1">1000</field>
-        <field name="lot_est2">1700</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">2</field>
-        <field name="obj_price">1500.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_1" />
-        <!--field name="product_id" ref="monproduit"/-->
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_2_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">fancy mask</field>
-        <field name="lot_num">3</field>
-        <field name="lot_est1">500</field>
-        <field name="lot_est2">700</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">650</field>
-        <field name="obj_num">4</field>
-        <field name="obj_price">0.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_2" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_2_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Dining Table</field>
-        <field name="lot_num">4</field>
-        <field name="lot_est1">200</field>
-        <field name="lot_est2">400</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">4</field>
-        <field name="obj_price">375</field>
-        <field name="bord_vnd_id" ref="auction_deposit_2" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_3_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Plastic glass</field>
-        <field name="lot_num">5</field>
-        <field name="lot_est1">300</field>
-        <field name="lot_est2">500</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">5</field>
-        <field name="obj_price">460</field>
-        <field name="bord_vnd_id" ref="auction_deposit_3" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_3_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Mountain photos</field>
-        <field name="lot_num">6</field>
-        <!--field name="lot_type">painting</field-->
-        <field name="lot_est1">50</field>
-        <field name="lot_est2">100</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">6</field>
-        <field name="obj_price">85</field>
-        <field name="bord_vnd_id" ref="auction_deposit_3" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_4_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">bresslet</field>
-        <field name="lot_num">7</field>
-        <field name="lot_est1">150</field>
-        <field name="lot_est2">400</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">100</field>
-        <field name="obj_num">1</field>
-        <field name="obj_price">0</field>
-        <field name="bord_vnd_id" ref="auction_deposit_4" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_4_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">gold chain</field>
-        <field name="lot_num">11</field>
-        <field name="lot_est1">400</field>
-        <field name="lot_est2">700</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">11</field>
-        <field name="obj_price">550</field>
-        <field name="bord_vnd_id" ref="auction_deposit_4" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_5_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">fiber glass</field>
-        <field name="lot_num">8</field>
-        <field name="lot_est1">300</field>
-        <field name="lot_est2">500</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">0.00</field>
-        <field name="obj_num">8</field>
-        <field name="obj_price">450</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_5_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">lake photos</field>
-        <field name="lot_num">9</field>
-        <field name="lot_est1">100</field>
-        <field name="lot_est2">200</field>
-        <field name="obj_desc">show pices</field>
-        <field name="obj_ret">150</field>
-        <field name="obj_num">9</field>
-        <field name="obj_price">0.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_6_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">mobile photos</field>
-        <field name="lot_num">10</field>
-        <field name="lot_est1">4500</field>
-        <field name="lot_est2">4700</field>
-        <field name="obj_desc">show models</field>
-        <field name="obj_ret">4650</field>
-        <field name="obj_num">10</field>
-        <field name="obj_price">4800.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_6_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Antique photos</field>
-        <field name="lot_num">11</field>
-        <field name="lot_est1">1600</field>
-        <field name="lot_est2">2200</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">2150</field>
-        <field name="obj_num">11</field>
-        <field name="obj_price">2050.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_7_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Hardware  photos</field>
-        <field name="lot_num">12</field>
-        <field name="lot_est1">2600</field>
-        <field name="lot_est2">2800</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">2550</field>
-        <field name="obj_num">12</field>
-        <field name="obj_price">2050.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_7_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Home Appliance photos</field>
-        <field name="lot_num">12</field>
-        <!--field name="lot_type">common</field-->
-        <field name="lot_est1">1600</field>
-        <field name="lot_est2">2200</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">2150</field>
-        <field name="obj_num">12</field>
-        <field name="obj_price">2050.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_8_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">mobile accesories photos</field>
-        <field name="lot_num">13</field>
-        <field name="lot_est1">1600</field>
-        <field name="lot_est2">2200</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">2150</field>
-        <field name="obj_num">13</field>
-        <field name="obj_price">2050.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_8_lot_2">
-        <field name="auction_id" ref="auction_date_2" />
-        <field name="name">pikes-candles</field>
-        <field name="lot_num">14</field>
-        <field name="lot_est1">30</field>
-        <field name="lot_est2">50</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">20</field>
-        <field name="obj_num">14</field>
-        <field name="obj_price">0</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_9_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Coffee Service</field>
-        <field name="lot_num">15</field>
-        <field name="lot_est1">10</field>
-        <field name="lot_est2">20</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">0</field>
-        <field name="obj_num">15</field>
-        <field name="obj_price">25</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_9_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Pendulum</field>
-        <field name="lot_num">16</field>
-        <field name="lot_est1">100</field>
-        <field name="lot_est2">200</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">0</field>
-        <field name="obj_num">16</field>
-        <field name="obj_price">150</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_10_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Cassolette marble</field>
-        <field name="lot_num">17</field>
-        <field name="lot_est1">400</field>
-        <field name="lot_est2">500</field>
-        <field name="obj_desc">Marble Saint Remi</field>
-        <field name="obj_ret">150</field>
-        <field name="obj_num">17</field>
-        <field name="obj_price">0</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_10_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Table</field>
-        <field name="lot_num">18</field>
-        <field name="lot_est1">1600</field>
-        <field name="lot_est2">2200</field>
-        <field name="obj_desc">show map Items</field>
-        <field name="obj_ret">2150</field>
-        <field name="obj_num">18</field>
-        <field name="obj_price">2050.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_11_lot_1">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Yourself</field>
-        <field name="lot_num">19</field>
-        <field name="lot_est1">180</field>
-        <field name="lot_est2">220</field>
-        <field name="obj_desc">Red</field>
-        <field name="obj_ret">0</field>
-        <field name="obj_num">19</field>
-        <field name="obj_price">190.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.lots" id="auction_deposit_12_lot_2">
-        <field name="auction_id" ref="auction_date_1" />
-        <field name="name">Digital photo</field>
-        <field name="lot_num">20</field>
-        <field name="lot_est1">160</field>
-        <field name="lot_est2">340</field>
-        <field name="obj_desc">map Items</field>
-        <field name="obj_ret">0</field>
-        <field name="obj_num">20</field>
-        <field name="obj_price">150.00</field>
-        <field name="bord_vnd_id" ref="auction_deposit_5" />
-        <field name="author_right" ref="auction_tax"/>
-        <field name="product_id" model="product.product" search="[]"/>
-    </record>
-
-    <record model="auction.bid" id="auction_date_1_bid_1">
-        <field name="name">bid1</field>
-        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"/>
-        <field name="auction_id" ref="auction_date_1" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_1_bid_1_auction_bid_line1">
-        <field name="bid_id" ref="auction_date_1_bid_1" />
-        <field name="lot_id" ref="auction_deposit_1_lot_1" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_1_bid_2">
-        <field name="name">bid2</field>
-        <field name="partner_id"  model="res.partner"  search="[('name','=','Unknown')]"/>
-        <field name="auction_id" ref="auction_date_1" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_1_bid_2_auction_bid_line1">
-        <field name="bid_id" ref="auction_date_1_bid_2" />
-        <field name="lot_id" ref="auction_deposit_1_lot_2" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_1_bid_3">
-        <field name="name">bid3</field>
-        <field name="partner_id" model="res.partner"   search="[('name','=','Unknown')]"/>
-        <field name="auction_id" ref="auction_date_1" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_1_bid_3_bid_1_auction_bid_line1">
-        <field name="bid_id" ref="auction_date_1_bid_3" />
-        <field name="lot_id" ref="auction_deposit_2_lot_1" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_1_bid_4">
-       <field name="name">bid4</field>
-       <field name="partner_id"   model="res.partner" search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_1" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_1_bid_4_bid_1_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_1_bid_4" />
-       <field name="lot_id" ref="auction_deposit_2_lot_2" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_1_bid_5">
-       <field name="name">bid5</field>
-       <field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_1" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_1_bid_5_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_1_bid_5" />
-       <field name="lot_id" ref="auction_deposit_3_lot_1" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_2_bid_1">
-       <field name="name">bid6</field>
-       <field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_2" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_2_bid_1_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_2_bid_1" />
-       <field name="lot_id" ref="auction_deposit_3_lot_2" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_2_bid_2">
-       <field name="name">bid7</field>
-       <field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_2" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_2_bid_2_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_2_bid_2" />
-       <field name="lot_id" ref="auction_deposit_4_lot_1" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_2_bid_3">
-       <field name="name">bid8</field>
-       <field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_2" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_2_bid_3_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_2_bid_3" />
-       <field name="lot_id" ref="auction_deposit_4_lot_2" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_2_bid_4">
-       <field name="name">bid9</field>
-       <field name="partner_id" search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_2" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_2_bid_4_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_2_bid_4" />
-       <field name="lot_id" ref="auction_deposit_5_lot_1" />
-    </record>
-
-    <record model="auction.bid" id="auction_date_2_bid_5">
-       <field name="name">bid10</field>
-       <field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
-       <field name="auction_id" ref="auction_date_2" />
-    </record>
-
-    <record model="auction.bid_line" id="auction_date_2_bid_5_auction_bid_line1">
-       <field name="bid_id" ref="auction_date_2_bid_5" />
-       <field name="lot_id" ref="auction_deposit_5_lot_2" />
-    </record>
-
-        <!--demo data for the hr_employee-->
-
-    <record model="hr.employee" id="employee2">
-       <field name="name">Demo</field>
-       <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
-    </record>
-
- <!--demo data for the hr_attendence for employee1 -->
-
-    <record model="hr.attendance" id="unknown1_emp1">
-        <field name="name" eval="time.strftime('%Y-%m-25 08:21')"/>
-        <field name="action">sign_in</field>
-        <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp2">
-       <field name="name" eval="time.strftime('%Y-%m-25 9:21')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp3">
-       <field name="name" eval="time.strftime('%Y-%m-25 09:25')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp4">
-       <field name="name" eval="time.strftime('%Y-%m-25 11:54')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp5">
-       <field name="name" eval="time.strftime('%Y-%m-25 11:59')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp6">
-       <field name="name" eval="time.strftime('%Y-%m-25 13:31')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee_fp"/>
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp7">
-       <field name="name" eval="time.strftime('%Y-%m-25 20:10')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
-    <record model="hr.attendance" id="unknown1_emp8">
-       <field name="name" eval="time.strftime('%Y-%m-25 21:34')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee_fp" />
-    </record>
-
- <!--demo data for the hr_attendence for employee2-->
-
-    <record model="hr.attendance" id="unknown2_emp1">
-       <field name="name" eval="time.strftime('%Y-%m-26 08:21')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp2">
-       <field name="name" eval="time.strftime('%Y-%m-26 9:21')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp3">
-       <field name="name" eval="time.strftime('%Y-%m-26 10:21')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp4">
-       <field name="name" eval="time.strftime('%Y-%m-26 12:54')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp5">
-       <field name="name" eval="time.strftime('%Y-%m-26 13:32')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp6">
-       <field name="name" eval="time.strftime('%Y-%m-26 16:31')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="employee2"/>
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp7">
-       <field name="name" eval="time.strftime('%Y-%m-26 17:10')"/>
-       <field name="action">sign_in</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-
-    <record model="hr.attendance" id="unknown2_emp8">
-       <field name="name" eval="time.strftime('%Y-%m-26 22:34')"/>
-       <field name="action">sign_out</field>
-       <field name="employee_id" ref="employee2" />
-    </record>
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('auction.group_auction_manager'))]"/> 
-    </record>
-    </data>
-</openerp>

addons/auction/auction_report.xml

@@ -1,171 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-    <report string="Bailiffs Listing"
-		model="auction.lots"
-		name="flagey.huissier"
-		xsl="auction/report/huissier.xsl"
-		auto="False"
-		id="v_huissier"
-		multi="1"
-		/>
-
-    <report string="Artists Biography"
-		 model="auction.artists"
-		 name="report.auction.artists"
-		 xml="auction/report/artists.xml"
-		 xsl="auction/report/artists.xsl"
-		 id="art2"
-		 multi="1"/>
-
-    <report string="Bids phones"
-		 model="auction.lots"
-		 name="bids.lots"
-		 rml="auction/report/bids_lots.rml"
-		 id="bid_phone"
-		 multi="1"/>
-
-    <report string="Bids"
-		 model="auction.bid"
-		 name="auction.bids"
-		 rml="auction/report/auction_bids.rml"
-		 id="bid_auction"
-		 multi="1"/>
-
-
-	<report
-		string="Barcode batch"
-		model="auction.lots"
-		name="auction.code_bar_lot"
-		rml="auction/report/report_lot_bar_code.rml"
-		 multi="1"
-		id="v_report_barcode_lot"/>
-
-
-	<report string="Seller Labels"
-		 model="auction.lots"
-		 name="auction.seller_labels"
-		 auto="False"
-		 multi="1"/>
-
-	<report string="Catalog"
-	   	model="auction.lots"
-		name="auction.catelog"
-		rml="auction/report/auction_catelog.rml"
-		auto="False"
-		multi="1"/>
-
-	<report string="Lots List"
-	   	model="auction.lots"
-		name="lots.list"
-		rml="auction/report/lots_list.rml"
-		auto="False"
-		multi="1"/>
-
-
-	<report string="Lots List - Landscape"
-		 model="auction.lots"
-		 name="report.auction.lots.list.landscape"
-		 xml="auction/report/lots_list_landscape.xml"
-		 xsl="auction/report/lots_list_landscape.xsl"
-		id="lot_list_inv"
-		  multi="1"/>
-
-    <report string="Lots List Inventory"
-         model="auction.lots"
-         name="lots.list.inventory"
-         rml="auction/report/lots_list_inventory.rml"
-         multi="1"/>
-
-    <report string="Lots List"
-	   	model="auction.lots"
-		name="report.auction.lots.list"
-		xml="auction/report/lots_list.xml"
-		xsl="auction/report/lots_list.xsl"
-		 multi="1"/>
-
-	<report string="Auction Totals with lists"
-	   	model="auction.lots"
-		name="auction.total.rml"
-		rml="auction/report/auction_total.rml"
-		auto="False"
-		id="total_result1"
-		multi="1"/>
-
-	<report string="Buyer Form"
-		id="buyer_form_id"
-		model="auction.lots"
-		name="report.auction.ach_bordereau"
-		xml="auction/report/ach_bordereau.xml"
-		xsl="auction/report/ach_bordereau.xsl"
-		multi="0"
-		header= "True"
-		/>
-
-	<report string="Deposits"
-		id="id_deposit"
-		model="auction.deposit"
-		name="report.auction.deposit"
-		xml="auction/report/deposit.xml"
-		xsl="auction/report/deposit.xsl"/>
-
-	<report string="Seller Form"
-		id="seller_lots_3"
-		model="auction.lots"
-		name="report.auction.vnd_bordereau"
-		xml="auction/report/vnd_bordereau.xml"
-		xsl="auction/report/vnd_bordereau.xsl"
-		multi="1"/>
-
-	<report string="Seller List"
-		model="auction.lots"
-		multi="1"
-		id="seller_form_id"
-		name="report.auction.seller.list"
-		xml="auction/report/seller_list.xml"
-		xsl="auction/report/seller_list.xsl"/>
-
-
-	<report string="Buyer List"
-		model="auction.lots"
-		name="buyer.list"
-		id="buy_id_list"
-	    rml="auction/report/buyer_list.rml"
-	    auto = "False"
-	    multi="1"/>
-
-
-	<report string="Bids per lot (phone)"
-		 model="auction.lots"
-		 name="bids.phones.details"
-		 rml="auction/report/bids_phones_details.rml"
-		 id="details_bids_phones"
-		 multi="1"/>
-
-
-		<!--<report string="Bids per lot (phone)xsl"
-		 model="auction.lots"
-		 name="report.auction.lots.bids.phone"
-		 xml="auction/report/lots_bids_phone.xml"
-		 xsl="auction/report/lots_bids_phone.xsl"
-		 multi="1"/>-->
-
-<!-- temp -->
-
-	<report string="Auction's results"
-		model="auction.lots"
-		name="auction.result"
-	  	rml="auction/report/auction_result.rml"
-		multi="1"/>
-
-	<report string="Results with buyer"
-		model="auction.lots"
-		name="report.auction.buyer.result"
-		rml="auction/report/auction_buyer_result.rml"
-		multi="1"
-		id="res_w_buyer"/>
-
-		</data>
-</openerp>
-