[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20101019050710-7mxbjxxv020kdqoc

addons/account/account.py

@@ -1215,7 +1215,8 @@ class account_move(osv.osv):
     #
     # TODO: Check if period is closed !
     #
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        context = context or {}
         if 'line_id' in vals and context.get('copy'):
             for l in vals['line_id']:
                 if not l[0]:
@@ -1256,6 +1257,7 @@ class account_move(osv.osv):
         return result
 
     def copy(self, cr, uid, id, default={}, context={}):
+        context = context or {}
         default.update({
             'state':'draft',
             'name':'/',
@@ -1265,7 +1267,8 @@ class account_move(osv.osv):
         })
         return super(account_move, self).copy(cr, uid, id, default, context)
 
-    def unlink(self, cr, uid, ids, context={}, check=True):
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        context = context or {}
         toremove = []
         obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
@@ -1605,7 +1608,7 @@ class account_tax_code(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
-        return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+        return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
                 for x in reads]
 
     def _default_company(self, cr, uid, context={}):
@@ -2019,7 +2022,7 @@ class account_model(osv.osv):
     }
 
     _defaults = {
-        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
     }
     def generate(self, cr, uid, ids, datas={}, context=None):
         move_ids = []
@@ -2221,7 +2224,7 @@ class account_subscription_line(osv.osv):
 account_subscription_line()
 
 #  ---------------------------------------------------------------
-#   Account Templates : Account, Tax, Tax Code and chart. + Wizard
+#   Account Templates: Account, Tax, Tax Code and chart. + Wizard
 #  ---------------------------------------------------------------
 
 class account_tax_template(osv.osv):
@@ -2394,7 +2397,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2544,9 +2547,17 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         if ids:
             return ids[0]
         return False
+
+    def _get_default_accounts(self, cr, uid, context=None):
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
+        return accounts
+
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
         'chart_template_id': _get_chart,
+        'bank_accounts_id': _get_default_accounts,
         'code_digits': 6,
         'seq_journal': True
     }

addons/account/account_analytic_line.py

@@ -24,8 +24,6 @@ import time
 from osv import fields
 from osv import osv
 from tools.translate import _
-import tools
-from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
@@ -82,12 +80,13 @@ class account_analytic_line(osv.osv):
             return {}
         product_obj = self.pool.get('product.product')
         analytic_journal_obj =self.pool.get('account.analytic.journal')
+        company_obj = self.pool.get('res.company')
+        product_price_type_obj = self.pool.get('product.price.type')
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id)
         if not company_id:
             company_id = j_id.company_id.id
         result = 0.0
-        is_purchase = False
 
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
@@ -99,8 +98,6 @@ class account_analytic_line(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (prod.name, prod.id,))
             amount_unit = prod.price_get('standard_price', context)[prod.id]
-            is_purchase = True
-
         else:
             a = prod.product_tmpl_id.property_account_income.id
             if not a:
@@ -128,9 +125,8 @@ class account_analytic_line(osv.osv):
             if pricetype.field == 'list_price':
                 flag = True
             amount_unit = prod.price_get(pricetype.field, context)[prod.id]
-            amount = amount_unit*unit_amount or 1.0
             prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-            amount = amount_unit*unit_amount or 1.0
+            amount = amount_unit*unit or 1.0
             result = round(amount, prec)
             if not flag:
                 result *= -1

addons/account/account_bank_statement.py

@@ -378,7 +378,7 @@ class account_bank_statement(osv.osv):
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
             done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
@@ -501,4 +501,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_invoice_view.xml

@@ -430,7 +430,7 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+            <field name="help">Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers.</field>
         </record>
 
 
@@ -458,7 +458,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+            <field name="help">Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -471,7 +471,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
+            <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -510,22 +510,5 @@
            res_model="account.invoice"
            src_model="account.journal"/>
 
-        <act_window
-            domain="[('account_id.reconcile', '=', True)]"
-            context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
-            id="act_account_invoice_account_move_unreconciled"
-	    groups="base.group_extended"
-            name="Items to Reconcile"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
-        <act_window
-            context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
-            id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items"
-	    groups="base.group_extended"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
     </data>
 </openerp>

addons/account/account_move_line.py

@@ -26,6 +26,7 @@ from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
 import tools
+from operator import itemgetter
 
 class account_move_line(osv.osv):
     _name = "account.move.line"
@@ -863,9 +864,8 @@ class account_move_line(osv.osv):
                     result['toolbar']['action'] = []
 
             #Restrict the list of journal view in search view
-            if view_type == 'search':
-                journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
-                result['fields']['journal_id']['selection'] = journal_list
+            if view_type == 'search' and result['fields'].get('journal_id', False):
+                result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
             return result
 
         if context.get('view_mode', False):
@@ -887,19 +887,20 @@ class account_move_line(osv.osv):
             for field in journal.view_id.columns_id:
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
-                    fld.append((field.field, field.sequence))
+                    fld.append((field.field, field.sequence, field.name))
                     flds.append(field.field)
                     common_fields[field.field] = 1
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3))
-        fld.append(('journal_id', 10))
+
+        fld.append(('period_id', 3, 'Period'))
+        fld.append(('journal_id', 10, 'Journal'))
         flds.append('period_id')
         flds.append('journal_id')
         fields['period_id'] = all_journal
         fields['journal_id'] = all_journal
-        from operator import itemgetter
+
         fld = sorted(fld, key=itemgetter(1))
 
         widths = {
@@ -952,6 +953,7 @@ class account_move_line(osv.osv):
 
             if field in widths:
                 attrs.append('width="'+str(widths[field])+'"')
+            attrs.append('string="'+field_it[2]+'"')
             attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
             xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
 

addons/account/account_view.xml

@@ -23,8 +23,8 @@
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
                         <form string="Period">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
+                            <field name="name"/>
+                            <field name="code"/>
                             <field name="date_start"/>
                             <field name="date_stop"/>
                             <field name="special"/>
@@ -59,7 +59,7 @@
                 <search string="Search Fiscalyear">
                     <group>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
-                        <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog_close"/>
+                        <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>
@@ -237,16 +237,16 @@
             </field>
         </record>
         <record id="view_treasory_graph" model="ir.ui.view">
-         	<field name="name">account.treasory.graph</field>
-         	<field name="model">account.account</field>
-         	<field name="type">graph</field>
-         	<field name="arch" type="xml">
-             	<graph string="Treasory Analysis" type="bar">
-                	<field name="name"/>
-                	<field name="balance" operator="+"/>
-             	</graph>
+           <field name="name">account.treasory.graph</field>
+           <field name="model">account.account</field>
+           <field name="type">graph</field>
+           <field name="arch" type="xml">
+               <graph string="Treasory Analysis" type="bar">
+                  <field name="name"/>
+                  <field name="balance" operator="+"/>
+               </graph>
          </field>
-    	</record>
+      </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -314,13 +314,33 @@
             </field>
         </record>
 
+        <record id="view_account_journal_view_search" model="ir.ui.view">
+            <field name="name">account.journal.view.search</field>
+            <field name="model">account.journal.view</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Journal View">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+        <record id="view_account_journal_view_tree" model="ir.ui.view">
+            <field name="name">account.journal.view.tree</field>
+            <field name="model">account.journal.view</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Journal View">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_account_journal_view_form" model="ir.ui.view">
             <field name="name">account.journal.view.form</field>
             <field name="model">account.journal.view</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal View">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
@@ -330,7 +350,9 @@
             <field name="res_model">account.journal.view</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_journal_view_search"/>
         </record>
+
         <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
 
         <!--
@@ -369,8 +391,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </tree>
             </field>
@@ -610,6 +633,7 @@
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
             <field name="context">{'journal_type':'bank'}</field>
             <field name="search_view_id" ref="view_bank_statement_search"/>
+            <field name="help">A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form.</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
             <field name="sequence" eval="1"/>
@@ -662,6 +686,18 @@
         <!--
     Account Types
     -->
+        <record id="view_account_type_search" model="ir.ui.view">
+            <field name="name">account.account.type.search</field>
+            <field name="model">account.account.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Account Type">
+                    <field name="name"/>
+                    <field name="code"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_account_type_tree" model="ir.ui.view">
             <field name="name">account.account.type.tree</field>
             <field name="model">account.account.type</field>
@@ -703,6 +739,7 @@
             <field name="res_model">account.account.type</field>
             <field name="view_type">form</field>
             <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"/>
         <!--
@@ -752,6 +789,19 @@
         <!--
     Tax Codes
     -->
+        <record id="view_tax_code_search" model="ir.ui.view">
+            <field name="name">account.tax.code.search</field>
+            <field name="model">account.tax.code</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Account Tax Code">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="parent_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </search>
+            </field>
+        </record>
         <record id="view_tax_code_tree" model="ir.ui.view">
             <field name="name">account.tax.code.tree</field>
             <field name="model">account.tax.code</field>
@@ -775,10 +825,10 @@
             <field name="arch" type="xml">
                 <form string="Account Tax Code">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="parent_id" select="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Reporting Configuration" colspan="4"/>
@@ -801,6 +851,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_tax_code_tree"/>
+            <field name="search_view_id" ref="view_tax_code_search"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
@@ -832,7 +883,6 @@
                         <field name="name"/>
                         <field name="description"/>
                     </group>
-                    <newline/>
                 </search>
             </field>
         </record>
@@ -843,9 +893,9 @@
             <field name="arch" type="xml">
                 <form string="Account Tax">
                     <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="description" select="1"/>
-                  <field name="type_tax_use"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                        <field name="type_tax_use"/>
                         <field name="price_include"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -879,8 +929,8 @@
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
                             <separator colspan="4" string="Applicability Options"/>
-                      <field name="applicable_type"/>
-                      <field name="domain"/>
+                            <field name="applicable_type"/>
+                            <field name="domain"/>
                             <separator colspan="4" string="Applicable Code (if type=code)"/>
                             <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
                             <separator colspan="4" string="Compute Code (if type=code)"/>
@@ -904,7 +954,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
-            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
+            <field name="help">The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country.</field>
         </record>
 
         <!--
@@ -1136,6 +1186,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
 
         <menuitem
@@ -1224,24 +1275,24 @@
             <field name="arch" type="xml">
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" readonly="True"/>
-                        <field name="ref" select="1"/>
+                        <field name="name" readonly="True"/>
+                        <field name="ref"/>
                         <field name="to_check" groups="base.group_extended"/>
-                        <field name="journal_id" select="1"/>
+                        <field name="journal_id"/>
                         <field name="period_id"/>
-                        <field name="date" select="1"/>
+                        <field name="date"/>
                         <field name="company_id" required="1" groups="base.group_multi_company"/>
-                        <field name="partner_id" invisible="1" select="1"/>
-                        <field name="amount" invisible="1" select="1"/>
+                        <field name="partner_id" invisible="1"/>
+                        <field name="amount" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Items">
                             <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                                 <form string="Journal Item">
                                     <group col="6" colspan="4">
-                                        <field name="name" select="1"/>
+                                        <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
@@ -1251,7 +1302,7 @@
                                         <page string="Information">
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                                 <field name="debit"/>
                                                 <field name="credit"/>
                                                 <field name="quantity"/>
@@ -1266,7 +1317,7 @@
 
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Dates"/>
-                                                <field name="date" select="1"/>
+                                                <field name="date"/>
                                                 <field name="date_maturity"/>
                                                 <field name="date_created"/>
                                             </group>
@@ -1352,15 +1403,15 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_zoom" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="ref" select="1"/>
-                        <field name="partner_id" select='1'/>
-                        <field name="date" select='1'/>
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="partner_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
-                        <field name="journal_id" widget="selection" select='1'/>
-                        <field name="period_id" select='1'/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id"/>
                     </group>
                     <newline/>
                     <group col="10" colspan="4">
@@ -1387,6 +1438,7 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="help">A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc.</field>
         </record>
 
         <menuitem
@@ -1472,7 +1524,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" />
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
                                 </form>
@@ -1604,9 +1656,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model">
-                    <field name="name" select="1"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
@@ -1642,7 +1694,7 @@
                     <separator orientation="vertical"/>
                       <field name="name"/>
                       <field name="journal_id" widget="selection"/>
-                      <field name="company_id" groups="base.group_multi_company"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -1724,6 +1776,18 @@
             </field>
         </record>
 
+        <record id="view_payment_term_search" model="ir.ui.view">
+            <field name="name">account.payment.term.search</field>
+            <field name="model">account.payment.term</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Payment Term">
+                    <field name="name"/>
+                    <field name="active"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
@@ -1746,6 +1810,7 @@
             <field name="res_model">account.payment.term</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
         <menuitem action="action_payment_term_form"
             id="menu_action_payment_term_form" parent="menu_configuration_misc"
@@ -2085,6 +2150,7 @@
             <field name="res_model">account.account.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_account_template_search"/>
         </record>
 
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
@@ -2244,7 +2310,6 @@
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="description"/>
                         <field name="chart_template_id"/>
@@ -2258,6 +2323,7 @@
             <field name="res_model">account.tax.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_tax_template_search"/>
         </record>
 
         <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
@@ -2318,6 +2384,7 @@
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_tax_code_template_search"/>
         </record>
         <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
@@ -2347,23 +2414,22 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="company_id" widget="selection"/>
-                  <field name ="code_digits" />
-                  <field name="chart_template_id" widget="selection"/>
-                  <field name ="seq_journal" />
-                  <field colspan="4" mode="tree" name="bank_accounts_id"
-                         nolabel="1" widget="one2many_list">
-                    <form string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </form>
-                    <tree editable="bottom" string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </tree>
-                  </field>
+                    <field name="company_id" widget="selection"/>
+                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name="chart_template_id" widget="selection"/>
+                    <field name ="seq_journal" groups="base.group_extended"/>
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                        <form string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </form>
+                        <tree editable="bottom" string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </tree>
+                    </field>
                 </group>
               </data>
             </field>
@@ -2379,7 +2445,7 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem name="New Company Financial Setting" parent="account.account_template_folder"
+        <menuitem name="New Company Financial Setting" parent="account.menu_finance_accounting"
             groups="group_account_manager"
             action="account.action_account_configuration_installer" id="menu_wizard"/>
 
@@ -2397,13 +2463,24 @@
 
          <!-- Fiscal Position Templates -->
 
+        <record id="view_account_position_template_search" model="ir.ui.view">
+            <field name="name">account.fiscal.position.template.search</field>
+            <field name="model">account.fiscal.position.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Fiscal Position">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position Template">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="chart_template_id"/>
                     <newline/>
                     <field name="tax_ids" colspan="4" nolabel="1">
@@ -2445,6 +2522,7 @@
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_position_template_search"/>
         </record>
 
         <menuitem
@@ -2598,6 +2676,7 @@
             <field name="search_view_id" ref="view_account_bank_statement_filter"/>
             <field name="domain">[('journal_id.type', '=', 'cash')]</field>
             <field name="context">{'journal_type':'cash'}</field>
+            <field name="help">Cash Register allows you to manage cash entries in your cash journals.</field>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>

addons/account/board_account_view.xml

@@ -44,7 +44,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
@@ -68,6 +68,6 @@
 
         <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"/>
-        
+
     </data>
 </openerp>

addons/account/company.py

@@ -33,7 +33,7 @@ class res_company(osv.osv):
             method=True,
             view_load=True,
             domain="[('type', '=', 'payable')]",
-            help="This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
+            help="This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
     }
 
     _defaults = {

addons/account/data/account_data2.xml

@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="analytic_journal_sale" model="account.analytic.journal">
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+
         <!--
         Payment term
         -->
@@ -465,13 +470,42 @@
             <field eval="3" name="padding"/>
             <field name="prefix">SAJ/%(year)s/</field>
         </record>
+        <record id="sequence_refund_sales_journal" model="ir.sequence">
+            <field name="name">Sales Credit Note Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">SCNJ/%(year)s/</field>
+        </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
             <field name="name">Purchase Journal</field>
             <field name="code">account.journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">EXJ/%(year)s/</field>
         </record>
-
+        <record id="sequence_refund_purchase_journal" model="ir.sequence">
+            <field name="name">Expenses Credit Notes Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">ECNJ/%(year)s/</field>
+        </record>
+        <record id="sequence_bank_journal" model="ir.sequence">
+            <field name="name">Bank Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">BNK/%(year)s/</field>
+        </record>
+        <record id="sequence_check_journal" model="ir.sequence">
+            <field name="name">Checks Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">CHK/%(year)s/</field>
+        </record>
+        <record id="sequence_cash_journal" model="ir.sequence">
+            <field name="name">Cash Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">CSH/%(year)s/</field>
+        </record>
         <!--
         Account Statement Sequences
         -->

addons/account/demo/account_minimal.xml

@@ -357,7 +357,7 @@
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
@@ -381,7 +381,7 @@
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
@@ -393,7 +393,7 @@
             <field name="code">BNK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
@@ -404,7 +404,7 @@
             <field name="code">CHK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
@@ -415,7 +415,7 @@
             <field name="code">CSH</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>

addons/account/i18n/hr.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-13 15:51+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07: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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

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-12 07:43+0000\n"
+"PO-Revision-Date: 2010-10-17 07:44+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-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -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
@@ -724,7 +724,7 @@ msgstr "Татварын ангилалын тэмдэг"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Энэ худалдан авагчаас авах нийт авлагын дүн."
+msgstr "Энэ үйлчлүүлэгчээс авах нийт авлагын дүн."
 
 #. module: account
 #: view:account.move.line: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
@@ -1401,7 +1401,7 @@ msgstr "Электроник файл"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr "Худалдан авагчийн кредит"
+msgstr "Үйлчлүүлэгчийн кредит"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -1881,7 +1881,7 @@ msgstr "Эхлэх огноо"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "Зардлыг кредитийн журналд тэмдэглэх"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1930,7 +1930,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr "Худалдан авагчийн ноорог нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн ноорог нэхэмжлэл"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -2020,7 +2020,7 @@ msgstr "Аналитик журналын тайлан"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Худалдан авагчийн буцаалт"
+msgstr "Үйлчлүүлэгчийн буцаалт"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2096,7 +2096,7 @@ msgstr "Өгөгдлүүд"
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr "Худалдан авагчийн нэхэмжлэлийн явц"
+msgstr "Үйлчлүүлэгчийн нэхэмжлэлийн явц"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2476,7 +2476,7 @@ msgstr "Журнал нээх"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2732,7 +2732,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2859,7 +2859,7 @@ msgstr "Зарлага төвлөрөл"
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Худалдан авагчийн дугаар"
+msgstr "Үйлчлүүлэгчийн дугаар"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -2882,7 +2882,7 @@ msgstr "Нийт кредит"
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
 msgid "New Customer Invoice"
-msgstr "Шинэ худалдан авагчийн нэхэмжлэл"
+msgstr "Шинэ үйлчлүүлэгчийн нэхэмжлэл"
 
 #. module: account
 #: field:account.account,reconcile: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
@@ -3042,7 +3042,7 @@ msgstr "Гаралтын валютын ханш"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Худалдан авагчийн ноорог буцаалт"
+msgstr "Үйлчлүүлэгчийн ноорог буцаалт"
 
 #. module: account
 #: field:account.journal.column,readonly: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
@@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо"
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr "Өөр валютаар илэрхийлсэн дүн байна"
+msgstr ""
+"Хэрэв энэ гүйлгээ гадаад валютаар хийгдсэн бол гүйлгээний дүнг гадаад "
+"валютаар илэрхийлнэ."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3599,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
@@ -3764,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
@@ -3840,7 +3842,7 @@ msgstr ""
 "    Харилцагчийн данс бүртгэл\n"
 "    Татварын менежмент\n"
 "    Төсөв\n"
-"    Харилцагчийн нэхэмжлэл\n"
+"    Үйлчлүүлэгчийн нэхэмжлэл\n"
 "    Банкны ажил гүйлгэ\n"
 "    "
 
@@ -4001,7 +4003,7 @@ msgstr "Нэмэлт Талбарууд"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Худалдан авагчийн санхүү бүртгэл"
+msgstr "Үйлчлүүлэгчийн санхүү бүртгэл"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4126,12 +4128,14 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
+"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай гэж үзвэл энэ "
+"нүдийг сонгох хэрэгтэй"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Худалдан авагчийн нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн нэхэмжлэл"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -4315,7 +4319,7 @@ msgstr "Татварууд:"
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree7
 msgid "Unpaid Customer Invoices"
-msgstr "Худалдан авагчийн төлөгдөөгүй нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн төлөгдөөгүй нэхэмжлэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -4478,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд"
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr "Бүртгэл загвар шугам"
+msgstr "Гүйлгээний загварын мөр"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4503,12 +4507,12 @@ msgstr "Балансын удирдлагын эхлэл төгсгөлийг т
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Энэ нэхэмжлэлийг нээхдээ та итгэлтэй байна уу?"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Бусад харилцагчийн тооцооны дэвтэр"
 
 #. module: account
 #: view:res.partner:0
@@ -4542,7 +4546,7 @@ msgstr "Дансны бичилт"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Авлагын данс болон төлбөр"
+msgstr "Авлага & Өглөг"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4625,7 +4629,7 @@ msgstr "Нийлүүлэгчийн санхүү бүртгэл"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Аналитик санхүүгийн статистик"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4652,12 +4656,12 @@ msgstr "Ажил гүйлгээнүүд"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Аналитик дансны мод"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
 msgid "Filter on Partners"
-msgstr ""
+msgstr "Харилцагч дээр шүүлт хийх"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4674,7 +4678,7 @@ msgstr "Аналитик бичилтүүд журналаар"
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийн хүчинтэй бичилт"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4704,7 +4708,7 @@ msgstr "Орлого"
 #. module: account
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Байнгын"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -4728,7 +4732,7 @@ msgstr "Журналын нэр"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr ""
+msgstr "Мэдэгдлээс нэхэмжлэл оруулж ирэх"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4745,13 +4749,13 @@ msgstr "Санхүүгийн жил"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Import from invoices or payments"
-msgstr ""
+msgstr "Нэхэмжлэл буюу төлөлтөөс оруулах"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Тулгах бичилт"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4837,7 +4841,7 @@ msgstr "А/к дугаар"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "Дансны өртөг, орлого журналаар"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -4921,7 +4925,7 @@ msgstr "Борлуулалтын татварууд"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Дансны тулгалт"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4953,12 +4957,12 @@ msgstr ""
 #: field:account.bank.statement.reconcile,total_amount:0
 #: field:account.bank.statement.reconcile,total_second_amount:0
 msgid "Payment amount"
-msgstr ""
+msgstr "Төлөлтийн хэмжээ"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Аналитик данс"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4995,17 +4999,17 @@ msgstr "Дебит"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr ""
+msgstr "Бүх сарууд"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Ашиглалтын огноо"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -5020,7 +5024,7 @@ msgstr "Шинэ гүйлгээний нэр"
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Бичилт үүсгэх"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5031,17 +5035,17 @@ msgstr "Буцаалтын татварын ангилал"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Татварын тайлбар"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "Дансны автомат үүссэн шилжилтүүд рүү холбох"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Тулгагдсан гүйлгээнүүд"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -5052,23 +5056,23 @@ msgstr "Тайлан"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Үүсгэгдсэн тоо болон бичлэгүүдийг агуулж байна"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Check -"
-msgstr ""
+msgstr "Аналитик шалгалт-"
 
 #. module: account
 #: rml:account.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Дансны тэнцэл-"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5084,7 +5088,7 @@ msgstr "Тохиргоо"
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr ""
+msgstr "Нийт хэмжээ"
 
 #. module: account
 #: view:account.journal:0
@@ -5094,7 +5098,7 @@ msgstr "Журналын бүтэц"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Бүртгэлийн мөрүүд"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5111,7 +5115,7 @@ msgstr "Уг дансны гүйлгээг хөрвүүлж хадгалах в
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "Цуцлах"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
@@ -5129,7 +5133,7 @@ msgstr "Тонгоруулсан аналитик баланс-"
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Нэхэмжлэл төлөх"
 
 #. module: account
 #: view:account.tax:0
@@ -5147,7 +5151,7 @@ msgstr "Татварын групп"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Шинэ худалдан авагчийн буцаалт"
+msgstr "Шинэ Үйлчлүүлэгчийн буцаалт"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5161,7 +5165,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr ""
+msgstr "Нэхэмжлэл оруулж ирэх"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -5195,7 +5199,7 @@ msgstr "Дансны өгөгдөл"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Дансны татварын кодны загвар"
 
 #. module: account
 #: view:account.subscription:0
@@ -5205,7 +5209,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Гараар"
 
 #. module: account
 #: view:account.invoice:0
@@ -5235,22 +5239,22 @@ msgstr "Нэхэмжлэлийн гүйлгээ"
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Журналаас хасалт хийх"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
-msgstr ""
+msgstr "Бүтэн төлөлт"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Худалдан авалтын журнал"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Кассын баримт"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5276,9 +5280,7 @@ 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
@@ -5295,7 +5297,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr ""
+msgstr "Модел ашиглах"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
@@ -5305,7 +5307,7 @@ msgstr "Үгүй"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Бүх дансны бичилт"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5323,7 +5325,7 @@ msgstr "Огноо шүүлт"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Журнал болон төлөлтийн огноо сонгох"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5347,7 +5349,7 @@ msgstr "Төлсөн"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Худалдан авагчийн төлөгдөөгүй буцаалтууд"
+msgstr "Үйлчлүүлэгчийн төлөгдөөгүй буцаалтууд"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5357,18 +5359,18 @@ msgstr ""
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Та итгэлтэй байна уу?"
 
 #. module: account
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Хэсэгчилсэн журналын бичилт"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5378,7 +5380,7 @@ msgstr "Банкны гүйлгээ тулгалтанд хэрэглэгдэх
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Санхүүгийн жил"
 
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
@@ -5389,12 +5391,12 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Хэвийн"
 
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "Нийлүүлэгч нэхэмжлэх процесс"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5408,7 +5410,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Хуудас"
 
 #. module: account
 #: view:account.move:0
@@ -5420,23 +5422,23 @@ msgstr "Туслах мэдээлэл"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Төлөлтийн нөхцөл"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr ""
+msgstr "Авлага болон өглөг"
 
 #. module: account
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Тулгагдсан хэмжээ"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -5474,7 +5476,7 @@ msgstr "Татварын хэрэглээ"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Баримтын бичилт"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5502,7 +5504,7 @@ msgstr "Мөчлөгийн төгсгөл"
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Дансны бичилт"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5528,7 +5530,7 @@ msgstr "Ерөнхий журнал"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr "Тэнцэл"
+msgstr "Баланс"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5538,7 +5540,7 @@ msgstr "Буцааж төлөх"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Татварын нэхэмжлэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
@@ -5664,7 +5666,7 @@ msgstr ""
 #. module: account
 #: field:account.model.line,date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Одоогийн огноо"
 
 #. module: account
 #: selection:account.move,type:0
@@ -5785,7 +5787,7 @@ msgstr "Мөчлөг нээж хаах"
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Аналитик тэнцэл"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5802,7 +5804,7 @@ msgstr "Нэхэмжлэлийн мөр"
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Customer"
-msgstr "Худалдан авагч"
+msgstr "Үйлчлүүлэгчийн"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5812,7 +5814,7 @@ msgstr "Мөчлөгийн төрөл"
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Санхүүгийн бүрэлдэхүүн хэсгүүд"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -5858,7 +5860,7 @@ msgstr "Солих данс"
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Хугацаа"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5894,12 +5896,12 @@ msgstr "Нийлүүлэгчийн буцаалт"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr ""
+msgstr "Бичилт тулгах"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Бичилт"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5918,7 +5920,7 @@ msgstr ""
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management"
-msgstr ""
+msgstr "Санхүү эдийн засгийн удирдлага"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6044,7 +6046,7 @@ msgstr "Хэрэглэгч уг дансны гүйлгээг банкны ху
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr ""
+msgstr "Гүйлгээний огноо тооцоолол"
 
 #. module: account
 #: view:board.board:0
@@ -6060,7 +6062,7 @@ msgstr "Ноорог нэхэмжлэл"
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Санхүүгийн хянах самбар"
 
 #. module: account
 #: view:board.board:0
@@ -6077,7 +6079,7 @@ msgstr "Үнийн нэхэмжлэл"
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr "Насжилтын авлагын данс"
+msgstr "Авлагын насжилт"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6097,12 +6099,12 @@ msgstr "Эдийн засгийн үзүүлэлт"
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Дансны самбар"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Насжилтын орлого"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
@@ -6164,7 +6166,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Дансны тэнцлийг жилээр нь харьцуулах"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6296,7 +6298,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Хувийн тайлан"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -6326,7 +6328,7 @@ msgstr "Дансны төрлөөр"
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Өнөөдрийг хүртэлх авлагын насжилт"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
@@ -6352,7 +6354,7 @@ msgstr "Санхүүгийн тайлан-Тайлан"
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Дансны төрлийн тэнцэл"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -6368,7 +6370,7 @@ msgstr "Үүсгэх огноо"
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "Насжилтын авлага"
+msgstr "Авлагын насжилт"
 
 #. module: account
 #: view:report.invoice.created: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-13 16:24+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/installer.py

@@ -256,7 +256,7 @@ class account_installer(osv.osv_memory):
                 vals_seq = {
                         'name': _('Bank Journal '),
                         'code': 'account.journal',
-                        'prefix': 'BAN/',
+                        'prefix': 'BNK/%(year)s/',
                         'padding': 5
                         }
                 seq_id = obj_sequence.create(cr,uid,vals_seq)
@@ -280,17 +280,13 @@ class account_installer(osv.osv_memory):
                 obj_journal.create(cr,uid,vals_journal)
 
                 for val in record.bank_accounts_id:
-                    seq_prefix = None
                     seq_padding = 5
                     if val.account_type == 'cash':
                         type = cash_type_id
-                        seq_prefix = "CSH/"
                     elif val.account_type == 'bank':
                         type = bank_type_id
-                        seq_prefix = "BAN/"
                     elif val.account_type == 'check':
                         type = check_type_id
-                        seq_prefix = "CHK/"
                     else:
                         type = check_type_id
                         seq_padding = None
@@ -304,9 +300,9 @@ class account_installer(osv.osv_memory):
                         'company_id': company_id.id }
                     child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
                     vals_seq_child = {
-                        'name': _(vals_bnk['name']),
+                        'name': _(vals_bnk['name'] + ' ' + 'Journal'),
                         'code': 'account.journal',
-                        'prefix': seq_prefix,
+                        'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
                         'padding': seq_padding
                         }
                     seq_id = obj_sequence.create(cr, uid, vals_seq_child)
@@ -314,7 +310,7 @@ 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])
+                    vals_journal['code']= _(vals_bnk['name'][:3]).upper()
                     vals_journal['sequence_id'] = seq_id
                     vals_journal['type'] = 'cash'
                     if vals.get('currency_id', False):
@@ -328,7 +324,6 @@ class account_installer(osv.osv_memory):
                     obj_journal.create(cr,uid,vals_journal)
                     code_cnt += 1
 
-
         #reactivate the parent_store functionality on account_account
         self.pool._init = False
         self.pool.get('account.account')._parent_store_compute(cr)
@@ -352,20 +347,36 @@ class account_installer(osv.osv_memory):
             seq_sale = {
                         'name': 'Sale Journal',
                         'code': 'account.journal',
-                        'prefix': '%(year)s/',
+                        'prefix': 'SAJ/%(year)s/',
                         'padding': 3
                         }
             seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
             seq_purchase = {
                         'name': 'Purchase Journal',
                         'code': 'account.journal',
-                        'prefix': '%(year)s/',
+                        'prefix': 'EXJ/%(year)s/',
                         'padding': 3
                         }
             seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
+            seq_refund_sale = {
+                        'name': 'Sales Refund Journal',
+                        'code': 'account.journal',
+                        'prefix': 'SCNJ/%(year)s/',
+                        'padding': 3
+                        }
+            seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale)
+            seq_refund_purchase = {
+                        'name': 'Purchase Refund Journal',
+                        'code': 'account.journal',
+                        'prefix': 'ECNJ/%(year)s/',
+                        'padding': 3
+                        }
+            seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
+            seq_id_sale_refund = seq_id
+            seq_id_purchase_refund = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -408,9 +419,6 @@ class account_installer(osv.osv_memory):
         data = mod_obj.browse(cr, uid, data_id[0])
         view_id = data.res_id
 
-        seq_id_sale_refund = seq_id_sale
-        seq_id_purchase_refund = seq_id_purchase
-
         vals_journal['view_id'] = view_id
 
         #Sales Refund Journal
@@ -596,8 +604,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'TAX%s%%'%(s_tax*100),
-                                            'description':'TAX%s%%'%(s_tax*100),
+                                           {'name':'TAX %s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
@@ -632,8 +639,7 @@ 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),
-                                             'description':'TAX%s%%'%(p_tax*100),
+                                            {'name':'TAX %s%%'%(p_tax*100),
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,

addons/account/invoice.py

@@ -351,7 +351,7 @@ class account_invoice(osv.osv):
         if view_type == 'tree':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='partner_id']")
-            partner_string = 'Customer'
+            partner_string = _('Customer')
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                 partner_string = _('Supplier')
             for node in nodes:
@@ -363,7 +363,7 @@ class account_invoice(osv.osv):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
-                message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+                message = _("Invoice '%s' is waiting for validation.") % name
                 self.log(cr, uid, inv_id, message)
             return res
         except Exception, e:
@@ -375,6 +375,9 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for inv_id, name in self.name_get(cr, uid, ids, context=context):
+            message = _("Invoice '%s' is paid.") % name
+            self.log(cr, uid, inv_id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
@@ -674,7 +677,7 @@ class account_invoice(osv.osv):
         return (ref or '').replace('/','')
 
     def _get_analytic_lines(self, cr, uid, id):
-        inv = self.browse(cr, uid, [id])[0]
+        inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
         company_currency = inv.company_id.currency_id.id
@@ -690,6 +693,8 @@ class account_invoice(osv.osv):
                     ref = inv.reference
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
+                if not inv.journal_id.analytic_journal_id:
+                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
                 il['analytic_lines'] = [(0,0, {
                     'name': il['name'],
                     'date': inv['date_invoice'],
@@ -699,7 +704,7 @@ class account_invoice(osv.osv):
                     'product_id': il['product_id'],
                     'product_uom_id': il['uos_id'],
                     'general_account_id': il['account_id'],
-                    'journal_id': self._get_journal_analytic(cr, uid, inv.type),
+                    'journal_id': inv.journal_id.analytic_journal_id.id,
                     'ref': ref,
                 })]
         return iml
@@ -1218,12 +1223,13 @@ class account_invoice(osv.osv):
 
         inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.code
-            amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
+            # TODO: use currency's formatting function
+            msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
+                    (name, pay_amount, code, invoice.amount_total, code, total, code)
+            self.log(cr, uid, inv_id,  msg)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
@@ -1289,14 +1295,6 @@ class account_invoice_line(osv.osv):
         'price_unit': _price_unit_default,
     }
 
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
-        tax_obj = self.pool.get('account.tax')
-        if price_unit:
-            taxes = tax_obj.browse(cr, uid, tax_id)
-            for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id):
-                price_unit = price_unit - tax['amount']
-        return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
         if context is None:
             context = {}
@@ -1361,7 +1359,7 @@ class account_invoice_line(osv.osv):
                 else:
                     app_acc_in = in_acc_cate
                     app_acc_exp = ex_acc_cate
-            if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
+            if app_acc_in and app_acc_in.company_id.id != company_id and app_acc_exp and app_acc_exp.company_id.id != company_id:
                 in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
                 exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
                 if not in_res_id and not exp_res_id:
@@ -1396,8 +1394,7 @@ class account_invoice_line(osv.osv):
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
         if type in ('in_invoice', 'in_refund'):
-            to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context)
-            result.update(to_update)
+            result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
 

addons/account/project/project.py

@@ -28,11 +28,11 @@ from osv import osv
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
     _columns = {
-        'name' : fields.char('Journal Name', size=64, required=True),
-        'code' : fields.char('Journal Code', size=8),
-        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
+        'name': fields.char('Journal Name', size=64, required=True),
+        'code': fields.char('Journal Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
         'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
-        'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {

addons/account/project/project_view.xml

@@ -14,6 +14,8 @@
                     <field name="quantity"/>
                     <field name="quantity_max"/>
                     <field name="date"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -127,7 +129,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
-            <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
+            <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"/>

addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml

@@ -8,18 +8,16 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
                 <form string="Select period">
-	               <group width="450">
-	                   <separator string="Cost Ledger for period" colspan="4"/>
-	                   <field name="date1"/>
-	                   <field name="date2"/>
-	                   <separator string="and Journals" colspan="4"/>
-	                   <field name="journal" colspan="4" nolabel="1"/>
-	                   <separator colspan="4"/>
-	                   <group colspan="4" col="6">
-	                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-	                   </group>
-	               </group>
+                   <separator string="Cost Ledger for period" colspan="4"/>
+                   <field name="date1"/>
+                   <field name="date2"/>
+                   <separator string="and Journals" colspan="4"/>
+                   <field name="journal" colspan="4" nolabel="1"/>
+                   <separator colspan="4"/>
+                   <group colspan="4" col="6">
+                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                   </group>
                 </form>
 			</field>
 		</record>

addons/account/report/account_aged_partner_balance.py

@@ -137,7 +137,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                 future_past[i[0]] = i[1]
 
         # Use one query per period and store results in history (a list variable)
-        # Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
+        # Each history will contain: history[1] = {'<partner_id>': <partner_debit-credit>}
         history = []
         for i in range(5):
             args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)

addons/account/report/account_analytic_entries_report_view.xml

@@ -61,7 +61,7 @@
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
+                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -73,17 +73,6 @@
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
             </search>
         </field>
     </record>

addons/account/report/account_balance_sheet.py

@@ -110,7 +110,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         else:
             self.res_bl['type'] = 'Net Loss'
         pl_dict  = {
-            'code': False,
+            'code': self.res_bl['type'],
             'name': self.res_bl['type'],
             'level': False,
             'balance':self.res_bl['balance'],

addons/account/report/account_central_journal.py

@@ -72,7 +72,7 @@ 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.code 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) \

addons/account/report/account_general_journal.py

@@ -87,7 +87,7 @@ 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.code 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) '
@@ -111,7 +111,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def _get_account(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
-        return super(journal_print ,self)._get_account(data)
+        return super(journal_print, self)._get_account(data)
 
     def _get_fiscalyear(self, data):
         if data['model'] == 'account.journal.period':

addons/account/report/account_general_journal.rml

@@ -287,7 +287,7 @@
         <td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>

addons/account/report/account_general_ledger_landscape.rml

@@ -266,10 +266,10 @@
 	   	     		<tr>
 		    			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>
@@ -292,9 +292,9 @@
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
 		</tr>
 	  </blockTable>
@@ -352,9 +352,9 @@
 				<td><para style="P2_content">[[ line['move'] ]]</para></td>
 				<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 				<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]] </para></td>
-				<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] </para></td>
+				<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
 			</tr>
 		</blockTable>
 

addons/account/report/account_invoice_report_view.xml

@@ -110,7 +110,7 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
+                    <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
@@ -139,7 +139,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_current':1,'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
 

addons/account/report/account_partner_ledger.py

@@ -58,6 +58,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
     def set_context(self, objects, data, ids, report_type=None):
         obj_move = self.pool.get('account.move.line')
+        obj_partner = self.pool.get('res.partner')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
         ctx2 = data['form'].get('used_context',{}).copy()
         ctx2.update({'initial_bal': True})
@@ -100,7 +101,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "AND l.account_id = account.id " \
                     "AND am.id = l.move_id " \
                     "AND am.state IN %s"
-                    "AND " + self.query +" " \
+#                    "AND " + self.query +" " \
                     "AND l.account_id IN %s " \
                     " " + PARTNER_REQUEST + " " \
                     "AND account.active ",
@@ -111,7 +112,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             partner_to_use.append(res_line['partner_id'])
         new_ids = partner_to_use
         self.partner_ids = new_ids
-        objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)
+        objects = obj_partner.browse(self.cr, self.uid, new_ids)
         return super(third_party_ledger, self).set_context(objects, data, new_ids, report_type)
 
     def comma_me(self, amount):
@@ -139,7 +140,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
         self.cr.execute(
-            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
+            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency,l.currency_id, c.symbol AS currency_code " \
             "FROM account_move_line l " \
             "LEFT JOIN account_journal j " \
                 "ON (l.journal_id = j.id) " \
@@ -286,7 +287,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #            return 0.0
 #        result_tmp = 0.0
 #        result_init = 0.0
-#        if self.reconcil :
+#        if self.reconcil:
 #            RECONCILE_TAG = " "
 #        else:
 #            RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -317,7 +318,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #                    "AND m.state IN %s "
 #                    "AND account_id IN %s" \
 #                    " " + RECONCILE_TAG + " " \
-#                    "AND " + self.query + " " ,
+#                    "AND " + self.query + " ",
 #                    (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
 #        contemp = self.cr.fetchone()
 #        if contemp != None:
@@ -335,7 +336,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #            return 0.0
 #        result_tmp = 0.0
 #        result_init = 0.0
-#        if self.reconcil :
+#        if self.reconcil:
 #            RECONCILE_TAG = " "
 #        else:
 #            RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -366,7 +367,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #                    "AND m.state IN %s "
 #                    "AND account_id IN %s" \
 #                    " " + RECONCILE_TAG + " " \
-#                    "AND " + self.query + " " ,
+#                    "AND " + self.query + " ",
 #                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
 #        contemp = self.cr.fetchone()
 #        if contemp != None:

addons/account/report/account_partner_ledger.rml

@@ -487,7 +487,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>

addons/account/report/account_partner_ledger_other.rml

@@ -627,7 +627,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>

addons/account/report/account_print_invoice.rml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -140,18 +140,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -187,14 +187,14 @@
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
+    <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -218,7 +218,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
+      <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -315,10 +315,10 @@
     <para style="Text body">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+    <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax</para>
+          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Base </para>
@@ -335,7 +335,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="167.0,60.0,55.0,248.0" style="Table2">
+      <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
@@ -354,11 +354,14 @@
         </tr>
       </blockTable>
     </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+    <para style="terp_default_9">[[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -368,7 +371,7 @@
           <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>

addons/account/report/account_report.py

@@ -74,7 +74,7 @@ class temp_range(osv.osv):
     _description = 'A Temporary table used for Dashboard view'
 
     _columns = {
-        'name' : fields.char('Range',size=64)
+        'name': fields.char('Range',size=64)
     }
 
 temp_range()
@@ -177,7 +177,7 @@ class report_invoice_created(osv.osv):
             ('cancel','Cancelled')
         ],'State', readonly=True),
         'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."),
-        'create_date' : fields.datetime('Create Date', readonly=True)
+        'create_date': fields.datetime('Create Date', readonly=True)
     }
     _order = 'create_date'
 

addons/account/report/account_tax_report.py

@@ -37,9 +37,26 @@ class tax_report(rml_parse.rml_parse):
             'get_company': self._get_company,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
+            'get_years': self.get_years,
         })
 
 
+    def get_years(self,form):
+        res={}
+        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
+
+        if fiscal_year_name:
+            res['fname'] = fiscal_year_name[0][1]
+            res['periods'] = ''
+        if form['periods']:
+            periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
+            for period in periods_l:
+                if res['periods']=='':
+                    res['periods'] = period['name']
+                else:
+                    res['periods'] += ", "+ period['name']
+        return res
+
     def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 

addons/account/report/account_tax_report.rml

@@ -105,6 +105,16 @@
   </stylesheet>
   <story>
 	<para style="P2">Tax Statement</para>
+  <para style="P2"><font color="white"> </font></para>
+	<blockTable colWidths="538" style="Tableau1">
+      <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>
+      </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>

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

@@ -31,7 +31,7 @@
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -39,7 +39,7 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
@@ -94,47 +94,12 @@
 "access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
-"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
-"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
-"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
-"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
-"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
-"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
-"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
-"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
-"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
-"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
-"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
-"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
-"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
-"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
-"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
-"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
-"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
-"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
-"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
-"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
-"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
-"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
-"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
-"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
-"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
-"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
-"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
-"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
-"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
-"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
-"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
-"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
-"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
-"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
 "access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
@@ -145,7 +110,6 @@
 "access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
 "access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
 "access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1

addons/account/test/account_report.yml

@@ -67,8 +67,8 @@
     import netsvc, tools, os, time
     import datetime
     from mx.DateTime import *
-	import warnings
-	warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
+    import warnings
+    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))
     res = {}

addons/account/test/account_validate_account_move.yml

@@ -6,7 +6,6 @@
     sign : 1.00
 -
   In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
-
 -
   !record {model: account.move, id: account_move_0}:
     date: '2010-06-07'

addons/account/wizard/account_chart_view.xml

@@ -31,6 +31,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
+            <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"

addons/account/wizard/account_fiscalyear_close.py

@@ -30,14 +30,14 @@ class account_fiscalyear_close(osv.osv_memory):
     _description = "Fiscalyear Close"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True),
+                                 'Fiscal Year to close', required=True, help="Select a Fiscal year to close"),
        'fy2_id': fields.many2one('account.fiscalyear', \
                                  'New Fiscal Year', required=True),
        'journal_id': fields.many2one('account.journal', \
                                  'Opening Entries Journal', required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts and with a centralized counterpart.'),
        'period_id': fields.many2one('account.period', \
                                  'Opening Entries Period', required=True),
-       'report_name': fields.char('Name of new entries',size=64, required=True),
+       'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
     }
     _defaults = {
         'report_name':'End of Fiscal Year Entry',

addons/account/wizard/account_fiscalyear_close_state.py

@@ -31,7 +31,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
     _description = "Fiscalyear Close state"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True),
+                                 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
     }
 
     def data_save(self, cr, uid, ids, context=None):

addons/account/wizard/account_fiscalyear_close_state.xml

@@ -7,13 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods">
-                    <label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
-                    <field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-                   </group>
+						<label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
+						<separator colspan="4" />
+						<field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
+						<separator colspan="4" />
+						<group colspan="4" col="6">
+						    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+						    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+						</group>
                </form>
             </field>
         </record>

addons/account/wizard/account_fiscalyear_close_view.xml

@@ -6,21 +6,22 @@
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Generate Fiscal Year Opening Entries">
-                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
-                    <field name="fy_id" domain = "[('state','=','draft')]"/>
-                    <field name="fy2_id" domain = "[('state','=','draft')]"/>
-                    <field name="journal_id"/>
-                    <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]"/>
-                    <field name="report_name" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                       <label string="" colspan="2"/>
-                       <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                       <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                    </group>
-               </form>
-            </field>
+	            <form string="Generate Fiscal Year Opening Entries">
+	                <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
+	                <separator colspan="4"/>
+	                <field name="fy_id" domain = "[('state','=','draft')]"/>
+	                <field name="fy2_id" domain = "[('state','=','draft')]"/>
+	                <field name="journal_id"/>
+	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+	                <field name="report_name" colspan="4"/>
+	                <separator colspan="4"/>
+	                <group colspan="4" col="6">
+	                   <label string="" colspan="2"/>
+	                   <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                   <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+	                </group>
+				</form>
+			</field>
         </record>
 
         <record id="action_account_fiscalyear_close" model="ir.actions.act_window">

addons/account/wizard/account_move_journal_view.xml

@@ -20,6 +20,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
         </record>
         <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
             parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
@@ -31,6 +32,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'purchase','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
         <menuitem action="action_account_moves_purchase"
             id="menu_eaction_account_moves_purchase"
@@ -46,6 +48,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'bank','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
         </record>
 
         <menuitem

addons/account/wizard/account_reconcile_view.xml

@@ -8,22 +8,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                    <group height="210" width="550">
-                        <separator string="Reconciliation transactions" colspan="4"/>
-                        <field name="trans_nbr"/>
-                        <newline/>
-                        <field name="credit"/>
-                        <field name="debit"/>
-                        <separator string="Write-Off" colspan="4"/>
-                        <field name="writeoff"/>
-                        <group colspan="4" col="6">
-                            <label string ="" colspan="2"/>
-                            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                            <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-                            <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                            <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                       </group>
-                    </group>
+                    <separator string="Reconciliation transactions" colspan="4"/>
+                    <field name="trans_nbr"/>
+                    <newline/>
+                    <field name="credit"/>
+                    <field name="debit"/>
+                    <separator string="Write-Off" colspan="4"/>
+                    <field name="writeoff"/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                   </group>
                </form>
             </field>
         </record>

addons/account/wizard/account_report_balance_sheet.py

@@ -35,7 +35,7 @@ class account_bs_report(osv.osv_memory):
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
         'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
-                                      help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+                                      help='This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
     }
 
     _defaults={

addons/account/wizard/account_report_common.py

@@ -100,7 +100,7 @@ class account_common_report(osv.osv_memory):
         return self.pool.get('account.journal').search(cr, uid ,[])
 
     _defaults = {
-            'fiscalyear_id' : _get_fiscalyear,
+            'fiscalyear_id': _get_fiscalyear,
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,

addons/account/wizard/account_report_common_partner.py

@@ -28,7 +28,7 @@ class account_common_partner_report(osv.osv_memory):
     _columns = {
         'result_selection': fields.selection([('customer','Receivable Accounts'),
                                               ('supplier','Payable Accounts'),
-                                              ('customer_supplier' ,'Receivable and Payable Accounts')],
+                                              ('customer_supplier','Receivable and Payable Accounts')],
                                               "Partner's", required=True),
     }
 

addons/account/wizard/account_subscription_generate_view.xml

@@ -8,17 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
-                    <group colspan="4" >
-                        <separator string="Generate entries before:" colspan="4"/>
-                        <field name="date"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-execute" string="Generate Entries"
-                        name="action_generate" type="object" />
-                    </group>
+                    <separator string="Generate entries before:" colspan="4"/>
+                    <field name="date"/>
+                	<separator colspan="4" />
+                	<group colspan="4" col="6">
+                		<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-execute" string="Generate Entries"
+                    	name="action_generate" type="object" />
+                	</group>
                </form>
             </field>
         </record>

addons/account/wizard/account_use_model_view.xml

@@ -38,12 +38,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6" width="300" height="70">
-                        <label string = "Are you sure you want to create entries?" colspan="2"/>
-                        <newline/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
-                   </group>
+                    <label string = "Are you sure you want to create entries?" colspan="2"/>
+                    <newline/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                </form>
             </field>
         </record>

addons/account/wizard/account_vat.py

@@ -24,13 +24,14 @@ from osv import osv, fields
 class account_vat_declaration(osv.osv_memory):
     _name = 'account.vat.declaration'
     _description = 'Account Vat Declaration'
-
+    _inherit = "account.common.account.report"
     _columns = {
-        'based_on': fields.selection([('invoices','Invoices'),
-                                     ('payments','Payments'),],
+	    '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),
         }
 
     def _get_company(self, cr, uid, context={}):
@@ -38,14 +39,14 @@ class account_vat_declaration(osv.osv_memory):
         company_obj = self.pool.get('res.company')
         user = user_obj.browse(cr, uid, uid, context=context)
         if user.company_id:
-            return user.company_id.id
+    	    return user.company_id.id
         else:
             return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-            'based_on': 'invoices',
-            'company_id': _get_company
-        }
+        'based_on': 'invoices',
+        'company_id': _get_company
+		}
 
     def create_vat(self, cr, uid, ids, context={}):
         if context is None:
@@ -57,8 +58,7 @@ class account_vat_declaration(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.vat.declaration',
             'datas': datas,
-            }
-
+        }
 account_vat_declaration()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_vat_view.xml

@@ -10,10 +10,12 @@
             <form string="Select Period">
                 <field name="company_id" groups="base.group_multi_company" widget='selection'/>
                 <newline/>
-                <field name="based_on" invisible="1"/>
+                <field name="based_on"/>
                 <newline/>
                 <separator string="Select Period(s)" colspan="4"/>
-                <field name="periods" nolabel="1" colspan="2"/>
+                	<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/__openerp__.py

@@ -24,7 +24,7 @@
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """
-Give access to the admin user to all accounting features like the journal
+This module gives the admin user the access to all the accounting features like the journal
 items and the chart of accounts.
     """,
     'website': 'http://www.openerp.com',
@@ -33,8 +33,8 @@ items and the chart of accounts.
     'update_xml': [
         'security/account_security.xml',
     ],
-    'demo_xml': [ ],
-    'test': [ ],
+    'demo_xml': [],
+    'test': [],
     'installable': True,
     'active': False,
     'certificate': '',

addons/account_accountant/security/account_security.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -146,7 +146,7 @@ class account_analytic_account(osv.osv):
                             FROM account_analytic_line \
                             WHERE account_id IN %s \
                                 AND invoice_id IS NULL \
-                            GROUP BY account_analytic_line.account_id" ,(parent_ids,))
+                            GROUP BY account_analytic_line.account_id",(parent_ids,))
                     for account_id, lwd in cr.fetchall():
                         if account_id not in res:
                             res[account_id] = {}
@@ -656,7 +656,7 @@ class account_analytic_account_summary_month(osv.osv):
         if fields is None:
             fields = self._columns.keys()
         res_trans_obj = self.pool.get('ir.translation')
-        # construct a clause for the rules :
+        # construct a clause for the rules:
         d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True

addons/account_analytic_analysis/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-13 17:10+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis

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

@@ -1,5 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_analytic_analysis_summary_user","account_analytic_analysis.summary.user","model_account_analytic_analysis_summary_user","account.group_account_manager",1,0,0,0
 "access_account_analytic_analysis_summary_month","account_analytic_analysis.summary.month","model_account_analytic_analysis_summary_month","account.group_account_manager",1,0,0,0
-"access_account_analytic_account_user","account.analytic.account.user","model_account_analytic_account","base.group_user",1,0,0,0
-"access_account_analytic_account_system","account.analytic.account.system","model_account_analytic_account","base.group_system",1,0,0,0

addons/account_analytic_default/account_analytic_default.py

@@ -29,14 +29,14 @@ class account_analytic_default(osv.osv):
     _rec_name = "analytic_id"
     _order = "sequence"
     _columns = {
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."),
-        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'),
-        'user_id': fields.many2one('res.users', 'User', ondelete='cascade'),
-        'company_id': fields.many2one('res.company', 'Company', ondelete='cascade'),
-        'date_start': fields.date('Start Date'),
-        'date_stop': fields.date('End Date'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"),
+        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account' , help="Analytical Account"),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="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)"),
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="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)"),
+        'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="select a user which will use analytical account specified in analytic default"),
+        'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="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)"),
+        'date_start': fields.date('Start Date', help="Default start date for this Analytical Account"),
+        'date_stop': fields.date('End Date', help="Default end date for this Analytical Account"),
     }
 
     def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):

addons/account_analytic_default/account_analytic_default_view.xml

@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults">
+                <tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" >
                     <field name="sequence"/>
                     <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
@@ -44,11 +44,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
+                    <group col="10" colspan="4">
+                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater then today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
+                    <separator orientation="vertical"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
+						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+						<separator orientation="vertical"/>
+						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
+                         <separator orientation="vertical"/>
+                        <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}"  help="Comapny" groups="base.group_multi_company" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -59,6 +73,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
+            <field name="context">{"search_default_current":1}</field>
         </record>
 
         <act_window

addons/account_analytic_default/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-13 17:16+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default

addons/account_analytic_plans/account_analytic_plans.py

@@ -336,6 +336,10 @@ class account_move_line(osv.osv):
                    analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        return result
+
 account_move_line()
 
 class account_invoice(osv.osv):
@@ -425,4 +429,42 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
+
+class account_bank_statement(osv.osv):
+    _inherit = "account.bank.statement"
+    _name = "account.bank.statement"
+    
+    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
+        account_move_line_pool = self.pool.get('account.move.line')
+        account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
+        st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context)
+        result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
+        move = st_line.move_ids and st_line.move_ids[0] or False
+        if move:
+            for line in move.line_id:
+                account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context)
+        return result
+
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        super(account_bank_statement,self).button_confirm_bank(cr, uid, ids, context=context)
+        for st in self.browse(cr, uid, ids, context):
+            for st_line in st.line_ids:
+                if st_line.analytics_id:
+                    if not st.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+                if not st_line.amount:
+                    continue
+        return True
+    
+account_bank_statement()
+
+
+class account_bank_statement_line(osv.osv):
+    _inherit = "account.bank.statement.line"
+    _name = "account.bank.statement.line"
+    _columns = {
+        'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
+    }
+account_bank_statement_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_plans/account_analytic_plans_view.xml

@@ -16,17 +16,19 @@
         </field>
     </record>
 
-
-    <record model="ir.ui.view" id="view_account_move_form_inherit">
-        <field name="name">account.move.form.inherit</field>
-        <field name="model">account.move</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="account.view_move_form"/>
-        <field name="arch" type="xml">
-            <field name="analytic_account_id" position="replace">
-                <field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
-            </field>
-        </field>
+    <record id="view_move_form_inherit" model="ir.ui.view">
+       <field name="name">account.move.form.inherit</field>
+       <field name="model">account.move</field>
+       <field name="type">form</field>
+       <field name="inherit_id" ref="account.view_move_form"/>
+       <field name="arch" type="xml">
+           <xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
+               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+           </xpath>
+           <xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace">
+               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+           </xpath>
+       </field>
     </record>
 
     <record id="account.journal_col11" model="account.journal.column">
@@ -44,12 +46,37 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
-            <field name="move_id" position="after">
-                <field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
+            <field name="analytic_account_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>
 
+    <record model="ir.ui.view" id="view_move_line_form_1_inherit">
+        <field name="name">account.move.line.form.inherit1</field>
+        <field name="model">account.move.line</field>
+        <field name="type">form</field>
+        <field name="priority">2</field>
+        <field name="inherit_id" ref="account.view_move_line_form2"/>
+        <field name="arch" type="xml">
+            <field name="analytic_account_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_move_line_tree_inherit">
+        <field name="name">account.move.line.tree.inherit</field>
+        <field name="model">account.move.line</field>
+        <field name="type">tree</field>
+        <field name="priority">2</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="arch" type="xml">
+            <field name="analytic_account_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
 
 <!-- Replace analytic_id with analytics_id in account.invoice.line -->
 
@@ -60,7 +87,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <field name="account_analytic_id" position="replace">
-                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="base.group_extended"/>
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>
@@ -73,7 +100,7 @@
         <field name="priority">2</field>
         <field name="arch" type="xml">
             <field name="account_analytic_id" position="replace">
-                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="base.group_extended"/>
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>
@@ -92,11 +119,11 @@
                 <field name="account_ids" nolabel="1" colspan="4">
                   <form string="Analytic Distribution">
                         <field name="rate"/>
-                        <field name="analytic_account_id" groups="base.group_extended"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </form>
                     <tree string="Analytic Distribution" editable="bottom">
                         <field name="rate"/>
-                        <field name="analytic_account_id" groups="base.group_extended"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </tree>
                 </field>
             </form>
@@ -159,13 +186,24 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="account_analytic_plan_search">
+        <field name="name">account.analytic.plan.search</field>
+        <field name="model">account.analytic.plan</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Analytic Plans">
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="account_analytic_plan_form">
         <field name="name">account.analytic.plan.form</field>
         <field name="model">account.analytic.plan</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Plan">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="default_instance_id"/>
                 <field name="plan_ids" colspan="4" nolabel="1"/>
             </form>
@@ -190,6 +228,7 @@
         <field name="res_model">account.analytic.plan</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="account_analytic_plan_search"/>
     </record>
 
     <menuitem
@@ -258,5 +297,32 @@
             </field>
         </record>
 
+        <record id="view_bank_statement_inherit_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+                    <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+                    <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_reconcile_inherit_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form.inherit_1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+                    <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+                </xpath>
+            </field>
+        </record>
+
 </data>
 </openerp>

addons/account_analytic_plans/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-13 17:43+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans

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

@@ -6,5 +6,3 @@
 "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
-"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1
-"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1

addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml

@@ -8,20 +8,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Crossovered Analytic">
-				<group height="300" width="620">
-				    <group col="4" colspan="6">
-					    <field name="date1"/>
-					    <field name="date2"/>
-					    <field name="ref" groups="analytic.group_analytic_accounting"/>
-					    <field name="empty_line"/>
-					    <separator colspan="4" string="Analytic Journal"/>
-					    <field name="journal_ids" colspan="4" nolabel="1"/>
-					</group>
-					<separator colspan="4"/>
-				    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-					</group>
+			    <group col="4" colspan="6">
+				    <field name="date1"/>
+				    <field name="date2"/>
+				    <field name="ref" groups="analytic.group_analytic_accounting"/>
+				    <field name="empty_line"/>
+				    <separator colspan="4" string="Analytic Journal"/>
+				    <field name="journal_ids" colspan="4" nolabel="1"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
 				</group>
 			</form>
             </field>

addons/account_anglo_saxon/i18n/mn.po

@@ -0,0 +1,66 @@
+# Mongolian 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: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-10-16 09:58+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-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+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."
+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!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference 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
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Энэ данс нь худалдан авалтын үнэ болон өртгийн үнийн хоорондох үнийн "
+"өөрчлөлтийг дүгнэхийн тулд ашиглагдана."

addons/account_budget/__openerp__.py

@@ -49,13 +49,11 @@ Three reports are available:
     'update_xml': [
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
-        'wizard/account_budget_spread_view.xml',
         'account_budget_view.xml',
         'account_budget_report.xml',
         'account_budget_workflow.xml',
         'wizard/account_budget_analytic_view.xml',
         'wizard/account_budget_report_view.xml',
-        'wizard/account_budget_spread_view.xml',
         'wizard/account_budget_crossovered_summary_report_view.xml',
         'wizard/account_budget_crossovered_report_view.xml',
     ],

addons/account_budget/account_budget.py

@@ -34,12 +34,11 @@ def strToDate(dt):
 # Budgets
 # ---------------------------------------------------------
 class account_budget_post(osv.osv):
-    _name = 'account.budget.post'
-    _description = 'Budgetary Position'
+    _name = "account.budget.post"
+    _description = "Budgetary Position"
     _columns = {
         'code': fields.char('Code', size=64, required=True),
         'name': fields.char('Name', size=256, required=True),
-        'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'),
         'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -49,60 +48,8 @@ class account_budget_post(osv.osv):
     }
     _order = "name"
 
-    def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
-        dobj = self.pool.get('account.budget.post.dotation')
-        obj_fiscalyear = self.pool.get('account.fiscalyear')
-        for o in self.browse(cr, uid, ids):
-            # delete dotations for this post
-            dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
-
-            # create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
-            fy = obj_fiscalyear.browse(cr, uid, [fiscalyear_id])[0]
-            num = len(fy.period_ids)
-            for p in fy.period_ids:
-                dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num})
-        return True
-
 account_budget_post()
 
-class account_budget_post_dotation(osv.osv):
-    def _tot_planned(self, cr, uid, ids, name, args, context):
-        obj_budget_lines = self.pool.get('crossovered.budget.lines')
-        res = {}
-        for line in self.browse(cr, uid, ids):
-            if line.period_id:
-                obj_period = self.pool.get('account.period').browse(cr, uid, line.period_id.id)
-
-                budget_id = line.post_id and line.post_id.id or False
-                query="SELECT id FROM crossovered_budget_lines WHERE \
-                        general_budget_id= %s AND (date_from  >=%s AND date_from <= %s ) \
-                        OR (date_to  >=%s AND date_to <= %s) OR (date_from  < %s  AND date_to > %s)"
-                cr.execute(query, (budget_id, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop,))
-                res1 = cr.fetchall()
-                tot_planned = 0.00
-                for record in res1:
-                    obj_lines = obj_budget_lines.browse(cr, uid, record[0])
-                    count_days = min(strToDate(obj_period.date_stop), strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
-                    days_in_period = count_days.days + 1
-                    count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
-                    total_days_of_rec = count_days.days + 1
-                    tot_planned += obj_lines.planned_amount / total_days_of_rec * days_in_period
-                res[line.id] = tot_planned
-            else:
-                res[line.id] = 0.00
-        return res
-
-    _name = 'account.budget.post.dotation'
-    _description = "Budget Dotation"
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'post_id': fields.many2one('account.budget.post', 'Item', select=True),
-        'period_id': fields.many2one('account.period', 'Period'),
-        'amount': fields.float('Amount', digits=(16,2)),
-        'tot_planned': fields.function(_tot_planned, method=True, string='Total Planned Amount', type='float', store=True),
-    }
-
-account_budget_post_dotation()
 
 class crossovered_budget(osv.osv):
     _name = "crossovered.budget"
@@ -252,10 +199,10 @@ class crossovered_budget_lines(osv.osv):
 crossovered_budget_lines()
 
 class account_analytic_account(osv.osv):
-    _inherit = 'account.analytic.account'
+    _inherit = "account.analytic.account"
 
     _columns = {
-    'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
+        'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
     }
 
 account_analytic_account()

addons/account_budget/account_budget_demo.xml

@@ -17,173 +17,24 @@
         </record>
     </data>
 
-    <!-- Budgetary Dotations -->
-    <data noupdate="1">
-        <record id="account_budget_post_dot1" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_1"/>
-        </record>
-        <record id="account_budget_post_dot2" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_2"/>
-        </record>
-        <record id="account_budget_post_dot3" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_3"/>
-        </record>
-        <record id="account_budget_post_dot4" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_4"/>
-        </record>
-        <record id="account_budget_post_dot5" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_5"/>
-        </record>
-        <record id="account_budget_post_dot6" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_6"/>
-        </record>
-        <record id="account_budget_post_dot7" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_7"/>
-        </record>
-        <record id="account_budget_post_dot8" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_8"/>
-        </record>
-        <record id="account_budget_post_dot9" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_9"/>
-        </record>
-        <record id="account_budget_post_dot10" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_10"/>
-        </record>
-        <record id="account_budget_post_dot11" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_11"/>
-        </record>
-        <record id="account_budget_post_dot12" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="5000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_sales0"/>
-            <field name="period_id" ref="account.period_12"/>
-        </record>
-
-        <record id="account_budget_post_dot_pur1" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_1"/>
-        </record>
-        <record id="account_budget_post_dot_pur2" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_2"/>
-        </record>
-        <record id="account_budget_post_dot_pur3" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_3"/>
-        </record>
-        <record id="account_budget_post_dot_pur4" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_4"/>
-        </record>
-        <record id="account_budget_post_dot_pur5" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_5"/>
-        </record>
-        <record id="account_budget_post_dot_pur6" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_6"/>
-        </record>
-        <record id="account_budget_post_dot_pur7" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_7"/>
-        </record>
-        <record id="account_budget_post_dot_pur8" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_8"/>
-        </record>
-        <record id="account_budget_post_dot_pur9" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_9"/>
-        </record>
-        <record id="account_budget_post_dot_pur10" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_10"/>
-        </record>
-        <record id="account_budget_post_dot_pur11" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_11"/>
-        </record>
-        <record id="account_budget_post_dot_pur12" model="account.budget.post.dotation">
-            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-            <field eval="-2000" name="amount"/>
-            <field name="post_id" ref="account_budget_post_purchase0"/>
-            <field name="period_id" ref="account.period_12"/>
-        </record>
-    </data>
-
     <!-- Budgets -->
     <data noupdate="1">
         <record id="crossovered_budget_budgetoptimistic0" model="crossovered.budget">
-            <field eval="&quot;&quot;&quot;+2011&quot;&quot;&quot;" name="code"/>
-            <field eval="&quot;&quot;&quot;Budget 2011: Optimistic&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="'+'+str(time.localtime(time.time())[0]+1)" name="code"/>
+            <field eval="'Budget '+str(time.localtime(time.time())[0]+1)+': Optimistic'" name="name"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
             <field name="creating_user_id" ref="base.user_root"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_budgetpessimistic0" model="crossovered.budget">
-            <field eval="&quot;&quot;&quot;-2011&quot;&quot;&quot;" name="code"/>
-            <field eval="&quot;&quot;&quot;Budget 2011: Pessimistic&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="'-'+str(time.localtime(time.time())[0]+1)" name="code"/>
+            <field eval="'Budget '+str(time.localtime(time.time())[0]+1)+': Pessimistic'" name="name"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
             <field name="creating_user_id" ref="base.user_root"/>
         </record>
     </data>
@@ -193,146 +44,146 @@
         <record id="crossovered_budget_lines_0" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-250.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-07&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-07'" name="date_from"/>
             <field eval="900.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="300.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-06&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-06'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-03&quot;&quot;&quot;" name="paid_date"/>
-            <field eval="&quot;&quot;&quot;2208-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
             <field eval="-150.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-03&quot;&quot;&quot;" name="paid_date"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2009-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-7500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-5000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-2000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2010-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-3000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-1000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
         </record>
     </data>
 </openerp>

addons/account_budget/account_budget_view.xml

@@ -12,6 +12,18 @@
         <!--
     Budgets
     -->
+        <record id="view_budget_post_search" model="ir.ui.view">
+            <field name="name">account.budget.post.search</field>
+            <field name="model">account.budget.post</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Budgetary Position">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </search>
+            </field>
+        </record>
 
         <record id="view_budget_post_tree" model="ir.ui.view">
             <field name="name">account.budget.post.tree</field>
@@ -25,36 +37,13 @@
                 </tree>
             </field>
         </record>
-        <record id="view_budget_post_dotation_form" model="ir.ui.view">
-            <field name="name">account.budget.post.dotation.form</field>
-            <field name="model">account.budget.post.dotation</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Budget Dotation">
-                    <field name="period_id"/>
-                    <field name="amount"/>
-                    <field name="tot_planned" />
-                </form>
-            </field>
-        </record>
-        <record id="view_budget_post_dotation_tree" model="ir.ui.view">
-            <field name="name">account.budget.post.dotation.tree</field>
-            <field name="model">account.budget.post.dotation</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Budget Dotations">
-                    <field name="period_id"/>
-                    <field name="amount"/>
-                    <field name="tot_planned" />
-                </tree>
-            </field>
-        </record>
 
         <record id="open_budget_post_form" model="ir.actions.act_window">
             <field name="name">Budgetary Positions</field>
             <field name="res_model">account.budget.post</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_budget_post_tree"/>
+            <field name="search_view_id" ref="view_budget_post_search"/>
         </record>
         <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
         <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>

addons/account_budget/i18n/account_budget.pot

@@ -7,7 +7,7 @@ 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"
+"PO-Revision-Date: 2009-10-12 13:20:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -261,7 +256,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr ""
@@ -293,17 +287,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -321,17 +304,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -366,11 +338,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/ar.po

@@ -7,7 +7,7 @@ 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: 2009-02-03 06:24+0000\n"
+"PO-Revision-Date: 2010-10-12 13:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr ""
@@ -302,17 +296,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/bg.po

@@ -7,7 +7,7 @@ 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-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 13:20+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Потвърдено"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Период"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -297,7 +292,6 @@ msgstr "Теоритично количество"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Име"
@@ -329,17 +323,6 @@ msgstr "Редове"
 msgid "Budget"
 msgstr "Бюджет"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Обект"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Сума"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -357,17 +340,6 @@ msgstr "Бюджети"
 msgid "Cancelled"
 msgstr "Отказан"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Парично дарение"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Парични дарения"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -402,11 +374,6 @@ msgstr "Печат на бюджети"
 msgid "Code"
 msgstr "Код"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Общо планирана сума"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/bs.po

@@ -7,7 +7,7 @@ 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-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 15:01+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrđeno"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Period"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoretski iznos"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Retci"
 msgid "Budget"
 msgstr "Proračun"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Stavka"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Proračuni"
 msgid "Cancelled"
 msgstr "Poništeno"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Proračunska nadarbina"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Proračunske nadarbine"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Ispis proračuna"
 msgid "Code"
 msgstr "Šifra"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Ukupni planirani iznos"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/ca.po

@@ -7,7 +7,7 @@ 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-08-03 11:08+0000\n"
+"PO-Revision-Date: 2010-10-12 15:08+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmat"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Període"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Import teòric"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nom"
@@ -334,17 +328,6 @@ msgstr "Línies"
 msgid "Budget"
 msgstr "Pressupost"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Import"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Pressupostos"
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotació al pressupost"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacions al pressupost"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimeix pressupostos"
 msgid "Code"
 msgstr "Codi"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Import total previst"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/cs.po

@@ -7,7 +7,7 @@ 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: 2009-11-18 06:21+0000\n"
+"PO-Revision-Date: 2010-10-12 15:21+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Perioda"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Jméno"
@@ -302,17 +296,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/de.po

@@ -7,7 +7,7 @@ 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-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 15:01+0000\n"
 "Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -289,7 +284,6 @@ msgstr "Planwert"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Name"
@@ -321,17 +315,6 @@ msgstr "Positionen"
 msgid "Budget"
 msgstr "Budget"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Pos."
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Betrag"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -349,17 +332,6 @@ msgstr "Budgets"
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budgetrahmen"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budgetrahmen"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -394,11 +366,6 @@ msgstr "Druck Budgets..."
 msgid "Code"
 msgstr "Kurzbez."
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Gesamtsumme Planung"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/el.po

@@ -8,7 +8,7 @@ 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 21:02+0000\n"
+"PO-Revision-Date: 2010-10-12 15:02+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Επιβεβαιωμένο"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Περίοδος"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -298,7 +293,6 @@ msgstr "Θεωρητικό Ποσό"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Όνομα"
@@ -330,17 +324,6 @@ msgstr "Γραμμές"
 msgid "Budget"
 msgstr "Προϋπολογισμός"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Είδος"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Ποσό"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -358,17 +341,6 @@ msgstr "Προϋπολογισμοί"
 msgid "Cancelled"
 msgstr "Ακυρωμένο"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budget Dotation"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budget Dotations"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -403,11 +375,6 @@ msgstr "Εκτύπωση Προϋπολογισμών"
 msgid "Code"
 msgstr "Κωδικας"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Συνολικά Μελετηθέν Ποσό"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/es.po

@@ -7,7 +7,7 @@ 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-08-02 21:02+0000\n"
+"PO-Revision-Date: 2010-10-12 15:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -303,7 +298,6 @@ msgstr "Importe teórico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -335,17 +329,6 @@ msgstr "Líneas"
 msgid "Budget"
 msgstr "Presupuesto"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -363,17 +346,6 @@ msgstr "Presupuestos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación presupuestaria"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones presupuestarias"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/es_AR.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-14 16:22+0000\n"
+"PO-Revision-Date: 2010-10-12 15:22+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmada"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Importe teórico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -334,17 +328,6 @@ msgstr "Líneas"
 msgid "Budget"
 msgstr "Presupuesto"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Presupuestos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación del presupuesto"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones del presupuesto"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimir presupuestos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/es_EC.po

@@ -7,7 +7,7 @@ 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-17 17:37+0000\n"
+"PO-Revision-Date: 2010-10-12 15:37+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -303,7 +298,6 @@ msgstr "Importe teórico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -335,17 +329,6 @@ msgstr "Líneas"
 msgid "Budget"
 msgstr "Presupuesto"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -363,17 +346,6 @@ msgstr "Presupuestos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación presupuestaria"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones presupuestarias"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/et.po

@@ -7,7 +7,7 @@ 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-08-02 21:03+0000\n"
+"PO-Revision-Date: 2010-10-12 15:03+0000\n"
 "Last-Translator: lyyser <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Kinnitatud"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periood"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoreetiline summa"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -303,17 +297,6 @@ msgstr "Read"
 msgid "Budget"
 msgstr "Eelarve"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Ese"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Kogus"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Eelarved"
 msgid "Cancelled"
 msgstr "Tühistatud"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Eelarve dotatsioon"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Eelarve dotatsioonid"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Prindi eelarved"
 msgid "Code"
 msgstr "Kood"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Kogu planeeritud summa"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/fi.po

@@ -8,7 +8,7 @@ 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: 2009-09-08 15:28+0000\n"
+"PO-Revision-Date: 2010-10-12 15:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Jakso"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -277,7 +272,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -309,17 +303,6 @@ msgstr ""
 msgid "Budget"
 msgstr "Budjetti"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -337,17 +320,6 @@ msgstr "Budjetit"
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -382,11 +354,6 @@ msgstr "Tulosta budjetit"
 msgid "Code"
 msgstr "Koodi"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/fr.po

@@ -7,7 +7,7 @@ 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: 2009-11-17 09:34+0000\n"
+"PO-Revision-Date: 2010-10-12 15:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmé"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Période"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr "Montant Théorique"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nom"
@@ -304,17 +298,6 @@ msgstr "Lignes"
 msgid "Budget"
 msgstr "Budget"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Élément"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Montant"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Budgets"
 msgid "Cancelled"
 msgstr "Annulé"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotation du Budget"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotations du Budget"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Imprimer les Budgets"
 msgid "Code"
 msgstr "Code"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Montant Total Planifié"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/gl.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: account-budget-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:36+0000\n"
+"PO-Revision-Date: 2010-10-12 15:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
@@ -68,11 +68,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmada"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Importe teórico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nome"
@@ -334,17 +328,6 @@ msgstr "Liñas"
 msgid "Budget"
 msgstr "Presuposto"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Elemento"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Presupostos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación ao presuposto"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacións ao presuposto"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimir presupostos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/hi.po

@@ -8,7 +8,7 @@ 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: 2009-09-08 13:30+0000\n"
+"PO-Revision-Date: 2010-10-12 15:30+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "अवधि"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Theoritical राशि"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "प्रिंट बजट"
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/hr.po

@@ -7,7 +7,7 @@ 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-08-02 21:04+0000\n"
+"PO-Revision-Date: 2010-10-12 15:04+0000\n"
 "Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potvrđeno"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Razdoblje"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoretski iznos"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Retci"
 msgid "Budget"
 msgstr "Budžet"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Stavka"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Budžeti"
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
 msgid "Code"
 msgstr "Šifra"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Ukupni planirani iznos"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/hu.po

@@ -7,7 +7,7 @@ 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: 2009-02-03 06:37+0000\n"
+"PO-Revision-Date: 2010-10-12 15:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Név"
@@ -302,17 +296,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/id.po

@@ -7,7 +7,7 @@ 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-08-02 21:05+0000\n"
+"PO-Revision-Date: 2010-10-12 15:05+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Dikonfirmasi"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nama"
@@ -302,17 +296,6 @@ msgstr ""
 msgid "Budget"
 msgstr "Anggaran"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr "Anggaran"
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
 msgid "Code"
 msgstr "Kode"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/it.po

@@ -7,7 +7,7 @@ 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 10:12+0000\n"
+"PO-Revision-Date: 2010-10-12 15:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confermato"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr "Importo teorico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nome"
@@ -304,17 +298,6 @@ msgstr "Linee"
 msgid "Budget"
 msgstr "Budget"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Elemento"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importo"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Budget"
 msgid "Cancelled"
 msgstr "Annullato"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotazione di bilancio"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotazione di bilancio"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Stampa Badget"
 msgid "Code"
 msgstr "Codice"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Totale Importo pianificato"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/ko.po

@@ -8,7 +8,7 @@ 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: 2009-09-08 12:44+0000\n"
+"PO-Revision-Date: 2010-10-12 15:44+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포
 msgid "Confirmed"
 msgstr "확정됨"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "기간"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -288,7 +283,6 @@ msgstr "이론적 금액"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "이름"
@@ -320,17 +314,6 @@ msgstr "라인"
 msgid "Budget"
 msgstr "예산"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "아이템"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "금액"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -348,17 +331,6 @@ msgstr "예산"
 msgid "Cancelled"
 msgstr "취소됨"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "예산 교부금"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "예산 교부금"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -393,11 +365,6 @@ msgstr "예산 인쇄"
 msgid "Code"
 msgstr "코드"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "계획된 전체 금액"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/lt.po

@@ -7,7 +7,7 @@ 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:05+0000\n"
+"PO-Revision-Date: 2010-10-12 15:05+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Patvirtinta"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periodas"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Pavadinimas"
@@ -302,17 +296,6 @@ msgstr "Eilutės"
 msgid "Budget"
 msgstr "Biudžetas"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Suma"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr "Biudžetai"
 msgid "Cancelled"
 msgstr "Nutrauktas"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr "Spausdinti biudžetus"
 msgid "Code"
 msgstr "Kodas"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/nl.po

@@ -7,7 +7,7 @@ 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-08-02 21:06+0000\n"
+"PO-Revision-Date: 2010-10-12 14:06+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Bevestigd"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -291,7 +286,6 @@ msgstr "Theoretisch bedrag"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Naam"
@@ -323,17 +317,6 @@ msgstr "Regels"
 msgid "Budget"
 msgstr "Budget"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Bedrag"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -351,17 +334,6 @@ msgstr "Budgetten"
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budgettoewijzing"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budgettoewijzingen"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -396,11 +368,6 @@ msgstr "Budgetten afdrukken"
 msgid "Code"
 msgstr "Code"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Totaal begroot bedrag"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/nl_BE.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:00+0000\n"
+"PO-Revision-Date: 2010-10-12 14:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/oc.po

@@ -8,7 +8,7 @@ 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 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periòde"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -273,7 +268,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nom"
@@ -305,17 +299,6 @@ msgstr "Linhas"
 msgid "Budget"
 msgstr "Budgèt"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Soma"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -333,17 +316,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Anullat"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -378,11 +350,6 @@ msgstr ""
 msgid "Code"
 msgstr "Còde"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/pl.po

@@ -7,7 +7,7 @@ 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-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potwierdzone"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Okres"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -294,7 +289,6 @@ msgstr "Kwota teoretyczna"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nazwa"
@@ -326,17 +320,6 @@ msgstr "Pozycje"
 msgid "Budget"
 msgstr "Budżet"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Kwota"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -354,17 +337,6 @@ msgstr "Budżety"
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotacja budżetu"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacje budżetu"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -399,11 +371,6 @@ msgstr "Drukuj budżety"
 msgid "Code"
 msgstr "Kod"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Suma planowanych kwot"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/pt.po

@@ -7,7 +7,7 @@ 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-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Montante teórico"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nome"
@@ -303,17 +297,6 @@ msgstr "Linhas"
 msgid "Budget"
 msgstr "Orçamento"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Montante"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Orçamentos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Imprimir orçamentos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Montante total planeado."
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/pt_BR.po

@@ -7,7 +7,7 @@ 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-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Período"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -295,7 +290,6 @@ msgstr "Valor Estimado"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nome"
@@ -327,17 +321,6 @@ msgstr "Linhas"
 msgid "Budget"
 msgstr "Orçamento"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Valor"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -355,17 +338,6 @@ msgstr "Orçamentos"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotação Orçamentária"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotações Orçamentárias"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -400,11 +372,6 @@ msgstr "Imprimir Orçamentos"
 msgid "Code"
 msgstr "Código"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Valor Total Planejado"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/ro.po

@@ -7,7 +7,7 @@ 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: 2009-11-17 09:33+0000\n"
+"PO-Revision-Date: 2010-10-12 14:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Confirmat"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Perioadă"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -297,7 +292,6 @@ msgstr "Suma teoretică"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Nume"
@@ -329,17 +323,6 @@ msgstr "Linii"
 msgid "Budget"
 msgstr "Buget"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Sumă"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -357,17 +340,6 @@ msgstr "Bugete"
 msgid "Cancelled"
 msgstr "Anulat"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotare bugetară"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotări bugetare"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -402,11 +374,6 @@ msgstr "Tipărire bugete"
 msgid "Code"
 msgstr "Cod"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Suma totală planificată"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/ru.po

@@ -7,7 +7,7 @@ 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-08-02 21:08+0000\n"
+"PO-Revision-Date: 2010-10-12 14:08+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Подтверждено"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Период"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Имя"
@@ -304,17 +298,6 @@ msgstr "Строк"
 msgid "Budget"
 msgstr "Бюджет"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Элемент"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Сумма"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Бюджеты"
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Бюджетная дотация"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Бюджетные дотации"
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Печать бюджетов"
 msgid "Code"
 msgstr "Код"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Запланировано всего"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/sl.po

@@ -7,7 +7,7 @@ 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-08-02 21:09+0000\n"
+"PO-Revision-Date: 2010-10-12 14:09+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Potrjeno"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Obdobje"
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoretični znesek"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Postavke"
 msgid "Budget"
 msgstr "Proračun"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Znesek"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Proračuni"
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Izpiši proračune"
 msgid "Code"
 msgstr "Oznaka"
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Skupni načrtovani znesek"
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"

addons/account_budget/i18n/sq.po

@@ -8,7 +8,7 @@ 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 14:42+0000\n"
+"PO-Revision-Date: 2010-10-12 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
 
 #. module: account_budget
 #: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
 msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"