[MERGE]:lp:~openerp-report/openobject-addons/report-dev

bzr revid: apa@tinyerp.com-20101025053845-zfaxw4ckcx73glg3

addons/account/__openerp__.py

@@ -119,7 +119,7 @@ module named account_voucher.
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml',
+        #'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
@@ -131,6 +131,8 @@ module named account_voucher.
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
         'test/account_fiscalyear_close.yml',
+        'test/account_bank_statement.yml',
+        'test/account_cash_statement.yml',
         'test/account_report.yml',
     ],
     'installable': True,

addons/account/account.py

@@ -457,7 +457,9 @@ class account_account(osv.osv):
             if not ids:
                 ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
             if not ids and len(name.split()) >= 2:
-                ids = self.search(cr, user, [('code', operator, name.split()[0]), ('name', operator, name.split()[1])]+ args, limit=limit)
+                #Separating code and name of account for searching
+                operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A. 
+                ids = self.search(cr, user, [('code', operator, operand1), ('name', operator, operand2)]+ args, limit=limit)
         else:
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
@@ -1105,7 +1107,7 @@ class account_move(osv.osv):
             help='All manually created new journal entry 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.'),
-        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
+        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration'),

addons/account/account_analytic_line.py

@@ -110,7 +110,7 @@ class account_analytic_line(osv.osv):
             amount_unit = prod.price_get('list_price', context)[prod_id]
 
         if not company_id:
-            company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
+            company_id = company_obj._company_default_get(cr, uid, 'account.analytic.line', context=context)
             flag = False
             # Compute based on pricetype
             product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
@@ -130,9 +130,9 @@ class account_analytic_line(osv.osv):
             result = round(amount, prec)
             if not flag:
                 result *= -1
-            return {'value': {
-                'amount': result,
-                'general_account_id': a,
+        return {'value': {
+            'amount': result,
+            'general_account_id': a,
             }
         }
 

addons/account/account_bank_statement.py

@@ -86,7 +86,6 @@ class account_bank_statement(osv.osv):
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
-
         res = {}
 
         company_currency_id = res_users_obj.browse(cursor, user, user,
@@ -216,10 +215,8 @@ class account_bank_statement(osv.osv):
 
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
         res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
-        account_analytic_line_obj = self.pool.get('account.analytic.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context)
         st = st_line.statement_id
@@ -395,8 +392,6 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        account_journal_obj = self.pool.get('account.journal')
-        res_users_obj = self.pool.get('res.users')
         cursor.execute('SELECT balance_end_real \
                 FROM account_bank_statement \
                 WHERE journal_id = %s AND NOT state = %s \

addons/account/account_cash_statement.py

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -45,13 +46,13 @@ class account_cashbox_line(osv.osv):
             res[obj.id] = obj.pieces * obj.number
         return res
 
-    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+    def on_change_sub(self, cr, uid, ids, pieces, number, *a):
 
         """ Calculates Sub total on change of number
         @param pieces: Names of fields.
         @param number:
         """
-        sub=pieces*number
+        sub = pieces * number
         return {'value':{'subtotal': sub or 0.0}}
 
     _columns = {
@@ -61,6 +62,7 @@ class account_cashbox_line(osv.osv):
         'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
      }
+
 account_cashbox_line()
 
 class account_cash_statement(osv.osv):
@@ -74,7 +76,7 @@ class account_cash_statement(osv.osv):
         @param arg: User defined arguments
         @return: Dictionary of values.
         """
-        res ={}
+        res = {}
         for statement in self.browse(cr, uid, ids):
             amount_total = 0.0
 
@@ -96,10 +98,10 @@ class account_cash_statement(osv.osv):
         """
         res ={}
         for statement in self.browse(cr, uid, ids):
-            amount_total=0.0
+            amount_total = 0.0
             for line in statement.ending_details_ids:
-                amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
+                amount_total += line.pieces * line.number
+            res[statement.id] = amount_total
         return res
 
     def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
@@ -113,14 +115,13 @@ class account_cash_statement(osv.osv):
         for statement in self.browse(cr, uid, ids):
             encoding_total=0.0
             for line in statement.line_ids:
-               encoding_total+= line.amount
-            res2[statement.id]=encoding_total
+               encoding_total += line.amount
+            res2[statement.id] = encoding_total
         return res2
 
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
-
         res = {}
 
         company_currency_id = res_users_obj.browse(cursor, user, user,
@@ -232,8 +233,8 @@ class account_cash_statement(osv.osv):
         'user_id':fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
-        'state': lambda *a: 'draft',
-        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+        'state': 'draft',
+        'date': time.strftime("%Y-%m-%d %H:%M:%S"),
         'user_id': lambda self, cr, uid, context=None: uid,
         'starting_details_ids':_get_cash_open_box_lines,
         'ending_details_ids':_get_default_cash_close_box_lines
@@ -295,10 +296,8 @@ class account_cash_statement(osv.osv):
         @param journal_id: Changed journal_id
         @return:  Dictionary of changed values
         """
-
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
-
         res = {}
         balance_start = 0.0
 
@@ -307,8 +306,7 @@ class account_cash_statement(osv.osv):
                 'balance_start': balance_start
             })
             return res
-        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
-        return res
+        return super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
 
     def _equal_balance(self, cr, uid, cash_id, context=None):
         statement = self.browse(cr, uid, cash_id, context=context)
@@ -329,7 +327,6 @@ class account_cash_statement(osv.osv):
         """
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
-
         statement = statement_pool.browse(cr, uid, ids[0])
         vals = {}
 
@@ -347,9 +344,7 @@ class account_cash_statement(osv.osv):
             'state':'open',
 
         })
-
-        self.write(cr, uid, ids, vals)
-        return True
+        return self.write(cr, uid, ids, vals)
 
     def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
         if journal_type == 'bank':
@@ -363,7 +358,7 @@ class account_cash_statement(osv.osv):
             return super(account_cash_statement, self).statement_close(cr, uid, ids, journal_type, context)
         vals = {
             'state':'confirm',
-            'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")
+            'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")
         }
         return self.write(cr, uid, ids, vals, context=context)
 
@@ -386,4 +381,4 @@ class account_cash_statement(osv.osv):
 
 account_cash_statement()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_end_fy.xml

@@ -14,7 +14,7 @@
             action="action_account_period_tree"
             id="menu_action_account_period_close_tree"
             parent="account.menu_account_end_year_treatments"
-            sequence="0" groups="base.group_extended"/>
+            sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
         
     </data>
 </openerp>

addons/account/account_invoice_view.xml

@@ -150,7 +150,7 @@
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <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"/>
                         <newline/>
                         <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
@@ -259,7 +259,7 @@
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <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"/>
                     <newline/>
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>

addons/account/account_menuitem.xml

@@ -7,8 +7,8 @@
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
-            groups="group_account_user"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+            groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
@@ -21,16 +21,16 @@
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user,group_account_manager"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
@@ -43,7 +43,7 @@
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="menu_journals_report"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             name="Journals"/>
 
     </data>

addons/account/account_report.xml

@@ -45,7 +45,7 @@
         <menuitem
             id="menu_tax_report"
             name="Taxes"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <report id="account_account_balance_landscape"

addons/account/account_view.xml

@@ -743,7 +743,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_type_search"/>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
@@ -1445,7 +1445,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1712,7 +1712,7 @@
         </record>
         <menuitem
             action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc" groups="base.group_extended"/>
+            parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
 
         <!--
             # Payment Terms
@@ -1927,7 +1927,7 @@
         </record>
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
-            groups="base.group_extended"
+            groups="base.group_extended,group_account_manager,group_account_user"
             id="menu_action_subscription_form" sequence="1"
             parent="account.menu_finance_recurrent_entries"/>
 
@@ -2064,17 +2064,17 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company"/>
+            groups="base.group_multi_company,group_account_manager"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
             parent="account_template_folder"
-            groups="base.group_multi_company" sequence="2"/>
+            groups="base.group_multi_company,group_account_manager" sequence="2"/>
         <menuitem
             id="account_template_accounts"
             name="Accounts"
             parent="account_template_folder"
-            groups="base.group_multi_company" sequence="1"/>
+            groups="base.group_multi_company,group_account_manager" sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -2443,10 +2443,29 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+        <record id="ir_actions_server_action_wizard_multi_chart" model="ir.actions.server">
+            <field name="type">ir.actions.server</field>
+            <field name="condition">True</field>
+            <field name="state">code</field>
+            <field name="model_id" ref="base.model_ir_actions_todo"/>
+            <field eval="5" name="sequence"/>
+            <field name="code">
+act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
+self.pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
+action = self.pool.get('res.config').next(cr, uid, [], context)
+</field>
+           <field name="name">New Company Financial Setting</field>
+        </record>
 
-        <menuitem name="New Company Financial Setting" parent="account.menu_finance_accounting"
-            groups="group_account_manager"
-            action="account.action_account_configuration_installer" id="menu_wizard"/>
+
+        <record id="menu_act_ir_actions_bleble" model="ir.ui.menu">
+            <field name="name">New Company Financial Setting</field>
+            <field eval="1" name="sequence"/>
+            <field name="parent_id" ref="account.menu_finance_accounting"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="ir_actions_server_action_wizard_multi_chart"/>
+        </record>
 
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
@@ -2698,7 +2717,7 @@
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
-            groups="group_account_user"/>
+            groups="group_account_user,group_account_manager"/>
 
     </data>
 </openerp>

addons/account/board_account_view.xml

@@ -20,22 +20,22 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-    	<record id="action_company_analysis_tree" model="ir.actions.act_window">
-        	<field name="name">Company Analysis</field>
-        	<field name="res_model">account.entries.report</field>
-        	<field name="view_type">form</field>
-        	<field name="view_mode">tree,graph</field>
-        	<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="account.view_company_analysis_tree"/>
-    	</record>
-    	<record id="action_treasory_graph" model="ir.actions.act_window">
-        	<field name="name">Treasory</field>
-        	<field name="res_model">account.account</field>
-        	<field name="view_type">form</field>
-        	<field name="view_mode">graph,tree</field>
+      <record id="action_company_analysis_tree" model="ir.actions.act_window">
+          <field name="name">Company Analysis</field>
+          <field name="res_model">account.entries.report</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,graph</field>
+          <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_account_entries_report_tree"/>
+      </record>
+      <record id="action_treasory_graph" model="ir.actions.act_window">
+          <field name="name">Treasory</field>
+          <field name="res_model">account.account</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','liquidity')]</field>
             <field name="view_id" ref="account.view_treasory_graph"/>
-    	</record>
+      </record>
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -68,6 +68,8 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" 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="13" action="open_board_account"/>
+
 
     </data>
 </openerp>

addons/account/i18n/es.po

@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:09+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-10-24 21:56+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1055,7 +1054,7 @@ msgstr "Hijos"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Mapeo de impuestos ficales"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new

addons/account/i18n/hu.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:08+0000\n"
+"PO-Revision-Date: 2010-10-22 10:28+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4442,7 +4442,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Követelések és kötelezettségek"
 
 #. module: account
 #: rml:account.general.ledger:0

addons/account/i18n/it.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-20 07:22+0000\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -353,7 +353,7 @@ msgstr "Delta di Debito"
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Imposte"
+msgstr "Tassa"
 
 #. module: account
 #: rml:account.general.journal:0

addons/account/i18n/mn.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 07:44+0000\n"
+"PO-Revision-Date: 2010-10-21 09:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -46,12 +46,12 @@ msgstr "Хугацаа хожимдсон төлбөрийн тайлангий
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Ноорогноос тайлан батлах."
+msgstr "Ноорог гүйлгээг батлах"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Үндсэн хөрөнгө"
+msgstr "Хөрөнгө"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -85,12 +85,12 @@ msgstr "Хоосон орхивол батлагдсан огноон мөчлө
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr "Тулгалтын үр дүн"
+msgstr "Гүйцээлтийн үр дүн"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Гүйцэтгэгдээгүй гүйлгээнүүд"
+msgstr "Гүйцээгдээгүй бичилтүүд"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -108,7 +108,7 @@ msgstr "Дансны статистик"
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr "Татваруудын мэдээлэлийг хэвлэх"
+msgstr "Татварын тайлан хэвлэх"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -118,7 +118,7 @@ msgstr "Эцэг"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "Журналын хувьцаа"
+msgstr "Журналын ваучер"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -137,7 +137,7 @@ msgstr "Үндсэн тэмдэг"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr "Гүйцэлтгэлийг цуцлах"
+msgstr "Гүйцээгдээгүй бичилтүүд"
 
 #. module: account
 #: constraint:account.period:0
@@ -152,7 +152,7 @@ msgstr "Алдаа! Мөчлөгийн үргэжлэх хугацаа буру
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Ажил гүйлгээнүүд"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -162,7 +162,7 @@ msgstr "Орлогын төвлөрөл"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr "Ноорог нэхэмжлэл бататгах"
+msgstr "Ноорог нэхэмжлэл батлах"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -188,7 +188,7 @@ msgstr "Дансны мод"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr "Гүйлгээний дараалал сонгох"
+msgstr "Журналын бичилт сонгох"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -201,7 +201,7 @@ msgstr "Гүйлгээний нэр"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Дансны загвар гүйлгээ"
+msgstr "Загвар ажил гүйлгээ"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -223,7 +223,7 @@ msgstr "Дансны бичилт"
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr "Хуучин шалгах баланс"
+msgstr "Урьдчилсан баланс"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -296,7 +296,7 @@ msgstr ""
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Тогтмол утга"
+msgstr "Тогтмол"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -319,7 +319,7 @@ msgstr "Мөчлөг сонгох"
 #: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "Эх үүсвэр"
+msgstr "Эх сурвалж"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -329,7 +329,7 @@ msgstr "Гүйлгээний нэр"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr "Ишлэл"
+msgstr "Дугаар"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -466,7 +466,7 @@ msgstr "Тусгай тооцоололт"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Ноорог баримтыг гүйцэлтгэлтэй болон гүйцэлтгэлгүйгээр батлах."
+msgstr "Ноорог гүйлгээг гүйцээлттэй/гүйцээлтгүй байдлаар батлах"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
@@ -528,7 +528,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "Төлсөн гүйцэлтгэл"
+msgstr "Төлсөн тулгалт"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Дансны бичилт бууралт"
+msgstr "Дансны бичилт гүйцээлт"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -706,7 +706,7 @@ msgstr "Нэмэлт мэдээлэл"
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr "Үйлчлүүлэгчийн буцаалт"
+msgstr "Худалдан авагчийн буцаалт"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -894,7 +894,7 @@ msgstr "Заавал бөглөх"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Зарлагын данс"
+msgstr "Зардлын данс"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -1067,7 +1067,7 @@ msgstr "Төлсөн дүн"
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr "Үйлчлүүлэгчийн нэхэмжлэл"
+msgstr "Худалдан авагчийн нэхэмжлэл"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1159,7 +1159,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr "борлуулалтын журнал"
+msgstr "Борлуулалтын журнал"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1356,7 +1356,7 @@ msgstr "Төлөх нэхэмжлэл сонгох"
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr "Дэлгэц"
+msgstr "Харах"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1707,7 +1707,7 @@ msgstr "Өртөг ба Орлого"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй."
+msgstr "Алдаа ! Та цикл хэлбэрийн данс үүсгэх боломжтой."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -2502,7 +2502,7 @@ msgstr "Эхлэн"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Банкны хуулга"
+msgstr "Харилцахын орлого, зарлагын ордер"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2859,7 +2859,7 @@ msgstr "Зарлага төвлөрөл"
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Үйлчлүүлэгчийн дугаар"
+msgstr "Худалдан авагчийн дугаар"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -2965,7 +2965,7 @@ msgstr "Дансны хуулга"
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Баримт: Үйлчлүүлэгчийн дансны хуулга"
+msgstr "Баримт: Худалдан авагчийн дансны хуулга"
 
 #. module: account
 #: view:product.product:0
@@ -3119,7 +3119,7 @@ msgstr "Аналитик Журнал"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr "Гүйлгээний нэр"
+msgstr "Бичлэгийн нэр"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -3136,7 +3136,7 @@ msgstr "("
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Ноорог болгох"
+msgstr "Ноороглох"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -3300,7 +3300,7 @@ msgstr "Санхүүгийн менежмент"
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr "Аль нь ч биш"
+msgstr "Байхгүй"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
@@ -3601,7 +3601,7 @@ msgstr "Шинэ нийлүүлэгчийн буцаалт"
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr "Гүйлгээний загвар"
+msgstr "Гүйлгээний модель"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3693,7 +3693,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr "Дугаарлалт"
+msgstr "Дараалал"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3766,7 +3766,7 @@ msgstr "Биелэх огноо"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "Гүйлгээний тэмдэглэл"
+msgstr "захиалгын бичилт"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3988,7 +3988,7 @@ msgstr "Код/Огноо"
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "Идэвхитэй"
+msgstr "Актив"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -4086,7 +4086,7 @@ msgstr "Ажил гүйлгээ"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Тайлангийн цуваа"
+msgstr "Орлого, зарлагын гүйлгээ"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4411,7 +4411,7 @@ msgstr "банкны төлбөр"
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr "Батлагдсан"
+msgstr "Илгээсэн"
 
 #. module: account
 #: view:account.tax:0
@@ -4482,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд"
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr "Гүйлгээний загварын мөр"
+msgstr "Бүртгэл загвар шугам"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4722,7 +4722,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Банкны ноорог хуулга"
+msgstr "Ноорог гүйлгээ"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -4819,13 +4819,13 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr "Цуцалсан"
+msgstr "Цуцлагдсан"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Банкны ноорог хуулгууд"
+msgstr "Ноорог гүйлгээнүүд"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4931,7 +4931,7 @@ msgstr "Дансны тулгалт"
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "Батлагдсан"
+msgstr "Батлах"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
@@ -5265,7 +5265,7 @@ msgstr "Солих татвар"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr ""
+msgstr "Гараар оруулсан гүйлгээнүүд ноорог хэлбэрээр үүснэ"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
@@ -5280,7 +5280,9 @@ msgstr "Томьёолол"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Гадаад валютын гүйлгээ бол валютыг сонгоно."
+msgstr ""
+"Тухайн дансны валютаас өөр валютаар бичилт хийх үед хэрэглэгдэх валютын "
+"төрөл."
 
 #. module: account
 #: view:account.invoice:0
@@ -5359,7 +5361,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr "Та итгэлтэй байна уу?"
+msgstr "Итгэлтэй байна уу ?"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5602,7 +5604,7 @@ msgstr "Хаах"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Шилжүүлэх"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5720,7 +5722,7 @@ msgstr ""
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr "Тодорхойлолт"
+msgstr "Тайлбар"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5804,7 +5806,7 @@ msgstr "Нэхэмжлэлийн мөр"
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Customer"
-msgstr "Үйлчлүүлэгчийн"
+msgstr "Худалдан авагч"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -6198,7 +6200,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Тайланг хөндлөнгөөр харуулах"
 
 #. module: account
 #: rml:account.account.balance.landscape:0

addons/account/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-04 06:51+0000\n"
+"PO-Revision-Date: 2010-10-24 09:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1348,7 +1348,7 @@ msgstr "Сообщение"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Выберите счета для оплаты и авансирования"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1513,7 +1513,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Журнал возвратов"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -2380,7 +2380,7 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Ваучер №"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
@@ -4294,7 +4294,7 @@ msgstr "Период счета"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Журнал/Форма оплаты"
 
 #. module: account
 #: rml:account.invoice:0

addons/account/i18n/sr.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 07:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-18 12:12+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@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: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2682,10 +2682,10 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
-"Sintetički zbirni konto, ne sadrži knjiženja\r\n"
-"Konsolidacija: Zbirni konto za više preduzeća i paralelne kontne planove\r\n"
-"Obveze: Salda konta partnera - dobavljači\r\n"
-"Potraživanja: Salda konta partnera - kupci\r\n"
+"Sintetički zbirni konto, ne sadrži knjiženja\n"
+"Konsolidacija: Zbirni konto za više preduzeća i paralelne kontne planove\n"
+"Obveze: Salda konta partnera - dobavljači\n"
+"Potraživanja: Salda konta partnera - kupci\n"
 "Zatvoren: Za konta koja se više ne koriste"
 
 #. module: account

addons/account/installer.py

@@ -52,18 +52,17 @@ class account_installer(osv.osv_memory):
 
     _columns = {
         # Accounting
-        'charts':fields.selection(_get_charts, 'Chart of Accounts',
+        'charts': fields.selection(_get_charts, 'Chart of Accounts',
             required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
                  "country."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
-                                  'Periods', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True),
-        'sale_tax':fields.float('Sale Tax(%)'),
-        'purchase_tax':fields.float('Purchase Tax(%)'),
+        'period': fields.selection([('month','Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'),
+        'sale_tax': fields.float('Sale Tax(%)'),
+        'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
 
@@ -91,16 +90,16 @@ class account_installer(osv.osv_memory):
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
-        'period': lambda *a:'month',
-        'sale_tax': lambda *a:0.0,
-        'purchase_tax': lambda *a:0.0,
+        'period': 'month',
+        'sale_tax': 0.0,
+        'purchase_tax': 0.0,
         'company_id': _default_company,
         'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
 
     def on_change_tax(self, cr, uid, id, tax):
-        return {'value':{'purchase_tax':tax}}
+        return {'value': {'purchase_tax': tax}}
 
     def on_change_start_date(self, cr, uid, id, start_date=False):
         if start_date:
@@ -163,10 +162,10 @@ class account_installer(osv.osv_memory):
             vals_tax = {
                 'name':tax.name,
                 'sequence': tax.sequence,
-                'amount':tax.amount,
-                'type':tax.type,
+                'amount': tax.amount,
+                'type': tax.type,
                 'applicable_type': tax.applicable_type,
-                'domain':tax.domain,
+                'domain': tax.domain,
                 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
                 'child_depend': tax.child_depend,
                 'python_compute': tax.python_compute,
@@ -220,7 +219,7 @@ class account_installer(osv.osv_memory):
                 'shortcut': account_template.shortcut,
                 'note': account_template.note,
                 'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
-                'tax_ids': [(6,0,tax_ids)],
+                'tax_ids': [(6, 0, tax_ids)],
                 'company_id': company_id.id,
             }
             new_account = obj_acc.create(cr, uid, vals)
@@ -239,8 +238,8 @@ class account_installer(osv.osv_memory):
                 }
                 bank_account = obj_acc.create(cr, uid, b_vals)
 
-                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
-                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
+                view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal View')])[0] #why fixed name here?
+                view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
                 cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
@@ -259,14 +258,14 @@ class account_installer(osv.osv_memory):
                         'prefix': 'BNK/%(year)s/',
                         'padding': 5
                         }
-                seq_id = obj_sequence.create(cr,uid,vals_seq)
+                seq_id = obj_sequence.create(cr, uid, vals_seq)
 
                 #create the bank journals
-                analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type','=','situation')])
                 analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
                 vals_journal = {}
-                vals_journal['name']= _('Bank Journal ')
-                vals_journal['code']= _('BNK')
+                vals_journal['name'] = _('Bank Journal ')
+                vals_journal['code'] = _('BNK')
                 vals_journal['sequence_id'] = seq_id
                 vals_journal['type'] = 'bank'
                 vals_journal['analytic_journal_id'] = analitical_journal_bank
@@ -277,7 +276,7 @@ class account_installer(osv.osv_memory):
                     vals_journal['view_id'] = view_id_cash
                 vals_journal['default_credit_account_id'] = new_account
                 vals_journal['default_debit_account_id'] = new_account
-                obj_journal.create(cr,uid,vals_journal)
+                obj_journal.create(cr, uid, vals_journal)
 
                 for val in record.bank_accounts_id:
                     seq_padding = 5
@@ -309,8 +308,8 @@ class account_installer(osv.osv_memory):
 
                     #create the bank journal
                     vals_journal = {}
-                    vals_journal['name']= vals_bnk['name'] + ' Journal'
-                    vals_journal['code']= _(vals_bnk['name'][:3]).upper()
+                    vals_journal['name'] = vals_bnk['name'] + ' Journal'
+                    vals_journal['code'] = _(vals_bnk['name'][:3]).upper()
                     vals_journal['sequence_id'] = seq_id
                     vals_journal['type'] = 'cash'
                     if vals.get('currency_id', False):
@@ -398,7 +397,7 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
+        analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
         analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
 
         vals_journal['name'] = _('Purchase Journal')
@@ -447,7 +446,7 @@ class account_installer(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
 
-        obj_journal.create(cr,uid,vals_journal)
+        obj_journal.create(cr, uid, vals_journal)
 
         # Bank Journals
         view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
@@ -459,20 +458,20 @@ class account_installer(osv.osv_memory):
         fields_obj = self.pool.get('ir.model.fields')
 
         todo_list = [
-            ('property_account_receivable','res.partner','account.account'),
-            ('property_account_payable','res.partner','account.account'),
-            ('property_account_expense_categ','product.category','account.account'),
-            ('property_account_income_categ','product.category','account.account'),
-            ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account'),
-            ('property_reserve_and_surplus_account','res.company','account.account'),
+            ('property_account_receivable', 'res.partner', 'account.account'),
+            ('property_account_payable', 'res.partner', 'account.account'),
+            ('property_account_expense_categ', 'product.category', 'account.account'),
+            ('property_account_income_categ', 'product.category', 'account.account'),
+            ('property_account_expense', 'product.template', 'account.account'),
+            ('property_account_income', 'product.template', 'account.account'),
+            ('property_reserve_and_surplus_account', 'res.company', 'account.account'),
         ]
 
         for record in todo_list:
             r = []
-            r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
+            r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)])
             account = getattr(obj_multi, record[0])
-            field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
+            field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])])
             vals = {
                 'name': record[0],
                 'company_id': company_id.id,
@@ -537,8 +536,8 @@ class account_installer(osv.osv_memory):
                 obj_tax = self.pool.get('account.tax')
                 obj_product = self.pool.get('product.product')
                 ir_values = self.pool.get('ir.values')
-                s_tax = (res.get('sale_tax',0.0))/100
-                p_tax = (res.get('purchase_tax',0.0))/100
+                s_tax = (res.get('sale_tax', 0.0))/100
+                p_tax = (res.get('purchase_tax', 0.0))/100
                 tax_val = {}
                 default_tax = []
 
@@ -583,7 +582,7 @@ class account_installer(osv.osv_memory):
                     sale_taxcode_paid_parent_id = False
 
                 if s_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Received')], context=context)
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
                     sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(s_tax*100),
@@ -612,13 +611,13 @@ class account_installer(osv.osv_memory):
                                             'account_collected_id':sales_tax_account_id,
                                             'account_paid_id':sales_tax_account_id
                                             })
-                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Product Sales')],context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')],context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[sales_tax])]})
-                    tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
-                    default_tax.append(('taxes_id',sales_tax))
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]})
+                    tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
+                    default_tax.append(('taxes_id', sales_tax))
                 if p_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Paid')], context=context)
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
                     purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(p_tax*100),
@@ -639,19 +638,20 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'TAX %s%%'%(p_tax*100),
-                                             'amount':p_tax,
-                                             'base_code_id':new_tax_code,
-                                            'tax_code_id':new_paid_tax_code,
-                                            'type_tax_use':'purchase',
-                                            'account_collected_id':purchase_tax_account_id,
-                                            'account_paid_id':purchase_tax_account_id
+                                            {'name': 'TAX%s%%'%(p_tax*100),
+                                             'description': 'TAX%s%%'%(p_tax*100),
+                                             'amount': p_tax,
+                                             'base_code_id': new_tax_code,
+                                            'tax_code_id': new_paid_tax_code,
+                                            'type_tax_use': 'purchase',
+                                            'account_collected_id': purchase_tax_account_id,
+                                            'account_paid_id': purchase_tax_account_id
                                              })
-                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Expenses')], context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
-                    tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
-                    default_tax.append(('supplier_taxes_id',purchase_tax))
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]})
+                    tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
+                    default_tax.append(('supplier_taxes_id', purchase_tax))
                 if tax_val:
                     product_ids = obj_product.search(cr, uid, [])
                     for product in obj_product.browse(cr, uid, product_ids):
@@ -660,7 +660,7 @@ class account_installer(osv.osv_memory):
                         ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
 
             if 'date_start' in res and 'date_stop' in res:
-                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id','=',res['company_id'])])
+                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])])
                 if not f_ids:
                     name = code = res['date_start'][:4]
                     if int(name) != int(res['date_stop'][:4]):
@@ -696,13 +696,13 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
-        'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
+        'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32),
     }
 #    _defaults = {
 #        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
-#        }
+#    }
 
 account_bank_accounts_wizard()
 
@@ -711,17 +711,17 @@ class account_installer_modules(osv.osv_memory):
     _inherit = 'res.config.installer'
     _columns = {
         # Accounting
-        'account_analytic_plans':fields.boolean('Multiple Analytic Plans',
+        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
             help="Allows invoice lines to impact multiple analytic accounts "
                  "simultaneously."),
-        'account_payment':fields.boolean('Suppliers Payment Management',
+        'account_payment': fields.boolean('Suppliers Payment Management',
             help="Streamlines invoice payment and creates hooks to plug "
                  "automated payment systems in."),
-        'account_followup':fields.boolean('Followups Management',
+        'account_followup': fields.boolean('Followups Management',
             help="Helps you generate reminder letters for unpaid invoices, "
                  "including multiple levels of reminding and customized "
                  "per-partner policies."),
-        'account_voucher':fields.boolean('Voucher Management',
+        'account_voucher': fields.boolean('Voucher Management',
             help="Account Voucher module includes all the basic requirements of "
                  "Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
         'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',

addons/account/invoice.py

@@ -464,14 +464,6 @@ class account_invoice(osv.osv):
             result['value'].update(to_update['value'])
         return result
 
-    def onchange_currency_id(self, cr, uid, ids, curr_id, company_id):
-        if curr_id and company_id:
-            currency = self.pool.get('res.currency').browse(cr, uid, curr_id)
-            if currency.company_id.id != company_id:
-                raise osv.except_osv(_('Configuration Error !'),
-                        _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
-        return {}
-
     def onchange_journal_id(self, cr, uid, ids, journal_id=False):
         result = {}
         if journal_id:
@@ -838,7 +830,7 @@ class account_invoice(osv.osv):
                         total_fixed += line.value_amount
                     if line.value == 'procent':
                         total_percent += line.value_amount
-                total_fixed = (total_fixed * 100) / inv.amount_total
+                total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:
                     raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount."))
 

addons/account/partner.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from operator import itemgetter
 
 from osv import fields, osv
@@ -58,8 +59,8 @@ class account_fiscal_position(osv.osv):
                 account_id = pos.account_dest_id.id
                 break
         return account_id
-account_fiscal_position()
 
+account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
@@ -70,8 +71,8 @@ class account_fiscal_position_tax(osv.osv):
         'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
-account_fiscal_position_tax()
 
+account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
@@ -82,6 +83,7 @@ class account_fiscal_position_account(osv.osv):
         'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
+
 account_fiscal_position_account()
 
 class res_partner(osv.osv):
@@ -89,7 +91,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _description = 'Partner'
 
-    def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
+    def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
         cr.execute("""SELECT l.partner_id, a.type, SUM(l.debit-l.credit)
                       FROM account_move_line l
@@ -184,6 +186,7 @@ class res_partner(osv.osv):
             'Companies that refers to partner'),
         'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
     }
+
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/product.py

@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import time
-import netsvc
 from osv import fields, osv
 
 class product_category(osv.osv):
@@ -75,5 +73,7 @@ class product_template(osv.osv):
             view_load=True,
             help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
+
 product_template()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/project.py

@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-import time
-import operator
-
 from osv import fields
 from osv import osv
 
@@ -36,10 +33,11 @@ class account_analytic_journal(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
-        'active': lambda *a: True,
-        'type': lambda *a: 'general',
+        'active': True,
+        'type': 'general',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
 account_analytic_journal()
 
 class account_journal(osv.osv):
@@ -48,7 +46,7 @@ class account_journal(osv.osv):
     _columns = {
         'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
     }
+
 account_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/project_view.xml

@@ -111,7 +111,7 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
 
         <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -132,7 +132,7 @@
             <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -339,7 +339,7 @@
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
 
         #
         # Open journal entries
@@ -351,7 +351,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
 
         #
         # Reporting
@@ -363,7 +363,7 @@
             <field name="view_type">tree</field>
             <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         #
         # Statistics

addons/account/project/wizard/account_analytic_chart_view.xml

@@ -39,7 +39,7 @@
             action="action_account_analytic_chart"
             id="menu_action_analytic_account_tree2"
             icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting"/>
+            groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
 
     </data>
 </openerp>

addons/account/report/account_aged_partner_balance.py

@@ -21,7 +21,6 @@
 
 import time
 
-import pooler
 import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
@@ -96,7 +95,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
                     AND account_account.active\
-                    GROUP BY partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
+                    GROUP BY l.partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
         t = self.cr.fetchall()
         for i in t:
             totals[i[0]] = i[1]

addons/account/report/account_analytic_entries_report_view.xml

@@ -100,7 +100,7 @@
 
     <menuitem action="action_analytic_entries_report" 
         id="menu_action_analytic_entries_report"
-        groups="analytic.group_analytic_accounting"
+        groups="analytic.group_analytic_accounting,group_account_manager"
         parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>

addons/account/report/account_balance.rml

@@ -18,7 +18,7 @@
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
     </blockTableStyle>
 
     <blockTableStyle id="Table8">
@@ -283,7 +283,7 @@
         <para style="P11">
       <font color="white"> </font>
     </para>
-  <blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="1">
+  <blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="2">
       <tr noRowsplits="1">
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">Account</para></td>

addons/account/report/account_balance_sheet.py

@@ -78,11 +78,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         #Getting Profit or Loss Balance from profit and Loss report
-        result_pl = self.obj_pl.get_data(data)
         self.res_bl = self.obj_pl.final_result()
 
         account_pool = db_pool.get('account.account')
-        year_pool = db_pool.get('account.fiscalyear')
 
         types = [
             'liability',

addons/account/report/account_central_journal.py

@@ -72,15 +72,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         if self.target_move == 'posted':
             move_state = ['posted']
 
-        self.cr.execute('SELECT a.currency_id, a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
+        self.cr.execute('SELECT a.currency_id, a.code, a.name, c.symbol AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
                         from account_move_line l  \
                         LEFT JOIN account_move am ON (l.move_id=am.id) \
                         LEFT JOIN account_account a ON (l.account_id=a.id) \
-                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
+                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.symbol, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code as code "\
+        self.cr.execute("SELECT c.symbol as code "\
                 "FROM res_currency c,account_account as ac "\
                 "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id))
         result = self.cr.fetchone()

addons/account/report/account_entries_report.py

@@ -33,9 +33,9 @@ class account_entries_report(osv.osv):
         'date_created': fields.date('Date Created', readonly=True),
         'date_maturity': fields.date('Date Maturity', readonly=True),
         'ref': fields.char('Reference', size=64, readonly=True),
-        'nbr':fields.integer('# of Items', readonly=True),
-        'debit':fields.float('Debit', readonly=True),
-        'credit':fields.float('Credit', readonly=True),
+        'nbr': fields.integer('# of Items', readonly=True),
+        'debit': fields.float('Debit', readonly=True),
+        'credit': fields.float('Credit', readonly=True),
         'balance': fields.float('Balance', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
@@ -77,14 +77,16 @@ class account_entries_report(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
         for arg in args:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid)[0]
                 args.append(['period_id','in',[current_period]])
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
-                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                current_year = fiscalyear_obj.find(cr, uid)
+                ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
                 args.append(['period_id','in',ids])
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
             if a in args:
@@ -94,15 +96,17 @@ class account_entries_report(osv.osv):
 
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
         todel=[]
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
         for arg in domain:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid)[0]
                 domain.append(['period_id','in',[current_period]])
                 todel.append(arg)
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
-                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                current_year = fiscalyear_obj.find(cr, uid)
+                ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
                 domain.append(['period_id','in',ids])
                 todel.append(arg)
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:

addons/account/report/account_entries_report_view.xml

@@ -87,19 +87,6 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
-                <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -119,6 +106,19 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
+                 <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
             </search>
         </field>
     </record>
@@ -127,6 +127,8 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_account_entries_report_search"/>
+        <field name="view_id" ref="view_account_entries_report_tree"/>
         <field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>

addons/account/report/account_general_journal.py

@@ -87,19 +87,19 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
-        self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id, '
+        self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.symbol AS currency_code,l.currency_id, '
                         'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
                         'FROM account_move_line l '
                         'LEFT JOIN account_move am ON (l.move_id=am.id) '
                         'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
                         'LEFT JOIN res_currency c on (l.currency_id=c.id)'
                         'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
-                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.code, l.currency_id ',
+                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.symbol, l.currency_id ',
                         (tuple(move_state), period_id, tuple(self.journal_ids)))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code AS code "\
+        self.cr.execute("SELECT c.symbol AS code "\
                         "FROM res_currency c, account_account AS ac "\
                         "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
         result = self.cr.fetchone()

addons/account/report/account_journal.py

@@ -45,8 +45,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             'get_start_date': self._get_start_date,
             'get_end_date': self._get_end_date,
             'get_fiscalyear': self._get_fiscalyear,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
             'display_currency':self._display_currency,
             'get_sortby': self._get_sortby,
             'get_target_move': self._get_target_move,
@@ -126,7 +124,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return obj_mline.browse(self.cr, self.uid, ids)
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code AS code "\
+        self.cr.execute("SELECT c.symbol AS code "\
                 "FROM res_currency c,account_account AS ac "\
                 "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
         result = self.cr.fetchone()

addons/account/report/account_partner_ledger.py

@@ -46,8 +46,6 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             'get_start_date': self._get_start_date,
             'get_end_date': self._get_end_date,
             'get_fiscalyear': self._get_fiscalyear,
-            'get_start_date':self._get_start_date,
-            'get_end_date': self._get_end_date,
             'get_journal': self._get_journal,
             'get_partners':self._get_partners,
             'get_intial_balance':self._get_intial_balance,
@@ -171,7 +169,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
             "FROM account_move_line AS l,  " \
             "account_move AS m "
-            "WHERE partner_id = %s " \
+            "WHERE l.partner_id = %s " \
             "AND m.id = l.move_id " \
             "AND m.state IN %s "
             "AND account_id IN %s" \
@@ -196,7 +194,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "SELECT sum(debit) " \
                     "FROM account_move_line AS l, " \
                     "account_move AS m "
-                    "WHERE partner_id = %s" \
+                    "WHERE l.partner_id = %s" \
                         "AND m.id = l.move_id " \
                         "AND m.state IN %s "
                         "AND account_id IN %s" \
@@ -213,7 +211,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                 "SELECT sum(debit) " \
                 "FROM account_move_line AS l, " \
                 "account_move AS m "
-                "WHERE partner_id = %s " \
+                "WHERE l.partner_id = %s " \
                     "AND m.id = l.move_id " \
                     "AND m.state IN %s "
                     "AND account_id IN %s" \
@@ -245,7 +243,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "SELECT sum(credit) " \
                     "FROM account_move_line AS l, " \
                     "account_move AS m  "
-                    "WHERE partner_id = %s" \
+                    "WHERE l.partner_id = %s" \
                         "AND m.id = l.move_id " \
                         "AND m.state IN %s "
                         "AND account_id IN %s" \
@@ -262,7 +260,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                 "SELECT sum(credit) " \
                 "FROM account_move_line AS l, " \
                 "account_move AS m "
-                "WHERE partner_id=%s " \
+                "WHERE l.partner_id=%s " \
                     "AND m.id = l.move_id " \
                     "AND m.state IN %s "
                     "AND account_id IN %s" \

addons/account/report/account_report.py

@@ -22,11 +22,11 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
 import pooler
 import tools
 from osv import fields,osv
 
-
 def _code_get(self, cr, uid, context={}):
     acc_type_obj = self.pool.get('account.account.type')
     ids = acc_type_obj.search(cr, uid, [])
@@ -283,5 +283,4 @@ class report_account_sales(osv.osv):
             )""")
 report_account_sales()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_tax_report.py

@@ -24,13 +24,15 @@ import copy
 
 import rml_parse
 from report import report_sxw
+from common_report_header import common_report_header
 
-class tax_report(rml_parse.rml_parse):
+class tax_report(rml_parse.rml_parse, common_report_header):
     _name = 'report.account.vat.declaration'
     def __init__(self, cr, uid, name, context={}):
         super(tax_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
+            'get_account': self._get_account,
             'get_period': self._get_period,
             'get_codes': self._get_codes,
             'get_general': self._get_general,
@@ -41,9 +43,16 @@ class tax_report(rml_parse.rml_parse):
         })
 
 
+
+#    def _get_account(self, form):
+#        if data['model']=='account.account':
+#            return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
+#        return super(tax_report ,self)._get_account(form)
+
+
     def get_years(self,form):
         res={}
-        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
+        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear_id'])
 
         if fiscal_year_name:
             res['fname'] = fiscal_year_name[0][1]

addons/account/report/account_tax_report.rml

@@ -2,34 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Taxes" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="42.0" y1="62.0" width="511" height="728"/>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Tax Report</drawRightString>
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			</pageGraphics>
-
+      <frame id="first" x1="42.0" y1="42.0" width="511" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -37,97 +10,191 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-
     <blockTableStyle id="Table2">
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,1" stop="3,-1"/>
-
-
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau2">
+    <blockTableStyle id="Table_title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_tax_line">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-     <paraStyle name="P1" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
-    <paraStyle name="P2" fontName="Helvetica-bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-
-
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
   <story>
-	<para style="P2">Tax Statement</para>
-  <para style="P2"><font color="white"> </font></para>
-	<blockTable colWidths="538" style="Tableau1">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="510.0" style="Table_Title">
       <tr>
-        <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
-      </tr>
-      <tr>
-        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
+        <td>
+          <para style="terp_header_Centre">Tax Report</para>
+        </td>
       </tr>
     </blockTable>
-  <para style="P2"><font color="white"> </font></para>    	
-	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
-	  <tr>
-	    <td><para style="P12">Tax Name</para></td>
-	    <td><para style="P12a">Debit</para></td>
-	    <td><para style="P12a">Credit</para></td>
-	    <td><para style="P12a">Tax Amount</para></td>
-	  </tr>
-	  <tr>
-	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])&lt;5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]]  [[ o['name'] ]] </font></para></td>
-           <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
-           <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
-           <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
-	  </tr>
-	  </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="128.0,128.0,128.0,128.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Compute Method</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Periods</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Printing Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="128.0,127.0,128.0,128.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[data['form']['based_on'] ]]</para>
+        </td>
+        <td>
+          <para style="P1">[[ get_years(data['form'])['periods'] or removeParentNode('para')]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="194.0,109.0,110.0,97.0" style="Table_title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Tax Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Tax Amount</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</para>
+      <blockTable colWidths="193.0,109.0,110.0,98.0" style="Table_tax_line">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ '...'*len(o['level']) ]] [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]] [[ o['code'] ]] [[ o['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ len(o['level'])==2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]] [[ formatLang(o['debit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ len(o['level'])==2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]] [[ formatLang(o['credit'])]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ len(o['level'])==2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]] [[ formatLang(o['tax_amount']) ]] </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>

addons/account/security/account_security.xml

@@ -100,14 +100,14 @@
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_model"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>

addons/account/security/ir.model.access.csv

@@ -44,12 +44,12 @@
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
 "access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
-"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,0,0,0
+"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
 "access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
 "access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
 "access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
 "access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,0,0,0
+"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
 "access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
 "access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
@@ -77,8 +77,8 @@
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
 "access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,0,0,0
-"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1

addons/account/sequence.py

@@ -62,6 +62,7 @@ class ir_sequence(osv.osv):
                                                            context=context)
         return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
                                                context=context)
+
 ir_sequence()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/test/account_bank_statement.yml

@@ -0,0 +1,63 @@
+-
+  In order to test Bank Statement feature of account I create a bank statement line and confirm it and check it's move created
+-
+  I create a bank statement with Opening and Closing balance 0.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_0}:
+    balance_end_real: 0.0
+    balance_start: 0.0
+    date: '2010-10-14'
+    journal_id: account.bank_journal
+    name: /
+    period_id: account.period_10
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        date: '2010-10-14'
+        name: a
+        partner_id: base.res_partner_4
+        sequence: 0.0
+        type: general
+-
+  I check that Initially bank statement is in the "Draft" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_0}:
+    - state == 'draft'
+-
+  I compute bank statement using Compute button
+-
+  !python {model: account.bank.statement}: |
+    self.button_dummy(cr, uid, [ref("account_bank_statement_0")], {"lang": "en_US",
+      "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank", "section_id":
+      False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
+      "active_id": ref("account.menu_bank_statement_tree"), })
+
+-
+  I modify the bank statement and set the Closing Balance.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_0}:
+    balance_end_real: 1000.0
+
+-
+  I confirm the bank statement using Confirm button
+-
+  !python {model: account.bank.statement}: |
+    self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")], {"lang":
+      "en_US", "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank",
+      "section_id": False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
+      "active_id": ref("account.menu_bank_statement_tree"), })
+-
+  I check that bank statement state is now "Closed"
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_0}:
+    - state == 'confirm'
+
+-
+  I check that move lines created for bank statement and move state is Posted
+-
+  !python {model: account.bank.statement}: |
+    move_line_obj = self.pool.get('account.move.line')
+    bank_data = self.browse(cr, uid, ref("account_bank_statement_0"))
+    assert bank_data.move_line_ids, "Move lines not created for bank statement"
+    for line in bank_data.move_line_ids:
+      assert line.move_id.state == 'posted', "Move state is not posted"

addons/account/test/account_cash_statement.yml

@@ -0,0 +1,82 @@
+-
+  In order to test Cash statement I create a Cash statement and and confirm it and check it's move created
+-
+ !record {model: account.bank.statement, id: account_bank_statement_1}:
+    date: '2010-10-16'
+    journal_id: account.cash_journal
+    name: /
+    period_id: account.period_10
+    user_id: base.user_root
+    starting_details_ids:
+      -  pieces: 10.0
+         number: 2
+         subtotal: 20.0
+      -  pieces: 100.0
+         number: 1
+         subtotal: 200.0
+    balance_start: 220.0
+    balance_end: 220.0
+-
+  I check that Initially bank statement is in the "Draft" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'draft'
+
+-
+  I clicked on Open CashBox button to open the cashbox
+-
+ !python {model: account.bank.statement}: |
+    self.button_open(cr, uid, [ref("account_bank_statement_1")], {"lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
+
+-
+  I check that now bank statement is in the "Open" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'open'
+
+-
+  I enter values in Closing balance before close the cashbox
+-
+  !record {model: account.bank.statement, id: account_bank_statement_1}:
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        date: '2010-10-16'
+        name: test
+        partner_id: base.res_partner_4
+        sequence: 0.0
+        type: general
+    balance_end: 1220.0
+    ending_details_ids:
+      -  pieces: 10.0
+         number: 2
+         subtotal: 20.0
+      -  pieces: 100.0
+         number: 1
+         subtotal: 200.0
+      -  pieces: 500.0
+         number: 2
+         subtotal: 1000.0
+    balance_end_cash: 1220.0
+
+-
+  I clicked on Close CashBox button to close the cashbox
+-
+ !python {model: account.bank.statement}: |
+      self.button_confirm_cash(cr, uid, [ref("account_bank_statement_1")], {"lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
+
+-
+  I check that bank statement state is now "Closed"
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'confirm'
+
+-
+  I check that move lines created for bank statement and move state is Posted
+-
+  !python {model: account.bank.statement}: |
+    move_line_obj = self.pool.get('account.move.line')
+    bank_data = self.browse(cr, uid, ref("account_bank_statement_1"))
+    assert bank_data.move_line_ids, "Move lines not created for bank statement"
+    for line in bank_data.move_line_ids:
+      assert line.move_id.state == 'posted', "Move state is not posted"

addons/account/test/account_report.yml

@@ -65,21 +65,23 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
+    from datetime import datetime
+    from dateutil.relativedelta import relativedelta
     import warnings
+    import md5
+    import hashlib
     warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
+    start = datetime.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = datetime(int(start.year), int(start.month), int(start.day))
     res = {}
     for i in range(5)[::-1]:
-        stop = start - RelativeDateTime(days=30)
+        stop = start - relativedelta(days=30)
         res[str(i)] = {
             'name': (i!=0 and (str((5-(i+1)) * 30) + '-' + str((5-i) * 30)) or ('+'+str(4 * 30))),
             'stop': start.strftime('%Y-%m-%d'),
             'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
         }
-        start = stop - RelativeDateTime(days=1)
+        start = stop - relativedelta(days=1)
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     fy_id = ref('account.data_fiscalyear')

addons/account/wizard/account_automatic_reconcile.py

@@ -248,4 +248,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_automatic_reconcile_view.xml

@@ -51,7 +51,7 @@
             action="action_account_automatic_reconcile"
             id="menu_automatic_reconcile"
             parent="periodical_processing_reconciliation"
-            groups="base.group_extended"/>
+            groups="base.group_extended,group_account_manager,group_account_user"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>

addons/account/wizard/account_change_currency.py

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import osv, fields
 from tools.translate import _
 
@@ -34,7 +35,6 @@ class account_change_currency(osv.osv_memory):
         if context is None:
             context = {}
         if context.get('active_id',False):
-            state = obj_inv.browse(cr, uid, context['active_id']).state
             if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
                 raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
             pass
@@ -43,7 +43,6 @@ class account_change_currency(osv.osv_memory):
         obj_inv = self.pool.get('account.invoice')
         obj_inv_line = self.pool.get('account.invoice.line')
         obj_currency = self.pool.get('res.currency')
-        invoice_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
@@ -77,4 +76,4 @@ class account_change_currency(osv.osv_memory):
 
 account_change_currency()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_chart.py

@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 from osv import fields, osv
-from tools.translate import _
 
 class account_chart(osv.osv_memory):
     """
@@ -38,12 +38,6 @@ class account_chart(osv.osv_memory):
                                         ('posted', 'All Posted Entries')], 'Target Moves', required = True),
     }
 
-    def _get_fiscalyear(self, cr, uid, context=None):
-        """Return default Fiscalyear value"""
-        now = time.strftime('%Y-%m-%d')
-        fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now)], limit=1 )
-        return fiscalyears and fiscalyears[0] or False
-
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
         res = {}
         res['value'] = {}
@@ -81,23 +75,24 @@ class account_chart(osv.osv_memory):
         """
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
+        period_obj = self.pool.get('account.period')
+        fy_obj = self.pool.get('account.fiscalyear')
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['periods'] = [] 
+        result['periods'] = []
         if data['period_from'] and data['period_to']:
-            result['periods'] = self.pool.get('account.period').build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
+            result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
         result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
                                     'state': data['target_move']})
         if data['fiscalyear']:
-            result['name'] += ':' + self.pool.get('account.fiscalyear').read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
+            result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
         return result
 
     _defaults = {
-        'fiscalyear': _get_fiscalyear,
         'target_move': 'all'
     }
 

addons/account/wizard/account_fiscalyear_close.py

@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
-import tools
 
 class account_fiscalyear_close(osv.osv_memory):
     """
@@ -57,7 +57,6 @@ class account_fiscalyear_close(osv.osv_memory):
         obj_acc_move_line = self.pool.get('account.move.line')
         obj_acc_account = self.pool.get('account.account')
         obj_acc_journal_period = self.pool.get('account.journal.period')
-        obj_rec = self.pool.get('account.move.reconcile')
 
         data =  self.read(cr, uid, ids, context=context)
 
@@ -80,9 +79,9 @@ class account_fiscalyear_close(osv.osv_memory):
         if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
             raise osv.except_osv(_('UserError'),
                     _('The journal must have default credit and debit account'))
-        if not new_journal.centralisation:
+        if (not new_journal.centralisation) or new_journal.entry_posted:
             raise osv.except_osv(_('UserError'),
-                    _('The journal must have centralised counterpart'))
+                    _('The journal must have centralised counterpart without the Skipping draft state option checked!'))
 
         move_ids = obj_acc_move_line.search(cr, uid, [
             ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)])
@@ -222,4 +221,4 @@ class account_fiscalyear_close(osv.osv_memory):
 
 account_fiscalyear_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_fiscalyear_close_state.py

@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import tools
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
@@ -63,4 +61,4 @@ class account_fiscalyear_close_state(osv.osv_memory):
 
 account_fiscalyear_close_state()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_invoice_refund.py

@@ -84,7 +84,7 @@ class account_invoice_refund(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         inv_tax_obj = self.pool.get('account.invoice.tax')
         inv_line_obj = self.pool.get('account.invoice.line')
-
+        res_users_obj = self.pool.get('res.users')
         if context is None:
             context = {}
 
@@ -93,7 +93,7 @@ class account_invoice_refund(osv.osv_memory):
             date = False
             period = False
             description = False
-            company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            company = res_users_obj.browse(cr, uid, uid).company_id
             journal_id = form.get('journal_id', False)
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:

addons/account/wizard/account_invoice_state.py

@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+
+from osv import osv
 from tools.translate import _
 import netsvc
 import pooler

addons/account/wizard/account_journal_select.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_journal_select(osv.osv_memory):
     """
@@ -45,8 +45,6 @@ class account_journal_select(osv.osv_memory):
             result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
-
 account_journal_select()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_move_bank_reconcile.py

@@ -18,11 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import tools
+
 from osv import fields, osv
 from tools.translate import _
 
-
 class account_move_bank_reconcile(osv.osv_memory):
     """
         Bank Reconciliation

addons/account/wizard/account_move_journal.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 from tools.translate import _
 import tools
 
@@ -31,7 +31,8 @@ class account_move_journal(osv.osv_memory):
         """
         Return  default account period value
         """
-        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        account_period_obj = self.pool.get('account.period')
+        ids = account_period_obj.find(cr, uid, context=context)
         period_id = False
         if ids:
             period_id = ids[0]
@@ -100,7 +101,7 @@ class account_move_journal(osv.osv_memory):
                 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
             </group>
-        </form>""" % (str(journal), str(period))
+        </form>""" % (tools.ustr(journal), tools.ustr(period))
 
         res.update({
             'arch':view
@@ -119,6 +120,7 @@ class account_move_journal(osv.osv_memory):
         period_pool = self.pool.get('account.journal.period')
         data_pool = self.pool.get('ir.model.data')
         journal_pool = self.pool.get('account.journal')
+        account_period_obj = self.pool.get('account.period')
 
         if context is None:
             context = {}
@@ -132,7 +134,7 @@ class account_move_journal(osv.osv_memory):
 
             if not ids:
                 journal = journal_pool.browse(cr, uid, journal_id)
-                period = self.pool.get('account.period').browse(cr, uid, period_id)
+                period = account_period_obj.browse(cr, uid, period_id)
 
                 name = journal.name
                 state = period.state
@@ -169,4 +171,4 @@ class account_move_journal(osv.osv_memory):
 
 account_move_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_move_line_reconcile_select.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 

addons/account/wizard/account_open_closed_fiscalyear.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -30,15 +31,19 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     }
 
     def remove_entries(self, cr, uid, ids, context={}):
+        fy_obj = self.pool.get('account.fiscalyear')
+        move_obj = self.pool.get('account.move')
+
         data = self.read(cr, uid, ids, [])[0]
-        data_fyear = self.pool.get('account.fiscalyear').browse(cr, uid, data['fyear_id'])
+        data_fyear = fy_obj.browse(cr, uid, data['fyear_id'])
         if not data_fyear.end_journal_period_id:
             raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
         period_journal = data_fyear.end_journal_period_id
-        ids_move = self.pool.get('account.move').search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
+        ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
         return {}
 
 account_open_closed_fiscalyear()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_period_close.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
 
 class account_period_close(osv.osv_memory):
     """
@@ -39,6 +38,7 @@ class account_period_close(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: account period close’s ID or list of IDs
          """
+        period_pool = self.pool.get('account.period')
 
         mode = 'done'
         for form in self.read(cr, uid, ids, context=context):
@@ -48,7 +48,6 @@ class account_period_close(osv.osv_memory):
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
 
                     # Log message for Period
-                    period_pool = self.pool.get('account.period')
                     for period_id, name in period_pool.name_get(cr, uid, [id]):
                         period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {}

addons/account/wizard/account_reconcile.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
@@ -72,6 +73,7 @@ class account_move_line_reconcile(osv.osv_memory):
 
     def trans_rec_reconcile_full(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
         date = False
         period_id = False
         journal_id= False
@@ -80,9 +82,8 @@ class account_move_line_reconcile(osv.osv_memory):
         if context is None:
             context = {}
 
-        data = self.read(cr, uid, ids, context=context)
         date = time.strftime('%Y-%m-%d')
-        ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
+        ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
         #stop the reconciliation process by partner (manual reconciliation) only if there is nothing more to reconcile for this partner
@@ -148,6 +149,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
 
     def trans_rec_reconcile(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
         if context is None:
             context = {}
         data = self.read(cr, uid, ids,context=context)[0]
@@ -160,7 +162,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if context['date_p']:
             date = context['date_p']
 
-        ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
+        ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
 
@@ -171,4 +173,4 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
 
 account_move_line_reconcile_writeoff()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_reconcile_partner_process.py

@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
-from tools.translate import _
 
 class account_partner_reconcile_process(osv.osv_memory):
     _name = 'account.partner.reconcile.process'
@@ -29,15 +29,15 @@ class account_partner_reconcile_process(osv.osv_memory):
 
     def _get_to_reconcile(self, cr, uid, context=None):
         cr.execute("""
-                  SELECT p_id FROM (SELECT l.partner_id as p_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit 
-                                    FROM account_move_line AS l LEFT JOIN account_account a ON (l.account_id = a.id) 
-                                                                LEFT JOIN res_partner p ON (p.id = l.partner_id) 
-                                    WHERE a.reconcile = 't' 
-                                    AND l.reconcile_id IS NULL 
-                                    AND  (%s >  to_char(p.last_reconciliation_date, 'YYYY-MM-DD') OR  p.last_reconciliation_date IS NULL ) 
-                                    AND  l.state <> 'draft' 
-                                    GROUP BY l.partner_id) AS tmp 
-                              WHERE debit > 0 
+                  SELECT p_id FROM (SELECT l.partner_id as p_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+                                    FROM account_move_line AS l LEFT JOIN account_account a ON (l.account_id = a.id)
+                                                                LEFT JOIN res_partner p ON (p.id = l.partner_id)
+                                    WHERE a.reconcile = 't'
+                                    AND l.reconcile_id IS NULL
+                                    AND  (%s >  to_char(p.last_reconciliation_date, 'YYYY-MM-DD') OR  p.last_reconciliation_date IS NULL )
+                                    AND  l.state <> 'draft'
+                                    GROUP BY l.partner_id) AS tmp
+                              WHERE debit > 0
                               AND credit > 0
                 """,(time.strftime('%Y-%m-%d'),)
         )
@@ -55,7 +55,9 @@ class account_partner_reconcile_process(osv.osv_memory):
         return len(map(lambda x: x[0], cr.fetchall())) + 1
 
     def _get_partner(self, cr, uid, context=None):
-        partner = self.pool.get('account.move.line').get_next_partner_only(cr, uid, offset=1, context=context)
+        move_line_obj = self.pool.get('account.move.line')
+
+        partner = move_line_obj.get_next_partner_only(cr, uid, offset=1, context=context)
         if not partner:
             return False
         return partner[0]
@@ -71,9 +73,12 @@ class account_partner_reconcile_process(osv.osv_memory):
         return res
 
     def next_partner(self, cr, uid, ids, context=None):
-        partner_id = self.pool.get('account.move.line').read(cr, uid, context['active_id'], ['partner_id'])['partner_id']
+        move_line_obj = self.pool.get('account.move.line')
+        res_partner_obj = self.pool.get('res.partner')
+
+        partner_id = move_line_obj.read(cr, uid, context['active_id'], ['partner_id'])['partner_id']
         if partner_id:
-            self.pool.get('res.partner').write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
+            res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
         #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
         #TODO: remove that comments when the client side dev is done
         return {}
@@ -93,4 +98,4 @@ class account_partner_reconcile_process(osv.osv_memory):
 
 account_partner_reconcile_process()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_report_balance_sheet.py

@@ -44,7 +44,6 @@ class account_bs_report(osv.osv_memory):
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
         res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='journal_ids']")

addons/account/wizard/account_report_balance_sheet_view.xml

@@ -30,7 +30,7 @@
        <menuitem icon="STOCK_PRINT"
             name="Balance Sheet"
             action="action_account_bs_report"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             id="menu_account_bs_report"
             parent="final_accounting_reports"/>
 

addons/account/wizard/account_report_common.py

@@ -20,8 +20,6 @@
 ##############################################################################
 
 import time
-import datetime
-from datetime import timedelta
 from lxml import etree
 
 from osv import fields, osv
@@ -46,7 +44,6 @@ class account_common_report(osv.osv_memory):
         }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         if context.get('active_model', False) == 'account.account' and view_id:
             doc = etree.XML(res['arch'])
@@ -111,8 +108,6 @@ class account_common_report(osv.osv_memory):
         if context is None:
             context = {}
         result = {}
-        period_obj = self.pool.get('account.period')
-        fiscal_obj = self.pool.get('account.fiscalyear')
         result['fiscalyear'] = 'fiscalyear_id' in data['form'] and data['form']['fiscalyear_id'] or False
         result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
         result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
@@ -132,7 +127,6 @@ class account_common_report(osv.osv_memory):
     def check_report(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        obj_move = self.pool.get('account.move.line')
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')

addons/account/wizard/account_report_general_ledger_view.xml

@@ -56,7 +56,7 @@
             name="General Ledger"
             parent="account.final_accounting_reports"
             action="action_account_general_ledger_menu"
-            groups="group_account_manager"
+            groups="group_account_manager,group_account_user"
             id="menu_general_ledger"
            />
 

addons/account/wizard/account_report_partner_ledger_view.xml

@@ -34,7 +34,7 @@
         <menuitem icon="STOCK_PRINT"
             name="Partner Ledger"
             action="action_account_partner_ledger"
-            groups="group_account_manager"
+            groups="group_account_manager,group_account_user"
             id="menu_account_partner_ledger"
             parent="account.next_id_22"/>
 

addons/account/wizard/account_tax_chart_view.xml

@@ -39,7 +39,7 @@
             action="action_account_tax_chart"
             id="menu_action_tax_code_tree"
             parent="menu_finance_charts"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             sequence="12"/>
 
     </data>

addons/account/wizard/account_validate_move_view.xml

@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <form string="Validate Account Entries">
                 <separator string="Validate Journal Entries of a Journal" colspan="4"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields." colspan="4"/>
                 <field name="journal_id"/>
                 <newline/>
                 <field name="period_id"/>
@@ -49,7 +49,7 @@
             <form string="Validate Journal Entries">
                 <separator string="Post Journal Entries" colspan="4"/>
                 <image name="terp-referer"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accouting fields." colspan="2"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields." colspan="2"/>
                 <separator colspan="4"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>

addons/account/wizard/account_vat.py

@@ -26,12 +26,13 @@ class account_vat_declaration(osv.osv_memory):
     _description = 'Account Vat Declaration'
     _inherit = "account.common.account.report"
     _columns = {
+        'chart_account_id': fields.many2one('account.account', 'Chart of account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),    
 	    'based_on': fields.selection([('invoices','Invoices'),
                                       ('payments','Payments'),],
                                       'Based On', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-        'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
         }
 
     def _get_company(self, cr, uid, context={}):

addons/account/wizard/account_vat_view.xml

@@ -8,14 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Select Period">
-                <field name="company_id" groups="base.group_multi_company" widget='selection'/>
-                <newline/>
-                <field name="based_on"/>
+                    <field name="chart_account_id" widget="selection"/>            
+                    <field name="company_id" groups="base.group_multi_company" widget='selection'/>
                 <newline/>
+                    <field name="based_on"/>
+                    <field name="fiscalyear_id"/>                
                 <separator string="Select Period(s)" colspan="4"/>
                 	<field name="periods" nolabel="1" colspan="4"/>
-                <separator string="Select FiscalYear(s)" colspan="4"/>                	                
-                    <field name="fiscalyear" nolabel="1" colspan="4"/>
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
                     <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>

addons/account_accountant/i18n/account_accountant.pot

@@ -0,0 +1,22 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_accountant
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-10-18 17:46:01+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:01+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr ""
+

addons/account_analytic_analysis/i18n/account_analytic_analysis.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:02+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgid "Number of hours that can be invoiced plus those that already have been in
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -41,24 +41,9 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -67,8 +52,18 @@ msgid "Theorical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -76,17 +71,6 @@ msgstr ""
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -97,17 +81,6 @@ msgstr ""
 msgid "Real Margin Rate (%)"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid "If invoice from the costs, this is the date of the latest work or cost that have been invoiced."
@@ -115,7 +88,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
+msgid "Billing"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -150,15 +123,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -166,32 +132,19 @@ msgstr ""
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid "Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -199,14 +152,20 @@ msgstr ""
 msgid "report_account_analytic"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -214,17 +173,6 @@ msgstr ""
 msgid "Date of Last Invoiced Cost"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -295,6 +243,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
@@ -310,6 +259,11 @@ msgstr ""
 msgid "All Uninvoiced Entries"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."

addons/account_analytic_analysis/i18n/el.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:31+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-23 07:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@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: 2010-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -27,14 +27,17 @@ msgstr ""
 "τιμολογηθεί"
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr "Περίληψη ωρών ανα χρήστη"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
+"ειδικούς χαρακτήρες!"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Τελευταία Ημερομηνία Τιμολογίου"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -50,37 +53,32 @@ msgstr ""
 "Υπολογισμός χρησιμοποιώντας την φόρμουλα: Μεγιστη Ποσότητα - Συνολικές Ώρες."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Όλοι οι Αναλυτικοί Λογαριασμοί"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Πρόβλημα πρόσβασης"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Οι Τρέχοντες Λογαριασμοί Μου"
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theorical Revenue"
+msgstr "Δυνητικά Έσοδα"
 
 #. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Τελευταία Ημερομηνία Τιμολογίου"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
 msgstr ""
 "Ημερομηνία του τελευταίου τιμολογίου που δημιουργήθηκε για αυτόν τον "
-"αναλυτικό λογαριασμό."
+"λογαριασμό της αναλυτικής."
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr "Θεωρητικά Έσοδα"
-
-#. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Λάθος. Δεν μπορείτε να δημιουργήσετε αναδρομικό μενού"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -88,20 +86,6 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 "Υπολογισμός χρησιμοποιώντας την φόρμουλα: Θεωρητικά Έσοδα - Συνολικά Κόστη"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Νέος Αναλυτικός Λογαριασμός"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -112,32 +96,19 @@ msgstr "Θεωρητικό Περιθώριο"
 msgid "Real Margin Rate (%)"
 msgstr "Πραγματικό Ποσοστό Περιθώριου (%)"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Τρέχοντες Αναλυτικοί Λογαριασμοί"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr ""
-"Ημερομηνία της τελευταίας εργασίας που πραγματοποιήθηκε σε αυτόν τον "
-"λογαριασμό."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"If invoice from the costs, this is the date of the latest work or cost that "
-"have been invoiced."
+"Εάν τιμολογηθεί στο κόστος, αυτή είναι η τελευταία ημέρα τιμολογημένης "
+"εργασίας ή κόστους."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
-msgstr "Τιμολόγηση"
+msgid "Billing"
+msgstr "Χρεώση"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -181,16 +152,9 @@ msgid "User"
 msgstr "Χρήστης"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Οι Αναμενόμενοι Λογαριασμοί Μου"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Οι Μή Τιμολογημένες Εγγραφές Μου"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Μή Τιμολογημένο Ποσό"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -198,70 +162,50 @@ msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr ""
 "Υπολογισμός χρησιμοποιώντας την φόρμουλα: Τιμολογημένο Ποσό - Συνολικά Κόστη."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Οι Λογαριασμοί Μου"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-"Τροποποιήστε την όψη του αναλυτικού λογαριασμού για να επιδείξετε\n"
-"σημαντικές πληροφορίες για τον διαχειριστή του έργου των εταιρειών "
-"υπηρεσιών.\n"
-"Προσθέστε μενού για να δείξετε σχετικές πληροφορίες για κάθε διαχειριστή."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr "Μή Τιμολογημένες Ώρες"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Συν. Ώρες"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr ""
+"Ημερομηνία της τελευταίας εργασίας που πραγματοποιήθηκε σε αυτόν τον "
+"λογαριασμό."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Αναλυτικοί Λογαριασμοί"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Λανθασμένο XML για προβολή αρχιτεκτονικής!"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr "report_account_analytic"
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Άθροισμα ωρών χρήστη"
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Τιμολογημένο Ποσό"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Οικονομική Διαχείριση Έργου"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr ""
+"Προσπαθείτε να προσπεράσετε έναν κανόνα πρόσβασης (Τύπος Εγγράφου: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr "Ημερομηνία Τελευταίου Τιμολογημένου Κόστους"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Μή Τιμολογημένο Ποσό"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Αναμενόμενοι Αναλυτικοί Λογαριασμοί"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -275,7 +219,7 @@ msgstr "Πραγματικό Περιθώριο"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr "Συνολικό ποσό πελάτη για αυτόν τον λογαριασμό."
+msgstr "Συνολικό τιμολογημένο ποσό πελάτη για αυτόν τον λογαριασμό."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -343,8 +287,9 @@ msgstr "Μήνας"
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
+msgstr "Λογαριασμος Αναλυτικής"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
@@ -358,6 +303,11 @@ msgstr "Overpassed Accounts"
 msgid "All Uninvoiced Entries"
 msgstr "Όλες οι Μή Τιμολογημένες Εγγραφές"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Συν. Ώρες"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
@@ -367,7 +317,48 @@ msgstr ""
 "Συνολικά κόστη για τον λογαριασμό. Περιλαμβάνει τα πραγματικά κόστη (απο "
 "τιμολόγια) και έμεσα κοστη, όπως χρόνος που δαπανήθηκε σε χρονοδιαγράμματα."
 
-#, python-format
-#~ msgid "You try to bypass an access rule (Document type: %s)."
+#~ msgid "My Current Accounts"
+#~ msgstr "Οι Τρέχοντες Λογαριασμοί Μου"
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Περίληψη ωρών ανα χρήστη"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Όλοι οι Αναλυτικοί Λογαριασμοί"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Νέος Αναλυτικός Λογαριασμός"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Τρέχοντες Αναλυτικοί Λογαριασμοί"
+
+#~ msgid "Invoicing"
+#~ msgstr "Τιμολόγηση"
+
+#~ msgid "My Accounts"
+#~ msgstr "Οι Λογαριασμοί Μου"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Οι Αναμενόμενοι Λογαριασμοί Μου"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Οι Μή Τιμολογημένες Εγγραφές Μου"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Οικονομική Διαχείριση Έργου"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Αναμενόμενοι Αναλυτικοί Λογαριασμοί"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Αναλυτικοί Λογαριασμοί"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
 #~ msgstr ""
-#~ "Προσπαθείτε να προσπεράσετε έναν κανόνα πρόσβασης (Τύπος Εγγράφου: %s)."
+#~ "Τροποποιήστε την όψη του αναλυτικού λογαριασμού για να επιδείξετε\n"
+#~ "σημαντικές πληροφορίες για τον διαχειριστή του έργου των εταιρειών "
+#~ "υπηρεσιών.\n"
+#~ "Προσθέστε μενού για να δείξετε σχετικές πληροφορίες για κάθε διαχειριστή."

addons/account_analytic_analysis/i18n/es.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:31+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 21:58+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -26,14 +26,17 @@ msgstr ""
 "facturadas."
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr "Resumen de horas por usuario"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -47,25 +50,10 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Todas las cuentas analíticas"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Mis cuentas actuales"
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Error de acceso"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -73,29 +61,25 @@ msgid "Theorical Revenue"
 msgstr "Ingresos teóricos"
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Fecha última factura"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Fecha de la última factura creada para esta cuenta analítica."
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Nueva cuenta analítica"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -106,17 +90,6 @@ msgstr "Margen teórico"
 msgid "Real Margin Rate (%)"
 msgstr "Tasa de margen real (%)"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Cuentas analíticas actuales"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Fecha del último trabajo realizado en esta cuenta."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -128,7 +101,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
+msgid "Billing"
 msgstr "Facturación"
 
 #. module: account_analytic_analysis
@@ -173,85 +146,56 @@ msgid "User"
 msgstr "Usuario"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Mis cuentas pendientes"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Mis entradas no facturadas"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Importe no facturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Mis cuentas"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-"Modifica la vista de cuenta analítica para mostrar\n"
-"datos importantes para el director de proyectos en empresas de servicios.\n"
-"Añade menú para mostrar información relevante para cada director."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr "Horas no facturadas"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Horas totales"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr "Informes contabilidad analítica"
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Gestión de proyectos financieros"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr "Fecha del último coste facturado"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Importe no facturado"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Cuentas analíticas pendientes"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -330,6 +274,7 @@ msgstr "Mes"
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
@@ -345,6 +290,11 @@ msgstr "Cuentas caducadas"
 msgid "All Uninvoiced Entries"
 msgstr "Todas las entradas no facturadas"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Horas totales"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
@@ -353,3 +303,48 @@ msgid ""
 msgstr ""
 "Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
 "costes indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Resumen de horas por usuario"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Todas las cuentas analíticas"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Mis cuentas actuales"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Nueva cuenta analítica"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Cuentas analíticas actuales"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Mis cuentas pendientes"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "My Accounts"
+#~ msgstr "Mis cuentas"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Gestión de proyectos financieros"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Modifica la vista de cuenta analítica para mostrar\n"
+#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
+#~ "Añade menú para mostrar información relevante para cada director."

addons/account_analytic_analysis/i18n/nl.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 10:53+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 11:30+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -26,14 +26,16 @@ msgstr ""
 "gefactureerd is."
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr "Urenoverzicht per gebruiker"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Laatste factuurdatum"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -46,25 +48,10 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Berekend met de formule: maximum hoeveelheid - totaal aantal uren"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Alle kostenplaatsen"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Mijn actuele kostenplaatsen"
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum van de laatst aangemaakte factuur voor deze kostenplaats"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Toegangsfout"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -72,28 +59,25 @@ msgid "Theorical Revenue"
 msgstr "Theoretische omzet"
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Laatste factuurdatum"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Datum van de laatst aangemaakte factuur voor deze kostenplaats"
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Berekend met de formule: theoretische omzet - totale kosten"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Nieuwe kostenplaats"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -104,17 +88,6 @@ msgstr "Theoretische marge"
 msgid "Real Margin Rate (%)"
 msgstr "Werkelijke marge (%)"
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Actuele kostenplaatsen"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Datum van de laatste werkzaamheden geboekt op deze rekening"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -126,7 +99,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
+msgid "Billing"
 msgstr "Facturatie"
 
 #. module: account_analytic_analysis
@@ -171,85 +144,56 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Mijn wachtende kostenplaatsen"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Mijn ongefactureerde boekingen"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Ongefactureerd bedrag"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr "Berekend met de formule: gefactureerd bedrag - totale kosten."
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Mijn kostenplaatsen"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-"Wijzig kostenplaatsscherm voor het tonen van\n"
-"belangrijke gegevens voor de projectmanager van service bedrijven.\n"
-"Voeg menu toe voor het tonen van relevante informatie voor iedere manager."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr "Ongefactureerde uren"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Totaal uren"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Datum van de laatste werkzaamheden geboekt op deze rekening"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Kostenplaatsen"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr "report_account_analytic"
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Urensamenvatting per gebruiker"
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Gefactureerd bedrag"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Financieel projectmanagement"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "U probeert een toegangsregel te omzeilen (Document type: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr "Datum van laatste gefactureerde kosten"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Ongefactureerd bedrag"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Wachtende kostenplaatsen"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -328,6 +272,7 @@ msgstr "Maand"
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Kostenplaats"
 
@@ -343,6 +288,11 @@ msgstr "Overgehevelde kostenplaatsen"
 msgid "All Uninvoiced Entries"
 msgstr "Alle ongefactureerde boekingen"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Totaal uren"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
@@ -352,3 +302,48 @@ msgstr ""
 "Totale kosten voor deze kostenplaats. Inclusief de werkelijke kosten (van "
 "facturen) en indirecte kosten zoals tijd besteed aan het invoeren van "
 "urenstaten."
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Urenoverzicht per gebruiker"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Nieuwe kostenplaats"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Kostenplaatsen"
+
+#~ msgid "My Accounts"
+#~ msgstr "Mijn kostenplaatsen"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Mijn actuele kostenplaatsen"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Alle kostenplaatsen"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Actuele kostenplaatsen"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturatie"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Mijn wachtende kostenplaatsen"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mijn ongefactureerde boekingen"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Wijzig kostenplaatsscherm voor het tonen van\n"
+#~ "belangrijke gegevens voor de projectmanager van service bedrijven.\n"
+#~ "Voeg menu toe voor het tonen van relevante informatie voor iedere manager."
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Financieel projectmanagement"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Wachtende kostenplaatsen"

addons/account_analytic_analysis/i18n/tr.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-23 07:01+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-24 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -24,14 +24,15 @@ msgid ""
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
-msgstr ""
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Son Fatura Tarihi"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Eylem tanımlamasında geçersiz model adı."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -44,25 +45,10 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr "Tüm Analitik Hesaplar"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr "Güncel Hesaplarım"
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
+msgstr "Erişim Hatası"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -70,47 +56,34 @@ msgid "Theorical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Son Fatura Tarihi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Bu analitik hesap için oluşturulan son fatura tarihi."
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Hata! Yinelenen Menü oluşturamazsınız."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr "Yeni Analiz Hesabı"
+msgstr "Computed using the formula: Theorial Revenue - Total Costs"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
-msgstr ""
+msgstr "Teorik Teminat"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr "Güncel Analiz Hesaplarım"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "Gerçek Teminat Oranı (%)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -121,8 +94,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
-msgstr "Faturalama"
+msgid "Billing"
+msgstr "Faturalandırma"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -161,35 +134,15 @@ msgid "User"
 msgstr "Kullanıcı"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr "Bekleyen Hesaplarım"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
-msgstr "Faturalanmamış Kayıtlarım"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Faturasız Tutar"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr "Hesaplarım"
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
+"Şu formül kullanılarak hesaplandı: Faturalanmış Tutar - Toplam Maliyet."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -197,46 +150,41 @@ msgid "Uninvoiced Hours"
 msgstr "Faturasız Saat"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Toplam Saat"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Bu hesapta yapılan son işlem tarihi"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
-msgstr "Analiz Hesapları"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Görüntüleme Yapısı için Geçersiz XML!"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Fatura Tutarı"
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
-msgstr "Finansal Proje Yönetimi"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Bir giriş kuralını atlamayı deneyin (Döküman Türü: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr "Faturasız Tutar"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr "Bekleyen Analiz Hesaplarım"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -245,12 +193,12 @@ msgstr "Faturalanan Saat"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "Gerçek Teminat"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "Bu hesap için toplam müşteri faturası miktarı."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -261,6 +209,7 @@ msgstr ""
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr ""
+"Şu formülü kullanarak hesaplar: (Gerçek Teminat / Toplam Maliyet) * 100."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -277,7 +226,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Kalan Ciro"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -289,12 +238,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr ""
+msgstr "Şu formül kullanılarak hesaplandı: Fatura Tutarı / Toplam Saat."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Saat başına ciro (gerçek)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -311,8 +260,9 @@ msgstr "Ay"
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analiz Hesabı"
+msgstr "Analitik Hesap"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
@@ -326,9 +276,47 @@ msgstr ""
 msgid "All Uninvoiced Entries"
 msgstr "Tüm Faturalanmayan Kayıtlar"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Toplam Saat"
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Tüm Analitik Hesaplar"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Güncel Hesaplarım"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Yeni Analiz Hesabı"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Güncel Analiz Hesaplarım"
+
+#~ msgid "Invoicing"
+#~ msgstr "Faturalama"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Bekleyen Hesaplarım"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Faturalanmamış Kayıtlarım"
+
+#~ msgid "My Accounts"
+#~ msgstr "Hesaplarım"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Analiz Hesapları"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Finansal Proje Yönetimi"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Bekleyen Analiz Hesaplarım"

addons/account_analytic_default/i18n/account_analytic_default.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:02+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,66 +15,51 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
-#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
-msgid "Analytic Defaults"
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
+#. module: account_analytic_default
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid "select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
-msgid "Seq"
+msgid "Current"
 msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,date_stop:0
-msgid "End Date"
+#: view:account.analytic.default:0
+msgid "Group By..."
 msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distributions"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,user_id:0
-msgid "User"
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
 msgstr ""
 
 #. module: account_analytic_default
@@ -82,12 +67,109 @@ msgstr ""
 msgid "Invalid model name in the action definition."
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid "select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
 msgstr ""
 
 #. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid "select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid "select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -98,14 +180,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Conditions"
-msgstr ""
-
-#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
-msgid "Analytic Rules"
+#: help:account.analytic.default,sequence:0
+msgid "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 

addons/account_analytic_default/i18n/nl.po

@@ -6,33 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-02 07:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 11:27+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
-#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
-msgid "Analytic Defaults"
-msgstr "Analytische standaarden"
-
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
 msgstr "Standaard kostenplaats"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
@@ -41,44 +29,44 @@ msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Seq"
-msgstr "Volgorde"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: account_analytic_default
-#: field:account.analytic.default,date_stop:0
-msgid "End Date"
-msgstr "Einddatum"
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,company_id:0
-msgid "Company"
-msgstr "Firma"
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Analytische regels"
 
 #. module: account_analytic_default
-#: field:account.analytic.default,sequence:0
-msgid "Sequence"
-msgstr "Volgorde"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,analytic_id:0
-msgid "Analytic Account"
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
 msgstr "Kostenplaats"
 
 #. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distributions"
-msgstr "Analytische verdelingen"
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "Actueel"
 
 #. module: account_analytic_default
-#: field:account.analytic.default,user_id:0
-msgid "User"
-msgstr "Gebruiker"
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "Groepeer op.."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr "Standaard einddatum voor deze kostenplaats"
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
@@ -86,11 +74,115 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
-msgid "Entries"
-msgstr "Mutaties"
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr "Piklijst"
 
 #. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Voorwaarden"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Verkooporderregel"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr "Standaard begindatum voor deze kostenplaats"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Kostenverdeling"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Boekingen"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Einddatum"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr "Analytische standaarden"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "Rekeningen"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
@@ -101,13 +193,13 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Conditions"
-msgstr "Voorwaarden"
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr "Bepaalt de volgorde bij het weergeven van de kostenverdeling"
 
-#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
-msgid "Analytic Rules"
-msgstr "Analytische regels"
+#~ msgid "Seq"
+#~ msgstr "Volgorde"
+
+#~ msgid "Analytic Distributions"
+#~ msgstr "Analytische verdelingen"

addons/account_analytic_plans/i18n/account_analytic_plans.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:02+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,14 +20,21 @@ msgstr ""
 msgid "Account4 Id"
 msgstr ""
 
+#. module: account_analytic_plans
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
-#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
 msgid "Crossovered Analytic"
 msgstr ""
 
@@ -37,10 +44,15 @@ msgid "Account5 Id"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date2:0
+#: field:account.crossovered.analytic,date2:0
 msgid "End Date"
 msgstr ""
 
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
@@ -51,10 +63,22 @@ msgstr ""
 #: field:account.analytic.plan,name:0
 #: field:account.analytic.plan.line,plan_id:0
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
 msgstr ""
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
@@ -66,12 +90,12 @@ msgid "Analytic Distribution Lines"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,print:0
+#: view:account.crossovered.analytic:0
 msgid "Print"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
 msgstr ""
 
@@ -86,7 +110,7 @@ msgid "Analytic Distribution's Models"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
 msgstr ""
 
@@ -106,69 +130,78 @@ msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_view:wizard.crossovered.analytic,init:0
-msgid "Select Information"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
 msgstr ""
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
-#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,ref:0
-msgid "Analytic Account Ref."
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
 msgstr ""
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.actions.wizard,name:account_analytic_plans.create_model
-msgid "Create Model"
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -176,17 +209,34 @@ msgstr ""
 msgid "Default Entries"
 msgstr ""
 
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -200,7 +250,14 @@ msgid "Maximum Allowed (%)"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
 msgid "Distribution Model Saved"
 msgstr ""
 
@@ -219,6 +276,62 @@ msgstr ""
 msgid "Distribution Models"
 msgstr ""
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
 msgid "This module allows to use several analytic plans, according to the general journal,\n"
@@ -248,78 +361,51 @@ msgid "This module allows to use several analytic plans, according to the genera
 "\n"
 "So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
 "for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time of creation\n"
+"of distribution models.\n"
 "        "
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
 msgstr ""
 
 #. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
-msgid "Analytic Plan Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Crossovered Analytic -"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
 msgstr ""
 
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_button:create.model,info,end:0
-msgid "OK"
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
-msgid "This distribution model has been saved. You will be able to reuse it later."
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "No Analytic Journal !"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -327,6 +413,16 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
@@ -336,33 +432,57 @@ msgstr ""
 #: field:account.analytic.default,analytics_id:0
 #: view:account.analytic.plan.instance:0
 #: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
-msgid "Analytic Distribution's models"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,end:0
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
 msgid "Cancel"
 msgstr ""
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date1:0
+#: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
 msgstr ""
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr ""
 

addons/account_analytic_plans/i18n/nl.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-01 11:48+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 11:23+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -21,6 +21,11 @@ msgstr ""
 msgid "Account4 Id"
 msgstr "Rekening4 Id"
 
+#. module: account_analytic_plans
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
+
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid ""
@@ -29,8 +34,10 @@ msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
-#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
 msgid "Crossovered Analytic"
 msgstr "Overgehevelde kostenplaats"
 
@@ -40,10 +47,15 @@ msgid "Account5 Id"
 msgstr "Rekening5 Id"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date2:0
+#: field:account.crossovered.analytic,date2:0
 msgid "End Date"
 msgstr "Einddatum"
 
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Account3 Id"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
@@ -54,10 +66,24 @@ msgstr "Tarief (%)"
 #: field:account.analytic.plan,name:0
 #: field:account.analytic.plan.line,plan_id:0
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
 msgstr "Kostenplaatsschema"
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Dit verdelingsmodel is opgeslagen. U kunt het later opnieuw gebruiken."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr "Voer een naam en een code in voor het bewaren van het model!"
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
@@ -69,12 +95,12 @@ msgid "Analytic Distribution Lines"
 msgstr "Kostenverdelingsregels"
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,print:0
+#: view:account.crossovered.analytic:0
 msgid "Print"
 msgstr "Afdrukken"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
 msgstr "Tot datum"
 
@@ -89,7 +115,7 @@ msgid "Analytic Distribution's Models"
 msgstr "Kostenverdelingsmodellen"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
 msgstr "Naam rekening"
 
@@ -109,88 +135,114 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr "Naam schema"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
 msgstr "Afdrukdatum"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
 msgstr "Percentage"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Verkooporderregel"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
 msgstr "Laat geen lege regels zien"
 
 #. module: account_analytic_plans
-#: wizard_view:wizard.crossovered.analytic,init:0
-msgid "Select Information"
-msgstr "Kies informatie"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr "analytic.plan.create.model.action"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr "Account3 Id"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "Er bestaat al een model met deze naam en code!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
-#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
 msgstr "Kostenplaatsdagboek"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
 msgstr "100.00%"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,ref:0
-msgid "Analytic Account Ref."
-msgstr "Kostenplaats ref."
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Valuta"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
 msgstr "Kostenplaats:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
 msgstr "Kostenplaats planregel"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "Geen kostenplan gedefinieerd"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
 msgstr "Kostenplaats referentie:"
 
 #. module: account_analytic_plans
-#: model:ir.actions.wizard,name:account_analytic_plans.create_model
-msgid "Create Model"
-msgstr "Model aanmaken"
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Naam schema"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
 msgstr "Standaard boekingen"
 
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
 msgstr "Kostenplaatsschema's"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
-msgstr "Minimaal toegestaan (%)"
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "User Error"
+msgstr "Gebruikersfout"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analytic.plan.create.model"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -203,7 +255,14 @@ msgid "Maximum Allowed (%)"
 msgstr "Maximaal toegestaan(%)"
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Hoofdrekening"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
 msgid "Distribution Model Saved"
 msgstr "Kostenverdelingsmodel opgeslagen"
 
@@ -222,6 +281,62 @@ msgstr "Ongeldige XML voor weergave!"
 msgid "Distribution Models"
 msgstr "Kostenverdelingsmodellen"
 
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Meedere schema's beheren in kostenplaatsen"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Kostenplaatsboekingen"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimaal toegestaan (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Schema"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Account2 Id"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "Het totaal dient tussen %s en %s te liggen"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Bankafschrift regel"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Bedrag"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Account6 Id"
+
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
 msgid ""
@@ -254,115 +369,69 @@ msgid ""
 "So when this line of invoice will be confirmed, it will generate 3 analytic "
 "lines,\n"
 "for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
 "        "
 msgstr ""
-"Deze module stelt u in staat verschillende kostenplaatsschema's te gebuiken, "
-"volgens het algemeen dagboek, zodat meerdere boekingen gemaakt worden "
-"wanneer de facturen of de boekingen bevestigd worden.\n"
-"\n"
-"U kunt bijv. de volgende kostenplaatsstructuur instellen:\n"
-"  Projecten\n"
-"      Project 1\n"
-"          Deelproject 1.1\n"
-"          Deelproject 1.2\n"
-"      Project 2\n"
-"  Verkoper\n"
-"      Jan\n"
-"       Kees\n"
-"\n"
-"Hier hebben we twee schema's: projecten en verkoper. Een factuurregel moet\n"
-"in staat zijn boekingen te doen in beide schema's: deelproject 1.1 en Kees.\n"
-"Het bedrag kan gesplitst worden. Het volgende voorbeeld is voor een factuur\n"
-"die beide deelprojecten raakt en is toegewezen aan een verkoper:\n"
-"\n"
-"Plan1:\n"
-"    Deelproject 1.1: 50%\n"
-"    Deelproject 1.2: 50%\n"
-"Plan2:\n"
-"    Kees: 100%\n"
-"\n"
-"Dus wanneer deze factuurregel wordt bevestigd,dan genereert deze drie\n"
-"kostenplaatsboekingen voor één normale boeking.\n"
-"        "
 
 #. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Meedere schema's beheren in kostenplaatsen"
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Deze verdeling als model opslaan"
 
 #. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
-msgid "Analytic Plan Lines"
-msgstr "Kostenplaatsboekingen"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Crossovered Analytic -"
-msgstr "Overgevelde kostenplaats -"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
-msgstr "Schema"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
-msgstr "Account2 Id"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr "Bedrag"
-
-#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr "Hoofdrekening van dit schema."
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr "Account6 Id"
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
 msgstr "Aantal"
 
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
 msgstr "Account Id"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
 msgstr "Code"
 
 #. module: account_analytic_plans
-#: wizard_button:create.model,info,end:0
-msgid "OK"
-msgstr "Ok"
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Dagboek"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr "Hoofdrekening"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "U moet een een analytisch dagboek definieren op het '%s' dagboek!"
 
 #. module: account_analytic_plans
-#: wizard_view:create.model,info:0
-msgid ""
-"This distribution model has been saved. You will be able to reuse it later."
-msgstr ""
-"Dit kostenverdelingsmodel is opgeslagen. U kunt het later opnieuw gebruiken."
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Geen analytisch dagboek !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
 msgstr "Volgnummer"
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankafschrift"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
@@ -372,32 +441,140 @@ msgstr "Kostenplaats"
 #: field:account.analytic.default,analytics_id:0
 #: view:account.analytic.plan.instance:0
 #: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
 msgstr "Kostenverdeling"
 
 #. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
-msgid "Analytic Distribution's models"
-msgstr "Kostenverdelingsmodellen"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
+msgstr "Waarde fout"
 
 #. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,end:0
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Hoofdrekening van dit schema."
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date1:0
+#: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
 msgstr "op"
 
 #. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr "Vanaf datum"
+
+#~ msgid "OK"
+#~ msgstr "Ok"
+
+#~ msgid "Create Model"
+#~ msgstr "Model aanmaken"
+
+#~ msgid "Analytic Account Ref."
+#~ msgstr "Kostenplaats ref."
+
+#~ msgid "Select Information"
+#~ msgstr "Kies informatie"
+
+#~ msgid ""
+#~ "This module allows to use several analytic plans, according to the general "
+#~ "journal,\n"
+#~ "so that multiple analytic lines are created when the invoice or the entries\n"
+#~ "are confirmed.\n"
+#~ "\n"
+#~ "For example, you can define the following analytic structure:\n"
+#~ "  Projects\n"
+#~ "      Project 1\n"
+#~ "          SubProj 1.1\n"
+#~ "          SubProj 1.2\n"
+#~ "      Project 2\n"
+#~ "  Salesman\n"
+#~ "      Eric\n"
+#~ "      Fabien\n"
+#~ "\n"
+#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
+#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+#~ "Fabien. The amount can also be split. The following example is for\n"
+#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    SubProject 1.1 : 50%\n"
+#~ "    SubProject 1.2 : 50%\n"
+#~ "Plan2:\n"
+#~ "    Eric: 100%\n"
+#~ "\n"
+#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
+#~ "lines,\n"
+#~ "for one account entry.\n"
+#~ "        "
+#~ msgstr ""
+#~ "Deze module stelt u in staat verschillende kostenplaatsschema's te gebuiken, "
+#~ "volgens het algemeen dagboek, zodat meerdere boekingen gemaakt worden "
+#~ "wanneer de facturen of de boekingen bevestigd worden.\n"
+#~ "\n"
+#~ "U kunt bijv. de volgende kostenplaatsstructuur instellen:\n"
+#~ "  Projecten\n"
+#~ "      Project 1\n"
+#~ "          Deelproject 1.1\n"
+#~ "          Deelproject 1.2\n"
+#~ "      Project 2\n"
+#~ "  Verkoper\n"
+#~ "      Jan\n"
+#~ "       Kees\n"
+#~ "\n"
+#~ "Hier hebben we twee schema's: projecten en verkoper. Een factuurregel moet\n"
+#~ "in staat zijn boekingen te doen in beide schema's: deelproject 1.1 en Kees.\n"
+#~ "Het bedrag kan gesplitst worden. Het volgende voorbeeld is voor een factuur\n"
+#~ "die beide deelprojecten raakt en is toegewezen aan een verkoper:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    Deelproject 1.1: 50%\n"
+#~ "    Deelproject 1.2: 50%\n"
+#~ "Plan2:\n"
+#~ "    Kees: 100%\n"
+#~ "\n"
+#~ "Dus wanneer deze factuurregel wordt bevestigd,dan genereert deze drie\n"
+#~ "kostenplaatsboekingen voor één normale boeking.\n"
+#~ "        "
+
+#~ msgid "Crossovered Analytic -"
+#~ msgstr "Overgevelde kostenplaats -"
+
+#~ msgid "Analytic Distribution's models"
+#~ msgstr "Kostenverdelingsmodellen"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr ""
+#~ "Dit kostenverdelingsmodel is opgeslagen. U kunt het later opnieuw gebruiken."

addons/account_anglo_saxon/i18n/account_anglo_saxon.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-24 12:50:50+0000\n"
-"PO-Revision-Date: 2009-11-24 12:50:50+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:03+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,38 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid "This module will support the Anglo-Saxons accounting methodology by \n"
-"    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n"
-"    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n"
-"    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n"
-"    when the invoice is created to transfer this amount to the debtor or creditor account."
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
 msgstr ""
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Account"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+msgid "Stock Accounting for Anglo Saxon countries"
 msgstr ""
 
 #. module: account_anglo_saxon
@@ -46,6 +56,27 @@ msgstr ""
 msgid "Price Difference Account"
 msgstr ""
 
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid "This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped.\n"
+"    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account"
+msgstr ""
+
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
 #: help:product.template,property_account_creditor_price_difference:0

addons/account_anglo_saxon/i18n/nl.po

@@ -7,60 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-10-01 11:59+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-20 07:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-21 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr " Administratieve instelling"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by \n"
-"    changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries \n"
-"    and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at he moment the goods "
-"are shipped.\n"
-"    This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account \n"
-"    when the invoice is created to transfer this amount to the debtor or "
-"creditor account."
-msgstr ""
-"Deze module geeft ondersteuning voor de Angelsaksische boekhoud methoden "
-"door \n"
-"    de boekingslogica bij voorraad transacties te veranderen. Het verschil "
-"tussen de Angelsaksische boekhoud landen en de\n"
-"    Rijn- of ook wel continentale boekhoud landen is het moment van het "
-"nemen van de kosten van verkochte goederen versus kostprijs verkopen. \n"
-"    Angelsaksische boekhoudingen nemen de kosten op het wanneer de "
-"verkoopfactuur wordt gemaakt, Continentale boekhoudingen wanneer wordt "
-"geleverd.\n"
-"    Deze module voegt deze functionaliteit toe door een tussenrekening te "
-"gebruiken voor het boeken van de geleverde goederen en \n"
-"    voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
-"boeken naar de klant of leverancier."
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Account"
-msgstr "Voorraadrekening"
-
 #. module: account_anglo_saxon
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+msgstr "Ongeldige XML voor weergave opbouw!"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Productcategorie"
+
+#. module: account_anglo_saxon
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Inkooporder"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Voorraadboekhouding voor Angelsaksische landen"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -68,6 +60,48 @@ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 msgid "Price Difference Account"
 msgstr "Prijsverschillen rekening"
 
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Piklijst"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"Deze module ondersteunt de Angelsaksische boekhoudmethode door\n"
+"    het wijzigen van de voorraadtransacties. Het verschil tussen de "
+"Angelsaksische boekhouding landen\n"
+"    en de Rijn of ook continentale boekhouding landen is het moment van het "
+"nemen van de kosten van verkochte goederen versus kostprijs verkopen.\n"
+"    Angelsaksische boekhouding neemt de kosten wanneer de factuur gemaakt "
+"wordt, continentale boekhouding neemt de kosten wanneer er geleverd wordt.\n"
+"    Deze module voegt deze functionaliteit toe door gebruikmaking van een "
+"tussenrekening om de waarde van de geleverde goederen op te boeken en \n"
+"    tegen te boeken als de factuur wordt gemaakt naar de klant of "
+"leverancier rekening.\n"
+"    Ten tweede worden prijsverschillen tussen werkelijke inkoopprijs en "
+"vaste product verrekenprijs geboekt op een aparte rekening."
+
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
 #: help:product.template,property_account_creditor_price_difference:0
@@ -77,3 +111,37 @@ msgid ""
 msgstr ""
 "Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
 "kostprijs te boeken."
+
+#~ msgid "Stock Account"
+#~ msgstr "Voorraadrekening"
+
+#~ msgid " Accounting Property"
+#~ msgstr " Administratieve instelling"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by \n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries \n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at he moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account \n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account."
+#~ msgstr ""
+#~ "Deze module geeft ondersteuning voor de Angelsaksische boekhoud methoden "
+#~ "door \n"
+#~ "    de boekingslogica bij voorraad transacties te veranderen. Het verschil "
+#~ "tussen de Angelsaksische boekhoud landen en de\n"
+#~ "    Rijn- of ook wel continentale boekhoud landen is het moment van het "
+#~ "nemen van de kosten van verkochte goederen versus kostprijs verkopen. \n"
+#~ "    Angelsaksische boekhoudingen nemen de kosten op het wanneer de "
+#~ "verkoopfactuur wordt gemaakt, Continentale boekhoudingen wanneer wordt "
+#~ "geleverd.\n"
+#~ "    Deze module voegt deze functionaliteit toe door een tussenrekening te "
+#~ "gebruiken voor het boeken van de geleverde goederen en \n"
+#~ "    voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
+#~ "boeken naar de klant of leverancier."

addons/account_budget/account_budget.py

@@ -110,6 +110,7 @@ class crossovered_budget_lines(osv.osv):
 
     def _prac_amt(self, cr, uid, ids, context={}):
         res = {}
+        result = 0.0
         for line in self.browse(cr, uid, ids):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
@@ -120,10 +121,11 @@ class crossovered_budget_lines(osv.osv):
                 date_from = context['wizard_date_from']
             if context.has_key('wizard_date_to'):
                 date_to = context['wizard_date_to']
-            cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
+            if line.analytic_account_id.id:
+                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
-            result = cr.fetchone()[0]
+                result = cr.fetchone()[0]
             if result is None:
                 result = 0.00
             res[line.id] = result

addons/account_budget/account_budget_view.xml

@@ -131,6 +131,7 @@
                                     <field name="date_to"/>
                                     <field name="paid_date" select="1"/>
                                     <field name="planned_amount" select="1"/>
+                                    <field name="analytic_account_id"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
@@ -185,7 +186,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
-            <field name="name">Budget</field>
+            <field name="name">Budgets</field>
             <field name="res_model">crossovered.budget</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

addons/account_budget/i18n/account_budget.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-10-12 13:20:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:03+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
 msgstr ""
 
 #. module: account_budget
@@ -37,8 +37,8 @@ msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
 msgstr ""
 
@@ -53,60 +53,59 @@ msgid "Validate User"
 msgstr ""
 
 #. module: account_budget
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
 msgstr ""
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
 msgstr ""
 
 #. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
 msgid "End of period"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
-msgstr ""
-
-#. module: account_budget
+#: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "at"
 msgstr ""
 
 #. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Currency:"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "From"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
 msgstr ""
 
 #. module: account_budget
@@ -115,22 +114,232 @@ msgid "Percentage"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
+#: field:crossovered.budget,state:0
+msgid "Status"
 msgstr ""
 
 #. module: account_budget
-#: field:crossovered.budget,state:0
-msgid "Status"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
 msgstr ""
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
 msgid "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for each\n"
 "Budget and Master Budget in order to ensure the total planned is not\n"
@@ -147,234 +356,22 @@ msgid "This module allows accountants to manage analytic and crossovered budgets
 ""
 msgstr ""
 
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr ""
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr ""
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
 msgstr ""
 
 #. module: account_budget
@@ -383,11 +380,6 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr ""
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -398,18 +390,16 @@ msgstr ""
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr ""
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -425,18 +415,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr ""
 
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr ""
-

addons/account_budget/i18n/es.po

@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 15:02+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-24 22:06+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -23,9 +22,9 @@ msgid "Responsible User"
 msgstr "Usuario responsable"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr "% rendimiento"
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -39,8 +38,8 @@ msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
 msgstr "Impreso el:"
 
@@ -54,6 +53,47 @@ msgstr "Confirmar"
 msgid "Validate User"
 msgstr "Validar usuario"
 
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Fecha de pago"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr "a las"
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Moneda:"
+
 #. module: account_budget
 #: constraint:ir.model:0
 msgid ""
@@ -63,81 +103,250 @@ msgstr ""
 "especial!"
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr "Fin del período"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
-msgstr "Fecha impresión:"
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr "a las"
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr "Dotaciones"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr "Rendimiento"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr "Moneda:"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
-msgstr "Desde"
+msgid "Validated"
+msgstr "Validado"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
-msgstr "Resultados"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Estado"
 
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr "Importe práctico"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Importe real"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Línea de presupuesto"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Presupuesto"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Este asistente es utilizado para imprimir el presupuesto"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr "¡El presupuesto general '%s' no tiene cuentas!"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Posición presupuestaria"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Imprimir presupuestos"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "¡Las reglas no están soportadas para los objetos osv_memory !"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Imprimir"
+
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for "
 "each\n"
@@ -158,266 +367,24 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
-"Este módulo permite a los contables gestionar presupuestos analíticos "
-"(costes) y cruzados.\n"
-"\n"
-"Una vez que se han definido los presupuestos principales y los presupuestos "
-"(en Gestión\n"
-"financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
-"importe previsto en\n"
-"cada cuenta analítica.\n"
-"\n"
-"El contable tiene la posibilidad de ver el total del importe previsto para "
-"cada\n"
-"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-"es\n"
-"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-"principal.\n"
-"Cada lista de datos también puede cambiarse a una vista gráfica de la "
-"misma.\n"
-"\n"
-"Están disponibles tres informes:\n"
-"    1. El primero está disponible desde una lista de presupuestos. "
-"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-"por presupuestos principales.\n"
-"\n"
-"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-"los presupuestos seleccionados, de las cuentas analíticas.\n"
-"\n"
-"    3. El último está disponible desde un plan de cuentas analítico. Indica "
-"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-"principales por presupuestos.\n"
-"\n"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr "Cuenta analítica:"
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr "Núm. de cuenta"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr "Importe previsto"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr "Porc(%)"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr "Período del presupuesto"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr "Análisis presupuestario"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr "Seleccionar opciones"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr "Importe real"
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr "Importe teórico"
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr "Imprimir resumen de presupuestos"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr "Cantidad Extendida"
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Líneas"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr "Presupuesto"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr "Fecha de pago"
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Presupuestos"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr "Detalle de elemento presupuestario"
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr "Posición presupuestaria"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr "Inicio del período"
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr "Imprimir presupuestos"
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr "Seleccione fechas del período"
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr "Difusión"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr "Importe teórico"
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr "Presupuesto :"
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
-msgstr "Extensión"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr "Importe previsto"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -425,11 +392,6 @@ msgstr "Extensión"
 msgid "Accounts"
 msgstr "Cuentas"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr "Imprimir presupuestos"
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -440,18 +402,16 @@ msgstr "Imprimir presupuestos"
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr "Líneas de presupuesto"
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -467,17 +427,134 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr "Análisis desde"
 
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr "Validado"
+#~ msgid "% performance"
+#~ msgstr "% rendimiento"
 
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr "Seleccionar período"
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotaciones"
+
+#~ msgid "Performance"
+#~ msgstr "Rendimiento"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "Results"
+#~ msgstr "Resultados"
+
+#~ msgid "A/c No."
+#~ msgstr "Núm. de cuenta"
+
+#~ msgid "to"
+#~ msgstr "hasta"
+
+#~ msgid "Total :"
+#~ msgstr "Total :"
+
+#~ msgid "Period Budget"
+#~ msgstr "Período del presupuesto"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Análisis presupuestario"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Select Options"
+#~ msgstr "Seleccionar opciones"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Imprimir resumen de presupuestos"
+
+#~ msgid "Spread amount"
+#~ msgstr "Cantidad Extendida"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Importe teórico"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Ejercicio fiscal"
+
+#~ msgid "Spread"
+#~ msgstr "Extensión"
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Cuenta analítica:"
+
+#~ msgid "Print Budget"
+#~ msgstr "Imprimir presupuestos"
+
+#~ msgid "Spreading"
+#~ msgstr "Difusión"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Detalle de elemento presupuestario"
+
+#~ msgid ""
+#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
+#~ "\n"
+#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
+#~ "Management/Budgets/), the Project Managers can set the planned amount on "
+#~ "each\n"
+#~ "Analytic Account.\n"
+#~ "\n"
+#~ "The accountant has the possibility to see the total of amount planned for "
+#~ "each\n"
+#~ "Budget and Master Budget in order to ensure the total planned is not\n"
+#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
+#~ "of\n"
+#~ "record can also be switched to a graphical view of it.\n"
+#~ "\n"
+#~ "Three reports are available:\n"
+#~ "    1. The first is available from a list of Budgets. It gives the "
+#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+#~ "\n"
+#~ "    2. The second is a summary of the previous one, it only gives the "
+#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
+#~ "\n"
+#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
+#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
+#~ "Budgets per Budgets.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
+#~ "(costes) y cruzados.\n"
+#~ "\n"
+#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
+#~ "(en Gestión\n"
+#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
+#~ "importe previsto en\n"
+#~ "cada cuenta analítica.\n"
+#~ "\n"
+#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
+#~ "cada\n"
+#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+#~ "es\n"
+#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+#~ "principal.\n"
+#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
+#~ "misma.\n"
+#~ "\n"
+#~ "Están disponibles tres informes:\n"
+#~ "    1. El primero está disponible desde una lista de presupuestos. "
+#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+#~ "por presupuestos principales.\n"
+#~ "\n"
+#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
+#~ "\n"
+#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
+#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+#~ "principales por presupuestos.\n"
+#~ "\n"

addons/account_budget/i18n/nl.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 14:06+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 11:28+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -22,9 +22,9 @@ msgid "Responsible User"
 msgstr "Verantwoordelijke gebruiker"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr "% afgewerkt"
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -38,8 +38,8 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
 msgstr "Afgedrukt op:"
 
@@ -53,6 +53,47 @@ msgstr "Bevestigen"
 msgid "Validate User"
 msgstr "Valideer gebruiker"
 
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Afdruksamenvatting"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Betalingsdatum"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Einde van periode"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr "op"
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Valuta:"
+
 #. module: account_budget
 #: constraint:ir.model:0
 msgid ""
@@ -61,81 +102,249 @@ msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr "Einde van periode"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
-msgstr "Afdrukdatum:"
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr "op"
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr "Dotaties"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr "Verbruik"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr "Valuta:"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
-msgstr "Van"
+msgid "Validated"
+msgstr "Gevalideerd"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
 msgstr "Percentage"
 
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
-msgstr "Resultaten"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Status"
 
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr "Deze assistent wordt gebruikt om budgetsamenvattingen af te drukken"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Terugzetten naar Concept"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Begroot bedrag"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Perc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Verwerkt"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Werkelijk bedrag"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Einddatum"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Theoretisch bedrag"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Regels"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Budget"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Deze assistent wordt gebruikt om budgetten af te drukken"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Budgetten"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Goedkeuren"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Nog goedkeuren"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Budgettaire positie"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Begin periode"
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Budgetten afdrukken"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Kies datums periode"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Afdrukken"
+
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for "
 "each\n"
@@ -156,256 +365,24 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
-"Deze module staat accountants toe om kostenplaatsen en budgetten te "
-"beheren.\n"
-"\n"
-"Zodra de overall begroting en de budgetten bekend zijn (in Financieel\n"
-"beheer/Budgetten/), kunnen de projectleiders de begroting per kostplaats\n"
-"invullen,\n"
-"\n"
-"De accountant heeft de mogelijkheid om te zien of de totale begroting voor "
-"elk\n"
-"budget en overall begroting niet groter/lager is dan wat hijzelf begroot had "
-"voor\n"
-"deze posten. De informatie kan ook grafisch worden weergegeven.\n"
-"\n"
-"Drie overzichten zijn beschikbaar:\n"
-"    1. Een lijst van budgetten. Hierop de spreiding van de kostenplaatsen "
-"per hoofdbudget.\n"
-"    2. Een samenvatting van 1 voor specifieke budgetten.\n"
-"    3. Vanuit de kostenplaatsschema's de spreiding per kostenplaats van het "
-"hoofdbudget per budget.\n"
-"\n"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr "Kostenplaats:"
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr "Afdrukken"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr "Rek.nr."
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr "naar"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr "Totaal :"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr "Begroot bedrag"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr "Perc(%)"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr "Budget periode"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr "Budget analyse"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr "Verwerkt"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr "Bevestig"
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr "Kies opties"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr "Werkelijk bedrag"
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr "Einddatum"
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr "Theoretisch bedrag"
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr "Druk budgetsamenvattingen af"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr "Spreiding bedrag"
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Regels"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr "Budget"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr "Betalingsdatum"
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Budgetten"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr "Begrotingsdetail"
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr "Budgettaire positie"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr "Begin periode"
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr "Budgetten afdrukken"
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr "Kies datums periode"
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr "Spreiding"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr "Theoretisch bedrag"
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr "Boekjaar"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Kostenplaats"
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr "Budget :"
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
-msgstr "Spreiden"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr ""
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -413,11 +390,6 @@ msgstr "Spreiden"
 msgid "Accounts"
 msgstr "Rekeningen"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr "Druk budget af"
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -428,18 +400,16 @@ msgstr "Druk budget af"
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr "Budgetregels"
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -455,17 +425,124 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr "Analyse vanaf"
 
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr "Gevalideerd"
+#~ msgid "% performance"
+#~ msgstr "% afgewerkt"
 
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr "Kies periode"
+#~ msgid "From"
+#~ msgstr "Van"
+
+#~ msgid "to"
+#~ msgstr "naar"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Boekjaar"
+
+#~ msgid "Printing date:"
+#~ msgstr "Afdrukdatum:"
+
+#~ msgid "Results"
+#~ msgstr "Resultaten"
+
+#~ msgid "Total :"
+#~ msgstr "Totaal :"
+
+#~ msgid "Select Options"
+#~ msgstr "Kies opties"
+
+#~ msgid "Spread"
+#~ msgstr "Spreiden"
+
+#~ msgid "Spreading"
+#~ msgstr "Spreiding"
+
+#~ msgid "Period Budget"
+#~ msgstr "Budget periode"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Budget analyse"
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Kostenplaats:"
+
+#~ msgid "Validate"
+#~ msgstr "Bevestig"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Theoretisch bedrag"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Begrotingsdetail"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotaties"
+
+#~ msgid "Performance"
+#~ msgstr "Verbruik"
+
+#~ msgid "A/c No."
+#~ msgstr "Rek.nr."
+
+#~ msgid ""
+#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
+#~ "\n"
+#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
+#~ "Management/Budgets/), the Project Managers can set the planned amount on "
+#~ "each\n"
+#~ "Analytic Account.\n"
+#~ "\n"
+#~ "The accountant has the possibility to see the total of amount planned for "
+#~ "each\n"
+#~ "Budget and Master Budget in order to ensure the total planned is not\n"
+#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
+#~ "of\n"
+#~ "record can also be switched to a graphical view of it.\n"
+#~ "\n"
+#~ "Three reports are available:\n"
+#~ "    1. The first is available from a list of Budgets. It gives the "
+#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+#~ "\n"
+#~ "    2. The second is a summary of the previous one, it only gives the "
+#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
+#~ "\n"
+#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
+#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
+#~ "Budgets per Budgets.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Deze module staat accountants toe om kostenplaatsen en budgetten te "
+#~ "beheren.\n"
+#~ "\n"
+#~ "Zodra de overall begroting en de budgetten bekend zijn (in Financieel\n"
+#~ "beheer/Budgetten/), kunnen de projectleiders de begroting per kostplaats\n"
+#~ "invullen,\n"
+#~ "\n"
+#~ "De accountant heeft de mogelijkheid om te zien of de totale begroting voor "
+#~ "elk\n"
+#~ "budget en overall begroting niet groter/lager is dan wat hijzelf begroot had "
+#~ "voor\n"
+#~ "deze posten. De informatie kan ook grafisch worden weergegeven.\n"
+#~ "\n"
+#~ "Drie overzichten zijn beschikbaar:\n"
+#~ "    1. Een lijst van budgetten. Hierop de spreiding van de kostenplaatsen "
+#~ "per hoofdbudget.\n"
+#~ "    2. Een samenvatting van 1 voor specifieke budgetten.\n"
+#~ "    3. Vanuit de kostenplaatsschema's de spreiding per kostenplaats van het "
+#~ "hoofdbudget per budget.\n"
+#~ "\n"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Druk budgetsamenvattingen af"
+
+#~ msgid "Spread amount"
+#~ msgstr "Spreiding bedrag"
+
+#~ msgid "Print Budget"
+#~ msgstr "Druk budget af"
+
+#~ msgid "Select period"
+#~ msgstr "Kies periode"

addons/account_budget/i18n/sv.po

@@ -6,25 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 14:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-20 07:19+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ansvarig användare"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr ""
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -38,19 +38,60 @@ msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Utskriven vid"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "Bekräfta"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
+msgstr "Validera användare"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Summering"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Betaldatum"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Periodens slut"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
 msgstr ""
 
 #. module: account_budget
@@ -61,55 +102,13 @@ msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
 msgstr ""
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
+msgid "Validated"
 msgstr ""
 
 #. module: account_budget
@@ -118,13 +117,224 @@ msgid "Percentage"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
+#: field:crossovered.budget,state:0
+msgid "Status"
 msgstr ""
 
 #. module: account_budget
-#: field:crossovered.budget,state:0
-msgid "Status"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Budgetar"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
 msgstr ""
 
 #. module: account_budget
@@ -132,10 +342,9 @@ msgstr ""
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for "
 "each\n"
@@ -157,234 +366,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr ""
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Budgetar"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
 msgstr ""
 
 #. module: account_budget
@@ -393,11 +390,6 @@ msgstr ""
 msgid "Accounts"
 msgstr "Konton"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr ""
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -408,18 +400,16 @@ msgstr ""
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr ""
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -435,17 +425,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr ""
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr ""

addons/account_budget/security/account_budget_security.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data noupdate="0">
+    <data noupdate="0">
 
-	    <record id="budget_post_comp_rule" model="ir.rule">
-	    	<field name="name">Budget post multi-company</field>
-	        <field name="model_id" ref="model_account_budget_post"/>
-	        <field eval="True" name="global"/>
-	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-	    </record>
+        <record id="budget_post_comp_rule" model="ir.rule">
+            <field name="name">Budget post multi-company</field>
+            <field name="model_id" ref="model_account_budget_post"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-	    <record id="budget_comp_rule" model="ir.rule">
-	    	<field name="name">Budget multi-company</field>
-	        <field name="model_id" ref="model_crossovered_budget"/>
-	        <field eval="True" name="global"/>
-	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-	    </record>
+        <record id="budget_comp_rule" model="ir.rule">
+            <field name="name">Budget multi-company</field>
+            <field name="model_id" ref="model_crossovered_budget"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-	    <record id="budget_lines_comp_rule" model="ir.rule">
-	    	<field name="name">Budget lines multi-company</field>
-	        <field name="model_id" ref="model_crossovered_budget_lines"/>
-	        <field eval="True" name="global"/>
-	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-	    </record>
+        <record id="budget_lines_comp_rule" model="ir.rule">
+            <field name="name">Budget lines multi-company</field>
+            <field name="model_id" ref="model_crossovered_budget_lines"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>

addons/account_cancel/i18n/account_cancel.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-19 12:03:06+0000\n"
-"PO-Revision-Date: 2010-08-19 12:03:06+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:03+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,6 @@ msgstr ""
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: account_cancel
-#: model:ir.module.module,description:account_cancel.module_meta_information
-msgid "\n"
-"    Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.\n"
-"    "
-msgstr ""
-
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"

addons/account_cancel/i18n/sv.po

@@ -0,0 +1,28 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-20 07:19+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-10-21 05:03+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr ""

addons/account_chart/i18n/account_chart.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:03+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"

addons/account_chart/i18n/sv.po

@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-21 07:34+0000\n"
-"Last-Translator: Kristian <kimocoder> Bremvaag <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-20 07:22+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-21 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Ta bort minimal konto diagram"
+msgstr "Ta bort minimal kontoplan"

addons/account_coda/i18n/account_coda.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-24 13:11:29+0000\n"
-"PO-Revision-Date: 2009-11-24 13:11:29+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:04+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_coda
-#: field:account.coda,journal_id:0
-#: wizard_field:account.coda_import,init,journal_id:0
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
 msgstr ""
 
@@ -27,18 +27,13 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: account_coda
-#: wizard_field:account.coda_import,extraction,note:0
-msgid "Log"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_coda
-#: wizard_button:account.coda_import,extraction,open:0
-msgid "_Open Statement"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,shortdesc:account_coda.module_meta_information
-msgid "Account CODA"
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
 msgstr ""
 
 #. module: account_coda
@@ -47,18 +42,23 @@ msgid "Coda file"
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Clic on 'New' to select your file :"
+#: view:account.coda:0
+msgid "Group By..."
 msgstr ""
 
 #. module: account_coda
-#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
-msgid "Import Coda File"
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
 msgstr ""
 
 #. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_coda
@@ -67,39 +67,59 @@ msgid "Import log"
 msgstr ""
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_receivable:0
-msgid "Default receivable Account"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,description:account_coda.module_meta_information
-msgid "Module provides functionality to import\n"
-"    bank statements from .csv file.\n"
-"    Import coda file wizard is used to import bank statements."
-msgstr ""
-
-#. module: account_coda
-#: wizard_button:account.coda_import,extraction,end:0
-msgid "_Close"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,statement_id:0
-msgid "Generated Bank Statement"
+#: view:account.coda.import:0
+msgid "Import"
 msgstr ""
 
 #. module: account_coda
 #: view:account.coda:0
-#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
-#: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda import"
 msgstr ""
 
 #. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid "Set here the default account that will be used, if the partner is found but does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid "Set here the payable account that will be used, by default, if the partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
 #: field:account.coda,user_id:0
 msgid "User"
 msgstr ""
 
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
 #. module: account_coda
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -111,29 +131,44 @@ msgid "coda for an Account"
 msgstr ""
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_payable:0
+#: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
 msgstr ""
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda
-msgid "Coda Statements"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
 msgstr ""
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
 msgstr ""
 
 #. module: account_coda
-#: wizard_button:account.coda_import,init,extraction:0
-msgid "_Ok"
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
-#: wizard_view:account.coda_import,init:0
-msgid "Import Coda Statement"
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
 msgstr ""
 
 #. module: account_coda
@@ -142,22 +177,86 @@ msgid "Coda"
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
+#: view:account.coda.import:0
 msgid "Results :"
 msgstr ""
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,coda:0
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid "Set here the receivable account that will be used, by default, if the partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
 msgstr ""
 
 #. module: account_coda
-#: field:account.coda,date:0
-msgid "Import Date"
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Select your bank journal :"
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
 msgstr ""
 

addons/account_coda/security/account_security.xml

@@ -5,7 +5,7 @@
         <field name="name">Account Coda model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_coda"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>

addons/account_followup/i18n/account_followup.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:04+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,60 +16,25 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Date :"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Follwoup Summary"
 msgstr ""
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid "Search Followup"
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Customer Ref :"
+#: view:account_followup.stat:0
+msgid "Group By..."
 msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
-msgid "All payable entries"
-msgstr ""
-
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.followup.line,description:0
-msgid "Printed Message"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Amount In Currency"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Due"
-msgstr ""
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total debit"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(user_signature)s: User name"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners"
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
 msgstr ""
 
 #. module: account_followup
@@ -78,172 +43,88 @@ msgstr ""
 msgid "Follow-Up"
 msgstr ""
 
-#. module: account_followup
-#: field:account_followup.stat,debit:0
-msgid "Debit"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Email Settings"
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Ref"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(date)s: Current Date"
-msgstr ""
-
-#. module: account_followup
-#: field:account.move.line,followup_date:0
-msgid "Latest Follow-up"
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.followup.line,followup_id:0
-#: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
-msgstr ""
-
-#. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,date:0
-msgid "Follow-up Sending Date"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
-#: field:account_followup.followup,description:0
-#: rml:account_followup.followup.print:0
-msgid "Description"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Balance:"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "VAT:"
-msgstr ""
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: report:account_followup.followup.print:0
 msgid "Invoice Date"
 msgstr ""
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+#: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Paid"
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
 msgstr ""
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(line)s: Account Move lines"
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.stat,date_followup:0
-msgid "Latest followup"
-msgstr ""
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Partner entries"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Ups Criteria"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Partner Selection"
-msgstr ""
-
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.followup.line,start:0
-msgid "Type of Term"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,init:0
-msgid "Follow-up and Date Selection"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners to remind"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Li."
-msgstr ""
-
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid "\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"			"
-msgstr ""
-
-#. module: account_followup
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,summary,end:0
+#: view:account.followup.print.all:0
 msgid "Ok"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup,name:0
-#: field:account_followup.followup.line,name:0
-msgid "Name"
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move:0
-msgid "First move"
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
 msgstr ""
 
 #. module: account_followup
@@ -252,26 +133,39 @@ msgid "End of Month"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_name)s: User's Company name"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
 msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
-msgid "All receivable entries"
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
 msgstr ""
 
 #. module: account_followup
-#: view:account_followup.followup:0
-msgid "Lines"
+#: field:account_followup.stat,debit:0
+msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
-#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
-msgid "Send followups"
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+msgstr ""
+
+#. module: account_followup
+#: help:account_followup.followup.line,sequence:0
+msgid "Gives the sequence order when displaying a list of follow-up lines."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
 msgstr ""
 
 #. module: account_followup
@@ -280,64 +174,8 @@ msgid "Follow-up Level"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup statistics"
-msgstr ""
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,next:0
-msgid "Continue"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.module.module,shortdesc:account_followup.module_meta_information
-msgid "Accounting follow-ups management"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,summary:0
-#: wizard_field:account_followup.followup.print.all,summary,summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "Follow-Up Lines"
-msgstr ""
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Document : Customer account statement"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-Up lines"
-msgstr ""
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
-
-#. module: account_followup
-#: field:account_followup.stat,balance:0
-msgid "Balance"
-msgstr ""
-
-#. module: account_followup
-#: help:account_followup.followup.print.all,init,date:0
-msgid "This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total credit"
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
 msgstr ""
 
 #. module: account_followup
@@ -355,47 +193,66 @@ msgid "\n"
 "Details of due payments is printed below.\n"
 "\n"
 "Best Regards,\n"
-"			"
+""
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Sub-Total:"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: account_followup
-#: selection:account_followup.followup.line,start:0
-msgid "Net Days"
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
-#: model:ir.actions.act_window,name:account_followup.action_followup_stat
-#: model:ir.model,name:account_followup.model_account_followup_followup
-#: model:ir.ui.menu,name:account_followup.account_followup_menu
-#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
-msgid "Follow-Ups"
+#: view:account.followup.print.all:0
+msgid "Select partners to remind"
 msgstr ""
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-#: wizard_field:account_followup.followup.print.all,next,email_body:0
-msgid "Email body"
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-msgid "Last move"
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Maturity"
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
+#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
+msgid "Send followups"
 msgstr ""
 
 #. module: account_followup
-#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid "\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+""
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "All E-mails have been successfully sent to Partners:.\n\n"
 msgstr ""
 
 #. module: account_followup
@@ -412,55 +269,289 @@ msgid "\n"
 "In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
 "\n"
 "Best Regards,\n"
-"			"
+""
 msgstr ""
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
+#. module: account_followup
+#: help:account.followup.print,date:0
+msgid "This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Select Partners"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
 msgid "Maturity Date"
 msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Legend"
+msgid "%(partner_name)s: Partner Name"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
 msgstr ""
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(heading)s: Move line header"
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_print
+#: model:ir.model,name:account_followup.model_account_followup_print_all
+msgid "Print Followup & Send Mail to Customers"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "E-Mail not sent to following Partners, Email not available !\n\n"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
 msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(partner_name)s: Partner name"
+msgid "Follow-Up Lines"
 msgstr ""
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_conf:0
-msgid "Send email confirmation"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "\n\nE-Mail sent to following Partners successfully. !\n\n"
 msgstr ""
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,followup_id:0
-msgid "Follow-up"
+#: view:account_followup.stat:0
+msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
-msgid "Partner"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,end:0
-#: wizard_button:account_followup.followup.print.all,next,end:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr ""
+
+#. module: account_followup
+#: help:account.followup.print.all,partner_lang:0
+msgid "Do not change message text, if you want to send email in partner language, or configure from company"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
+msgid "Follow-ups Sent"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
 msgstr ""
 
 #. module: account_followup
@@ -469,7 +560,53 @@ msgid "Days of delay"
 msgstr ""
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,next,print:0
-msgid "Print Follow Ups & Send Mails"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
 msgstr ""
 

addons/account_invoice_layout/i18n/account_invoice_layout.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:04+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,9 @@ msgid "Sub Total"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice Date:"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -31,7 +32,8 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
 msgstr ""
 
@@ -42,28 +44,25 @@ msgid "Title"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+#: 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 with Layout and Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Disc. (%)"
 msgstr ""
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "(Incl. taxes):"
-msgstr ""
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
 msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,print:0
-msgid "Print"
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -72,22 +71,35 @@ msgid "This notification will appear at the bottom of the Invoices when printed.
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Unit Price"
 msgstr ""
 
+#. module: account_invoice_layout
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
+msgstr ""
+
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.model,name:account_invoice_layout.model_notify_message
-msgid "Notify By Messages"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Document"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -107,32 +119,30 @@ msgid "Notification Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Customer Ref:"
+#: selection:account.invoice.line,state:0
+msgid "Product"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid ")"
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
 msgstr ""
 
 #. module: account_invoice_layout
-#: field:account.invoice.line,state:0
-msgid "Type"
-msgstr ""
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Price"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "/ ("
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -147,47 +157,59 @@ msgid "Write Messages"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Base"
 msgstr ""
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Fax :"
-msgstr ""
-
-#. module: account_invoice_layout
-#: field:notify.message,msg:0
-msgid "Special Message"
-msgstr ""
-
-#. module: account_invoice_layout
-#: view:notify.message:0
-msgid "Write a notification or a wishful message."
-msgstr ""
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: account_invoice_layout
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Document:"
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_view:wizard.notify_message,init:0
+#: 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 "Partner Ref."
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+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
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Select Message"
 msgstr ""
 
@@ -196,33 +218,32 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#. module: account_invoice_layout
-#: selection:account.invoice.line,state:0
-msgid "Product"
-msgstr ""
-
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Description / Taxes"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Amount"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Description/Taxes"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -232,18 +253,19 @@ msgid "Sequence Number"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Quantity"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "VAT :"
+#: field:account.invoice.line,state:0
+msgid "Type"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -252,55 +274,71 @@ msgid "Separator Line"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Note :"
+#: view:account.invoice.special.msg:0
+msgid "Print"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: 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 "Tax"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
-msgid "account_invoice_layout"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total (Excl. taxes):"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Net Total:"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice"
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
 msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,end:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Cancel"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_field:wizard.notify_message,init,message:0
+#: field:account.invoice.special.msg,message:0
 msgid "Message"
 msgstr ""
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total"
-msgstr ""
-
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"